diff options
1731 files changed, 54076 insertions, 31640 deletions
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index 3e9281557d51..a284182bb047 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/android.section.md b/doc/languages-frameworks/android.section.md index 237f3441874f..f268c5525660 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -185,10 +185,9 @@ with import <nixpkgs> {}; androidenv.emulateApp { name = "emulate-MyAndroidApp"; - platformVersion = "24"; - abiVersion = "armeabi-v7a"; # mips, x86 or x86_64 - systemImageType = "default"; - useGoogleAPIs = false; + platformVersion = "28"; + abiVersion = "x86_64"; # armeabi-v7a, mips, x86 + systemImageType = "google_apis_playstore"; } ``` @@ -201,7 +200,7 @@ with import <nixpkgs> {}; androidenv.emulateApp { name = "emulate-MyAndroidApp"; platformVersion = "24"; - abiVersion = "armeabi-v7a"; # mips, x86 or x86_64 + abiVersion = "armeabi-v7a"; # mips, x86, x86_64 systemImageType = "default"; useGoogleAPIs = false; app = ./MyApp.apk; diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index d0f124f29d42..065212a0e180 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -75,7 +75,8 @@ foo = import ../path/to/foo.nix { It adds the contents of the <envar>PERL5LIB</envar> environment variable to <literal>#! .../bin/perl</literal> line of Perl scripts as <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures - that a script can find its dependencies. + that a script can find its dependencies. (This can cause this shebang line + to become too long for Darwin to handle; see the note below.) </para> </listitem> <listitem> @@ -137,6 +138,36 @@ ClassC3Componentised = buildPerlPackage rec { </programlisting> </para> + <para> + On Darwin, if a script has too many + <literal>-I<replaceable>dir</replaceable></literal> flags in its first line + (its “shebang line”), it will not run. This can be worked around by calling + the <literal>shortenPerlShebang</literal> function from the + <literal>postInstall</literal> phase: +<programlisting> +{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: + +ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; + version = "11.50"; + + src = fetchurl { + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optional stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; +}; +</programlisting> + This will remove the <literal>-I</literal> flags from the shebang line, + rewrite them in the <literal>use lib</literal> form, and put them on the next + line instead. This function can be given any number of Perl scripts as + arguments; it will modify them in-place. + </para> + <section xml:id="ssec-generation-from-CPAN"> <title>Generation from CPAN</title> diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 4f0952896e45..292d66864a4c 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 42095c13e0a4..fe5929656565 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/default.nix b/lib/default.nix index 3efaaf0f8f9e..18d2dfae1e18 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -71,7 +71,7 @@ let zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin getLib getDev chooseDevOutputs zipWithNames zip; - inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 + inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take diff --git a/lib/lists.nix b/lib/lists.nix index 30d87ece6641..e4fcf959b60c 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -21,6 +21,19 @@ rec { */ singleton = x: [x]; + /* Apply the function to each element in the list. Same as `map`, but arguments + flipped. + + Type: forEach :: [a] -> (a -> b) -> [b] + + Example: + forEach [ 1 2 ] (x: + toString x + ) + => [ "1" "2" ] + */ + forEach = xs: f: map f xs; + /* “right fold” a binary function `op` between successive elements of `list` with `nul' as the starting value, i.e., `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`. diff --git a/lib/options.nix b/lib/options.nix index d2eae3ae3a98..e5c0631a5437 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -36,7 +36,7 @@ rec { example ? null, # String describing the option. description ? null, - # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix). + # Related packages used in the manual (see `genRelatedPackages` in ../nixos/lib/make-options-doc/default.nix). relatedPackages ? null, # Option type, providing type-checking and value merging. type ? null, diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index eadaa0521b35..cf344122cf4e 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 000000000000..5a0fa978a138 --- /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 000000000000..df092a14f81e --- /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 e22bcd326c86..9c00656ab918 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 65095e785968..f5c00ff62685 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. @@ -38,10 +40,17 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { + "00-matt" = { + name = "Matt Smith"; + email = "matt@offtopica.uk"; + github = "00-matt"; + githubId = 48835712; + }; "0x4A6F" = { 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 +59,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 +110,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 +151,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 +228,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 +275,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,8 +332,15 @@ alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; + githubId = 2822871; name = "Alistair Bill"; }; + alkeryn = { + email = "plbraundev@gmail.com"; + github = "Alkeryn"; + githubId = 11599075; + name = "Pierre-Louis Braun"; + }; all = { email = "nix-commits@lists.science.uu.nl"; name = "Nix Committers"; @@ -286,6 +348,7 @@ allonsy = { email = "linuxbash8@gmail.com"; github = "allonsy"; + githubId = 5892756; name = "Alec Snyder"; }; alunduil = { @@ -296,6 +359,7 @@ amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; + githubId = 15623522; name = "Amar Paul"; }; ambrop72 = { @@ -306,11 +370,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 +387,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 +439,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 +468,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 +509,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 +573,73 @@ 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"; }; + ashkitten = { + email = "ashlea@protonmail.com"; + github = "ashkitten"; + githubId = 9281956; + name = "ash lea"; + }; 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 +650,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 +667,7 @@ avitex = { email = "theavitex@gmail.com"; github = "avitex"; + githubId = 5110816; name = "avitex"; keys = [{ longkeyid = "rsa4096/0x8B366C443CABE942"; @@ -564,26 +677,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 +721,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 +840,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 +886,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 +903,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 +932,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 +1150,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,56 +1281,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 = { @@ -1136,36 +1352,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"; @@ -1179,46 +1402,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 = { @@ -1228,11 +1460,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 = { @@ -1243,61 +1477,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 = { @@ -1308,11 +1554,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 = { @@ -1323,21 +1571,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 = { @@ -1348,71 +1600,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 = { @@ -1423,16 +1689,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 = { @@ -1442,17 +1711,29 @@ 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"; fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; }]; }; + dump_stack = { + email = "root@dumpstack.io"; + github = "jollheef"; + githubId = 1749762; + name = "Mikhail Klementev"; + keys = [{ + longkeyid = "rsa4096/0x1525585D1B43C62A"; + fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; + }]; + }; dxf = { email = "dingxiangfei2009@gmail.com"; github = "dingxiangfei2009"; @@ -1461,46 +1742,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 = { @@ -1511,41 +1807,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 = { @@ -1555,56 +1865,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 = { @@ -1615,21 +1936,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 = { @@ -1639,16 +1964,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 = { @@ -1659,11 +1987,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"; @@ -1673,11 +2003,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 = { @@ -1692,11 +2024,13 @@ 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"; @@ -1706,56 +2040,67 @@ 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 = { @@ -1763,6 +2108,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"; @@ -1771,66 +2122,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"; @@ -1840,6 +2204,7 @@ fps = { email = "mista.tapas@gmx.net"; github = "fps"; + githubId = 84968; name = "Florian Paul Schmidt"; }; @@ -1852,11 +2217,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 = { @@ -1872,31 +2239,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 = { @@ -1906,16 +2279,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 = { @@ -1925,16 +2301,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 = { @@ -1945,6 +2324,7 @@ garrison = { email = "jim@garrison.cc"; github = "garrison"; + githubId = 91987; name = "Jim Garrison"; }; gavin = { @@ -1955,91 +2335,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 = { @@ -2050,6 +2448,7 @@ greydot = { email = "lanablack@amok.cc"; github = "greydot"; + githubId = 7385287; name = "Lana Black"; }; gridaphobe = { @@ -2060,106 +2459,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 = { @@ -2169,101 +2589,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 = { @@ -2274,16 +2714,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 = { @@ -2293,6 +2736,7 @@ ivanbrennan = { email = "ivan.brennan@gmail.com"; github = "ivanbrennan"; + githubId = 1672874; name = "Ivan Brennan"; keys = [{ longkeyid = "rsa4096/0x79C3C47DC652EA54"; @@ -2302,6 +2746,7 @@ ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; + githubId = 2437675; name = "John Doe"; keys = [{ longkeyid = "rsa4096/09AC52AEA87817A4"; @@ -2311,21 +2756,30 @@ 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"; }; + jasoncarr = { + email = "jcarr250@gmail.com"; + github = "jasoncarr0"; + name = "Jason Carr"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; + githubId = 3081095; name = "Jürgen Keck"; }; j03 = { @@ -2336,51 +2790,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 = { @@ -2390,31 +2854,46 @@ jD91mZM2 = { email = "me@krake.one"; github = "jD91mZM2"; + githubId = 12830969; name = "jD91mZM2"; }; jdagilliland = { email = "jdagilliland@gmail.com"; github = "jdagilliland"; + githubId = 1383440; name = "Jason Gilliland"; }; + jdanek = { + email = "jdanek@redhat.com"; + github = "jdanekrh"; + keys = [{ + longkeyid = "ed25519/0x69275CADF15D872E"; + fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; + }]; + name = "Jiri Daněk"; + }; 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 = { @@ -2425,6 +2904,7 @@ jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; + githubId = 1667473; name = "Jethro Kuan"; }; jfb = { @@ -2435,71 +2915,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 = { @@ -2510,11 +3004,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 = { @@ -2526,39 +3022,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"; @@ -2569,71 +3077,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 = { @@ -2644,11 +3166,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 = { @@ -2663,21 +3187,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 = { @@ -2692,66 +3220,89 @@ 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"; }; + kirikaza = { + email = "k@kirikaza.ru"; + github = "kirikaza"; + name = "Kirill Kazakov"; + }; 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"; @@ -2761,6 +3312,7 @@ kjuvi = { email = "quentin.vaucher@pm.me"; github = "kjuvi"; + githubId = 17534323; name = "Quentin Vaucher"; }; kkallio = { @@ -2771,37 +3323,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 = { @@ -2812,61 +3371,78 @@ 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"; }; + ktor = { + email = "kruszewsky@gmail.com"; + github = "ktor"; + name = "Pawel Kruszewski"; + }; 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 = { @@ -2877,26 +3453,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 = { @@ -2907,26 +3488,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 = { @@ -2937,66 +3523,84 @@ 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"; }; + lightbulbjim = { + email = "chris@killred.net"; + github = "lightbulbjim"; + name = "Chris Rendle-Short"; + }; 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"; @@ -3006,41 +3610,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 = { @@ -3051,16 +3663,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 = { @@ -3071,51 +3686,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 = { @@ -3129,71 +3754,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 = { @@ -3204,25 +3843,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"; @@ -3232,16 +3876,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 = { @@ -3252,6 +3899,7 @@ matthiasbeyer = { email = "mail@beyermatthias.de"; github = "matthiasbeyer"; + githubId = 427866; name = "Matthias Beyer"; }; matti-kariluoma = { @@ -3262,76 +3910,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 = { @@ -3342,6 +4005,7 @@ melkor333 = { email = "samuel@ton-kunst.ch"; github = "melkor333"; + githubId = 6412377; name = "Samuel Ruprecht"; }; metabar = { @@ -3352,40 +4016,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 @@ -3401,6 +4073,7 @@ michalrus = { email = "m@michalrus.com"; github = "michalrus"; + githubId = 4366292; name = "Michal Rus"; }; michelk = { @@ -3411,26 +4084,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 = { @@ -3440,6 +4118,7 @@ mimadrid = { email = "mimadrid@ucm.es"; github = "mimadrid"; + githubId = 3269878; name = "Miguel Madrid"; }; minijackson = { @@ -3455,36 +4134,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 = { @@ -3495,21 +4181,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 = { @@ -3520,36 +4210,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 = { @@ -3560,16 +4257,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 = { @@ -3580,6 +4280,7 @@ mpsyco = { email = "fr.st-amour@gmail.com"; github = "fstamour"; + githubId = 2881922; name = "Francis St-Amour"; }; mredaelli = { @@ -3590,16 +4291,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 = { @@ -3613,26 +4317,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 = { @@ -3643,46 +4352,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 = { @@ -3697,146 +4415,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 = { @@ -3846,51 +4591,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 = { @@ -3900,11 +4655,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 = { @@ -3915,16 +4672,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 = { @@ -3935,21 +4695,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"; @@ -3959,66 +4723,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 = { @@ -4029,81 +4806,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 = { @@ -4113,16 +4906,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 = { @@ -4133,16 +4929,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 = { @@ -4153,21 +4952,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 = { @@ -4178,16 +4981,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"; @@ -4198,11 +5004,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 @@ -4216,21 +5024,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"; @@ -4240,11 +5052,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 = { @@ -4254,26 +5068,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 = { @@ -4283,26 +5102,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"; @@ -4317,36 +5141,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 = { @@ -4356,101 +5187,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 = { @@ -4461,31 +5312,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 = { @@ -4501,91 +5358,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 = { @@ -4596,6 +5471,7 @@ ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; + githubId = 889991; name = "Ryan Artecona"; }; ryansydnor = { @@ -4606,21 +5482,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"; @@ -4630,31 +5510,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 = { @@ -4665,26 +5551,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 = { @@ -4695,6 +5586,7 @@ schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; + githubId = 354463; name = "Fabian Schmitthenner"; }; schmittlauch = { @@ -4704,6 +5596,7 @@ schneefux = { email = "schneefux+nixos_pkg@schneefux.xyz"; github = "schneefux"; + githubId = 15379000; name = "schneefux"; }; schristo = { @@ -4713,21 +5606,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 = { @@ -4738,61 +5635,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 = { @@ -4803,16 +5712,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 = { @@ -4828,51 +5740,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 = { @@ -4887,6 +5809,7 @@ skeidel = { email = "svenkeidel@gmail.com"; github = "svenkeidel"; + githubId = 266500; name = "Sven Keidel"; }; skrzyp = { @@ -4896,11 +5819,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"; @@ -4910,6 +5835,7 @@ smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; + githubId = 95471; name = "Sébastien Maret"; keys = [{ longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; @@ -4919,31 +5845,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"; @@ -4953,31 +5885,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 = { @@ -4988,6 +5926,7 @@ spwhitt = { email = "sw@swhitt.me"; github = "spwhitt"; + githubId = 1414088; name = "Spencer Whitt"; }; srghma = { @@ -4998,37 +5937,50 @@ 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"; }; + sterfield = { + email = "sterfield@gmail.com"; + github = "sterfield"; + githubId = 5747061; + name = "Guillaume Loetscher"; + }; 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"; @@ -5037,111 +5989,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"; @@ -5151,11 +6125,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 = { @@ -5166,76 +6142,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 = { @@ -5251,26 +6242,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 = { @@ -5281,16 +6277,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"; @@ -5300,31 +6299,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 = { @@ -5335,31 +6340,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 = { @@ -5369,67 +6380,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 = { @@ -5439,11 +6463,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 = { @@ -5454,6 +6480,7 @@ tvorog = { email = "marszaripov@gmail.com"; github = "tvorog"; + githubId = 1325161; name = "Marsel Zaripov"; }; tweber = { @@ -5470,6 +6497,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"; @@ -5478,41 +6506,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 = { @@ -5523,13 +6559,21 @@ va1entin = { email = "github@valentinsblog.com"; github = "va1entin"; + githubId = 31535155; name = "Valentin Heidelberger"; }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; github = "vaibhavsagar"; + githubId = 1525767; name = "Vaibhav Sagar"; }; + valebes = { + email = "valebes@gmail.com"; + github = "valebes"; + githubid = 10956211; + name = "Valerio Besozzi"; + }; valeriangalliat = { email = "val@codejam.info"; github = "valeriangalliat"; @@ -5538,37 +6582,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"; @@ -5577,31 +6628,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 = { @@ -5612,6 +6669,7 @@ virusdave = { email = "dave.nicponski@gmail.com"; github = "virusdave"; + githubId = 6148271; name = "Dave Nicponski"; }; vizanto = { @@ -5622,21 +6680,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 = { @@ -5647,11 +6709,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 = { @@ -5661,31 +6725,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 = { @@ -5695,6 +6765,7 @@ willibutz = { email = "willibutz@posteo.de"; github = "willibutz"; + githubId = 20464732; name = "Willi Butz"; }; willtim = { @@ -5708,36 +6779,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 = { @@ -5748,31 +6826,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 = { @@ -5783,31 +6867,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 = { @@ -5818,71 +6908,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 = { @@ -5893,16 +6997,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 = { @@ -5912,61 +7019,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/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 2039af5165a0..9117e6d1c558 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,4 +1,5 @@ # nix name, luarocks name, server, version,luaversion,maintainers +alt-getopt,,,,,arobyn ansicolors,,,,, argparse,,,,, basexx,,,,, @@ -56,6 +57,7 @@ luv,,,,, markdown,,,,, mediator_lua,,,,, mpack,,,,, +moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, rapidjson,,,,, diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 7fc0ad702f84..f9de2db1a084 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.flip map 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 069cc36573d8..8fcbb627342b 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 f45fecd16c35..1cdec64f69b0 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) @@ -210,6 +220,30 @@ </itemizedlist> </section> </section> + <section xml:id="release-managers"> + <title>Release Management Team</title> + <para> + For each release there are two release managers. After each release the + release manager having managed two releases steps down and the release + management team of the last release appoints a new release manager. + </para> + <para> + This makes sure a release management team always consists of one release + manager who already has managed one release and one release manager being + introduced to their role, making it easier to pass on knowledge and + experience. + </para> + <para> + A release manager's role and responsibilities are: + </para> + <itemizedlist> + <listitem><para>manage the release process</para></listitem> + <listitem><para>start discussions about features and changes for a given release</para></listitem> + <listitem><para>create a roadmap</para></listitem> + <listitem><para>release in cooperation with Eelco Dolstra</para></listitem> + <listitem><para>decide which bug fixes, features, etc... get backported after a release</para></listitem> + </itemizedlist> + </section> <section xml:id="release-schedule"> <title>Release schedule</title> diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index b77d71389a9d..48193d986ab7 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 742376378dea..9cea2db610e0 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 42edaa1ae5b6..1481db467122 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 9cec83f1e28b..4c20cfcdd7d2 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 37e9c2dbbb63..6493bb995967 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -42,6 +42,12 @@ 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> @@ -231,6 +237,12 @@ </para> </listitem> <listitem> + <para> + The <literal>shibboleth-sp</literal> package has been updated to version 3. + It is largely backward compatible, for further information refer to the + <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link> + and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>. + </para> <para> Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped. </para> @@ -242,6 +254,43 @@ 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> + <listitem> + <para> + The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer. + </para> + </listitem> + <listitem> + <para> + The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer. + </para> + </listitem> + <listitem> + <para> + Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4. + </para> + </listitem> + <listitem> + <para> + The <option>services.pdns-recursor.extraConfig</option> option has been replaced by + <option>services.pdns-recursor.settings</option>. The new option allows setting extra + configuration while being better type-checked and mergeable. + </para> + </listitem> </itemizedlist> </section> @@ -403,6 +452,81 @@ installer after creating <literal>/var/lib/nextcloud</literal>. </para> </listitem> + <listitem> + <para> + There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with + arguments flipped. When mapping function body spans many lines (or has nested + <literal>map</literal>s), it is often hard to follow which list is modified. + </para> + <para> + Previous solution to this problem was either to use <literal>lib.flip map</literal> + idiom or extract that anonymous mapping function to a named one. Both can still be used + but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>. + </para> + <para> + The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via + <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to + <literal>/etc/sysctl.d/60-nixos.conf</literal>, as + <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> + recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a + two-digit number and a dash to simplify the ordering of the files. + </para> + </listitem> + <listitem> + <para> + We now install the sysctl snippets shipped with systemd. + <itemizedlist> + <para>This enables:</para> + <listitem> + <para>Loose reverse path filtering</para> + </listitem> + <listitem> + <para>Source route filtering</para> + </listitem> + <listitem> + <para> + <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat) + </para> + </listitem> + </itemizedlist> + + This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>. + These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>, + and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> + (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>). + </para> + </listitem> + <listitem> + <para> + Coredumps are now acquired by <literal>systemd-coredump</literal> by default. + <literal>systemd-coredump</literal> behaviour can still be modified via + <option>systemd.coredump.extraConfig</option>. + To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal> + in the working directory), without piping it through <literal>systemd-coredump</literal>, set + <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>. + </para> + </listitem> + <listitem> + <para> + <literal>systemd.packages</literal> option now also supports generators and + shutdown scripts. Old <literal>systemd.generator-packages</literal> option has + been removed. + </para> + </listitem> + <listitem> + <para> + The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer. + Use <literal>rspamd</literal> in proxy mode instead. + </para> + </listitem> + <listitem> + <para> + systemd cgroup accounting via the + <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link> + option is now enabled by default. It now also enables the more recent Block IO and IP accounting + features. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index b622a4d59e89..1bad63b9194c 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -54,11 +54,11 @@ rec { machinesNumbered = zipLists machines (range 1 254); - nodes_ = flip map machinesNumbered (m: nameValuePair m.fst + nodes_ = forEach machinesNumbered (m: nameValuePair m.fst [ ( { config, nodes, ... }: let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); - interfaces = flip map interfacesNumbered ({ fst, snd }: + interfaces = forEach interfacesNumbered ({ fst, snd }: nameValuePair "eth${toString snd}" { ipv4.addresses = [ { address = "192.168.${toString fst}.${toString m.snd}"; prefixLength = 24; @@ -88,7 +88,7 @@ rec { "${config.networking.hostName}\n")); virtualisation.qemu.options = - flip map interfacesNumbered + forEach interfacesNumbered ({ fst, snd }: qemuNICFlags snd fst m.snd); }; } diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix new file mode 100644 index 000000000000..88e052106a28 --- /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 72ac89d4ff62..72ac89d4ff62 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 1201c7612c2e..1201c7612c2e 100644 --- a/nixos/doc/manual/postprocess-option-descriptions.xsl +++ b/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index a67a0ab960e5..11247666ecda 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -102,7 +102,7 @@ let # builtins multiply by 4 the memory usage and the time used to compute # each options. tryCollectOptions = moduleResult: - flip map (excludeOptions (collect isOption moduleResult)) (opt: + forEach (excludeOptions (collect isOption moduleResult)) (opt: { name = showOption opt.loc; } // builtins.tryEval (strict opt.value)); in keepNames ( diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 04fa8b9559a9..24ed9c97668b 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -52,85 +52,11 @@ let </fontconfig> ''; + # local configuration file localConf = pkgs.writeText "fc-local.conf" cfg.localConf; - # The configuration to be included in /etc/font/ - penultimateConf = pkgs.runCommand "font-penultimate-conf" { - preferLocalBuild = true; - } '' - support_folder=$out/etc/fonts/conf.d - latest_folder=$out/etc/fonts/${latestVersion}/conf.d - - mkdir -p $support_folder - mkdir -p $latest_folder - - ln -s ${supportFontsConf} $support_folder/../fonts.conf - ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ - $latest_folder/../fonts.conf - - # fontconfig-penultimate various configuration files - ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ - $support_folder - ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ - $latest_folder - - ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf - ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf - - rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf - ln -s ${antialiasConf} $support_folder/10-antialias.conf - ln -s ${antialiasConf} $latest_folder/10-antialias.conf - - rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf - ln -s ${hintingConf} $support_folder/10-hinting.conf - ln -s ${hintingConf} $latest_folder/10-hinting.conf - - ${optionalString cfg.useEmbeddedBitmaps '' - rm $support_folder/10-no-embedded-bitmaps.conf - rm $latest_folder/10-no-embedded-bitmaps.conf - ''} - - rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf - ln -s ${subpixelConf} $support_folder/10-subpixel.conf - ln -s ${subpixelConf} $latest_folder/10-subpixel.conf - - ${optionalString (cfg.dpi != 0) '' - ln -s ${dpiConf} $support_folder/11-dpi.conf - ln -s ${dpiConf} $latest_folder/11-dpi.conf - ''} - - ${optionalString (!cfg.includeUserConf) '' - rm $support_folder/50-user.conf - rm $latest_folder/50-user.conf - ''} - - # 51-local.conf - rm $latest_folder/51-local.conf - substitute \ - ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ - $latest_folder/51-local.conf \ - --replace local.conf /etc/fonts/${latestVersion}/local.conf - - # local.conf (indirect priority 51) - ${optionalString (cfg.localConf != "") '' - ln -s ${localConf} $out/etc/fonts/local.conf - ln -s ${localConf} $out/etc/fonts/${latestVersion}/local.conf - ''} - - ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf - ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf - - ${optionalString cfg.allowBitmaps '' - rm $support_folder/53-no-bitmaps.conf - rm $latest_folder/53-no-bitmaps.conf - ''} - - ${optionalString (!cfg.allowType1) '' - ln -s ${rejectType1} $support_folder/53-no-type1.conf - ln -s ${rejectType1} $latest_folder/53-no-type1.conf - ''} - ''; - + # rendering settings configuration files + # priority 10 hintingConf = pkgs.writeText "fc-10-hinting.conf" '' <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> @@ -199,6 +125,8 @@ let </fontconfig> ''; + # default fonts configuration file + # priority 52 defaultFontsConf = let genDefault = fonts: name: optionalString (fonts != []) '' @@ -228,7 +156,9 @@ let </fontconfig> ''; - rejectType1 = pkgs.writeText "fc-53-no-type1.conf" '' + # reject Type 1 fonts + # priority 53 + rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> @@ -245,6 +175,88 @@ let </fontconfig> ''; + # The configuration to be included in /etc/font/ + penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" { + preferLocalBuild = true; + } '' + support_folder=$out/etc/fonts/conf.d + latest_folder=$out/etc/fonts/${latestVersion}/conf.d + + mkdir -p $support_folder + mkdir -p $latest_folder + + # fonts.conf + ln -s ${supportFontsConf} $support_folder/../fonts.conf + ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ + $latest_folder/../fonts.conf + + # fontconfig-penultimate various configuration files + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $support_folder + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $latest_folder + + ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf + ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + + rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf + ln -s ${antialiasConf} $support_folder/10-antialias.conf + ln -s ${antialiasConf} $latest_folder/10-antialias.conf + + rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf + ln -s ${hintingConf} $support_folder/10-hinting.conf + ln -s ${hintingConf} $latest_folder/10-hinting.conf + + ${optionalString cfg.useEmbeddedBitmaps '' + rm $support_folder/10-no-embedded-bitmaps.conf + rm $latest_folder/10-no-embedded-bitmaps.conf + ''} + + rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf + ln -s ${subpixelConf} $support_folder/10-subpixel.conf + ln -s ${subpixelConf} $latest_folder/10-subpixel.conf + + ${optionalString (cfg.dpi != 0) '' + ln -s ${dpiConf} $support_folder/11-dpi.conf + ln -s ${dpiConf} $latest_folder/11-dpi.conf + ''} + + # 50-user.conf + ${optionalString (!cfg.includeUserConf) '' + rm $support_folder/50-user.conf + rm $latest_folder/50-user.conf + ''} + + # 51-local.conf + rm $latest_folder/51-local.conf + substitute \ + ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ + $latest_folder/51-local.conf \ + --replace local.conf /etc/fonts/${latestVersion}/local.conf + + # local.conf (indirect priority 51) + ${optionalString (cfg.localConf != "") '' + ln -s ${localConf} $support_folder/../local.conf + ln -s ${localConf} $latest_folder/../local.conf + ''} + + # 52-nixos-default-fonts.conf + ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf + ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf + + # 53-no-bitmaps.conf + ${optionalString cfg.allowBitmaps '' + rm $support_folder/53-no-bitmaps.conf + rm $latest_folder/53-no-bitmaps.conf + ''} + + ${optionalString (!cfg.allowType1) '' + # 53-nixos-reject-type1.conf + ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf + ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf + ''} + ''; + in { diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 724158f73821..fe0b88cf4c26 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -14,250 +14,252 @@ Low number means high priority. */ -{ config, lib, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; -let cfg = config.fonts.fontconfig; - - fcBool = x: "<bool>" + (boolToString x) + "</bool>"; - - # back-supported fontconfig version and package - # version is used for font cache generation - supportVersion = "210"; - supportPkg = pkgs."fontconfig_${supportVersion}"; - - # latest fontconfig version and package - # version is used for configuration folder name, /etc/fonts/VERSION/ - # note: format differs from supportVersion and can not be used with makeCacheConf - latestVersion = pkgs.fontconfig.configVersion; - latestPkg = pkgs.fontconfig; - - # supported version fonts.conf - supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; - - # configuration file to read fontconfig cache - # version dependent - # priority 0 - cacheConfSupport = makeCacheConf { version = supportVersion; }; - cacheConfLatest = makeCacheConf {}; - - # generate the font cache setting file for a fontconfig version - # use latest when no version is passed - makeCacheConf = { version ? null }: - let - fcPackage = if version == null - then "fontconfig" - else "fontconfig_${version}"; - makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; - cache = makeCache pkgs."${fcPackage}"; - cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; - in - pkgs.writeText "fc-00-nixos-cache.conf" '' - <?xml version='1.0'?> - <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> - <fontconfig> - <!-- Font directories --> - ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)} - <!-- Pre-generated font caches --> - <cachedir>${cache}</cachedir> - ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' - <cachedir>${cache32}</cachedir> - ''} - </fontconfig> - ''; - - # rendering settings configuration file - # priority 10 - renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" '' +let + cfg = config.fonts.fontconfig; + + fcBool = x: "<bool>" + (boolToString x) + "</bool>"; + + # back-supported fontconfig version and package + # version is used for font cache generation + supportVersion = "210"; + supportPkg = pkgs."fontconfig_${supportVersion}"; + + # latest fontconfig version and package + # version is used for configuration folder name, /etc/fonts/VERSION/ + # note: format differs from supportVersion and can not be used with makeCacheConf + latestVersion = pkgs.fontconfig.configVersion; + latestPkg = pkgs.fontconfig; + + # supported version fonts.conf + supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; + + # configuration file to read fontconfig cache + # version dependent + # priority 0 + cacheConfSupport = makeCacheConf { version = supportVersion; }; + cacheConfLatest = makeCacheConf {}; + + # generate the font cache setting file for a fontconfig version + # use latest when no version is passed + makeCacheConf = { version ? null }: + let + fcPackage = if version == null + then "fontconfig" + else "fontconfig_${version}"; + makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; + cache = makeCache pkgs."${fcPackage}"; + cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; + in + pkgs.writeText "fc-00-nixos-cache.conf" '' <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> - - <!-- Default rendering settings --> - <match target="pattern"> - <edit mode="append" name="hinting"> - ${fcBool cfg.hinting.enable} - </edit> - <edit mode="append" name="autohint"> - ${fcBool cfg.hinting.autohint} - </edit> - <edit mode="append" name="hintstyle"> - <const>hintslight</const> - </edit> - <edit mode="append" name="antialias"> - ${fcBool cfg.antialias} - </edit> - <edit mode="append" name="rgba"> - <const>${cfg.subpixel.rgba}</const> - </edit> - <edit mode="append" name="lcdfilter"> - <const>lcd${cfg.subpixel.lcdfilter}</const> - </edit> - </match> - - ${optionalString (cfg.dpi != 0) '' - <match target="pattern"> - <edit name="dpi" mode="assign"> - <double>${toString cfg.dpi}</double> - </edit> - </match> + <!-- Font directories --> + ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)} + <!-- Pre-generated font caches --> + <cachedir>${cache}</cachedir> + ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + <cachedir>${cache32}</cachedir> ''} - - </fontconfig> - ''; - - # local configuration file - # priority 51 - localConf = pkgs.writeText "fc-local.conf" cfg.localConf; - - # default fonts configuration file - # priority 52 - defaultFontsConf = - let genDefault = fonts: name: - optionalString (fonts != []) '' - <alias> - <family>${name}</family> - <prefer> - ${concatStringsSep "" - (map (font: '' - <family>${font}</family> - '') fonts)} - </prefer> - </alias> - ''; - in - pkgs.writeText "fc-52-nixos-default-fonts.conf" '' - <?xml version='1.0'?> - <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> - <fontconfig> - - <!-- Default fonts --> - ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} - - ${genDefault cfg.defaultFonts.serif "serif"} - - ${genDefault cfg.defaultFonts.monospace "monospace"} - </fontconfig> ''; - # bitmap font options - # priority 53 - rejectBitmaps = pkgs.writeText "fc-53-nixos-bitmaps.conf" '' - <?xml version="1.0"?> - <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> - <fontconfig> - - ${optionalString (!cfg.allowBitmaps) '' - <!-- Reject bitmap fonts --> - <selectfont> - <rejectfont> - <pattern> - <patelt name="scalable"><bool>false</bool></patelt> - </pattern> - </rejectfont> - </selectfont> - ''} - - <!-- Use embedded bitmaps in fonts like Calibri? --> - <match target="font"> - <edit name="embeddedbitmap" mode="assign"> - ${fcBool cfg.useEmbeddedBitmaps} + # rendering settings configuration file + # priority 10 + renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" '' + <?xml version='1.0'?> + <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> + <fontconfig> + + <!-- Default rendering settings --> + <match target="pattern"> + <edit mode="append" name="hinting"> + ${fcBool cfg.hinting.enable} + </edit> + <edit mode="append" name="autohint"> + ${fcBool cfg.hinting.autohint} + </edit> + <edit mode="append" name="hintstyle"> + <const>hintslight</const> + </edit> + <edit mode="append" name="antialias"> + ${fcBool cfg.antialias} + </edit> + <edit mode="append" name="rgba"> + <const>${cfg.subpixel.rgba}</const> + </edit> + <edit mode="append" name="lcdfilter"> + <const>lcd${cfg.subpixel.lcdfilter}</const> </edit> </match> - </fontconfig> - ''; - - # reject Type 1 fonts - # priority 53 - rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' - <?xml version="1.0"?> - <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> - <fontconfig> - - <!-- Reject Type 1 fonts --> - <selectfont> - <rejectfont> - <pattern> - <patelt name="fontformat"><string>Type 1</string></patelt> - </pattern> - </rejectfont> - </selectfont> - - </fontconfig> - ''; - - # fontconfig configuration package - confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' - support_folder=$out/etc/fonts - latest_folder=$out/etc/fonts/${latestVersion} - - mkdir -p $support_folder/conf.d - mkdir -p $latest_folder/conf.d - - # fonts.conf - ln -s ${supportFontsConf} $support_folder/fonts.conf - ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ - $latest_folder/fonts.conf - - # fontconfig default config files - ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \ - $support_folder/conf.d/ - ln -s ${latestPkg.out}/etc/fonts/conf.d/*.conf \ - $latest_folder/conf.d/ - - # update latest 51-local.conf path to look at the latest local.conf - rm $latest_folder/conf.d/51-local.conf - - substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \ - $latest_folder/conf.d/51-local.conf \ - --replace local.conf /etc/fonts/${latestVersion}/local.conf - - # 00-nixos-cache.conf - ln -s ${cacheConfSupport} \ - $support_folder/conf.d/00-nixos-cache.conf - ln -s ${cacheConfLatest} $latest_folder/conf.d/00-nixos-cache.conf - - # 10-nixos-rendering.conf - ln -s ${renderConf} $support_folder/conf.d/10-nixos-rendering.conf - ln -s ${renderConf} $latest_folder/conf.d/10-nixos-rendering.conf - - # 50-user.conf - ${optionalString (! cfg.includeUserConf) '' - rm $support_folder/conf.d/50-user.conf - rm $latest_folder/conf.d/50-user.conf - ''} - - # local.conf (indirect priority 51) - ${optionalString (cfg.localConf != "") '' - ln -s ${localConf} $support_folder/local.conf - ln -s ${localConf} $latest_folder/local.conf - ''} - - # 52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $support_folder/conf.d/52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $latest_folder/conf.d/52-nixos-default-fonts.conf - - # 53-nixos-bitmaps.conf - ln -s ${rejectBitmaps} $support_folder/conf.d/53-nixos-bitmaps.conf - ln -s ${rejectBitmaps} $latest_folder/conf.d/53-nixos-bitmaps.conf - - ${optionalString (! cfg.allowType1) '' - # 53-nixos-reject-type1.conf - ln -s ${rejectType1} $support_folder/conf.d/53-nixos-reject-type1.conf - ln -s ${rejectType1} $latest_folder/conf.d/53-nixos-reject-type1.conf + ${optionalString (cfg.dpi != 0) '' + <match target="pattern"> + <edit name="dpi" mode="assign"> + <double>${toString cfg.dpi}</double> + </edit> + </match> ''} - ''; - # Package with configuration files - # this merge all the packages in the fonts.fontconfig.confPackages list - fontconfigEtc = pkgs.buildEnv { - name = "fontconfig-etc"; - paths = cfg.confPackages; - ignoreCollisions = true; - }; + </fontconfig> + ''; + + # local configuration file + localConf = pkgs.writeText "fc-local.conf" cfg.localConf; + + # default fonts configuration file + # priority 52 + defaultFontsConf = + let genDefault = fonts: name: + optionalString (fonts != []) '' + <alias> + <family>${name}</family> + <prefer> + ${concatStringsSep "" + (map (font: '' + <family>${font}</family> + '') fonts)} + </prefer> + </alias> + ''; + in + pkgs.writeText "fc-52-nixos-default-fonts.conf" '' + <?xml version='1.0'?> + <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> + <fontconfig> + + <!-- Default fonts --> + ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} + + ${genDefault cfg.defaultFonts.serif "serif"} + + ${genDefault cfg.defaultFonts.monospace "monospace"} + + </fontconfig> + ''; + + # bitmap font options + # priority 53 + rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" '' + <?xml version="1.0"?> + <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + <fontconfig> + + ${optionalString (!cfg.allowBitmaps) '' + <!-- Reject bitmap fonts --> + <selectfont> + <rejectfont> + <pattern> + <patelt name="scalable"><bool>false</bool></patelt> + </pattern> + </rejectfont> + </selectfont> + ''} + + <!-- Use embedded bitmaps in fonts like Calibri? --> + <match target="font"> + <edit name="embeddedbitmap" mode="assign"> + ${fcBool cfg.useEmbeddedBitmaps} + </edit> + </match> + + </fontconfig> + ''; + + # reject Type 1 fonts + # priority 53 + rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' + <?xml version="1.0"?> + <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + <fontconfig> + + <!-- Reject Type 1 fonts --> + <selectfont> + <rejectfont> + <pattern> + <patelt name="fontformat"><string>Type 1</string></patelt> + </pattern> + </rejectfont> + </selectfont> + + </fontconfig> + ''; + + # fontconfig configuration package + confPkg = pkgs.runCommand "fontconfig-conf" { + preferLocalBuild = true; + } '' + support_folder=$out/etc/fonts/conf.d + latest_folder=$out/etc/fonts/${latestVersion}/conf.d + + mkdir -p $support_folder + mkdir -p $latest_folder + + # fonts.conf + ln -s ${supportFontsConf} $support_folder/../fonts.conf + ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ + $latest_folder/../fonts.conf + + # fontconfig default config files + ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \ + $support_folder/ + ln -s ${latestPkg.out}/etc/fonts/conf.d/*.conf \ + $latest_folder/ + + # update latest 51-local.conf path to look at the latest local.conf + rm $latest_folder/51-local.conf + + substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \ + $latest_folder/51-local.conf \ + --replace local.conf /etc/fonts/${latestVersion}/local.conf + + # 00-nixos-cache.conf + ln -s ${cacheConfSupport} \ + $support_folder/00-nixos-cache.conf + ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + + # 10-nixos-rendering.conf + ln -s ${renderConf} $support_folder/10-nixos-rendering.conf + ln -s ${renderConf} $latest_folder/10-nixos-rendering.conf + + # 50-user.conf + ${optionalString (!cfg.includeUserConf) '' + rm $support_folder/50-user.conf + rm $latest_folder/50-user.conf + ''} + + # local.conf (indirect priority 51) + ${optionalString (cfg.localConf != "") '' + ln -s ${localConf} $support_folder/../local.conf + ln -s ${localConf} $latest_folder/../local.conf + ''} + + # 52-nixos-default-fonts.conf + ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf + ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf + + # 53-no-bitmaps.conf + ln -s ${rejectBitmaps} $support_folder/53-no-bitmaps.conf + ln -s ${rejectBitmaps} $latest_folder/53-no-bitmaps.conf + + ${optionalString (!cfg.allowType1) '' + # 53-nixos-reject-type1.conf + ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf + ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf + ''} + ''; + + # Package with configuration files + # this merge all the packages in the fonts.fontconfig.confPackages list + fontconfigEtc = pkgs.buildEnv { + name = "fontconfig-etc"; + paths = cfg.confPackages; + ignoreCollisions = true; + }; in { diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/locale.nix index b15948f6e2e5..6f0565881877 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/qt5.nix b/nixos/modules/config/qt5.nix new file mode 100644 index 000000000000..7de1c0f5d557 --- /dev/null +++ b/nixos/modules/config/qt5.nix @@ -0,0 +1,102 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.qt5; + + isQGnome = cfg.platformTheme == "gnome" && cfg.style == "adwaita"; + isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita"; + + packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] + else if isQtStyle then [ pkgs.qtstyleplugins ] + else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; + +in + +{ + + options = { + qt5 = { + + enable = mkEnableOption "Qt5 theming configuration"; + + platformTheme = mkOption { + type = types.enum [ + "gtk2" + "gnome" + ]; + example = "gnome"; + relatedPackages = [ + "qgnomeplatform" + ["libsForQt5" "qtstyleplugins"] + ]; + description = '' + Selects the platform theme to use for Qt5 applications.</para> + <para>The options are + <variablelist> + <varlistentry> + <term><literal>gtk</literal></term> + <listitem><para>Use GTK theme with + <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link> + </para></listitem> + </varlistentry> + <varlistentry> + <term><literal>gnome</literal></term> + <listitem><para>Use GNOME theme with + <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link> + </para></listitem> + </varlistentry> + </variablelist> + ''; + }; + + style = mkOption { + type = types.enum [ + "adwaita" + "cleanlooks" + "gtk2" + "motif" + "plastique" + ]; + example = "adwaita"; + relatedPackages = [ + "adwaita-qt" + ["libsForQt5" "qtstyleplugins"] + ]; + description = '' + Selects the style to use for Qt5 applications.</para> + <para>The options are + <variablelist> + <varlistentry> + <term><literal>adwaita</literal></term> + <listitem><para>Use Adwaita Qt style with + <link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link> + </para></listitem> + </varlistentry> + <varlistentry> + <term><literal>cleanlooks</literal></term> + <term><literal>gtk2</literal></term> + <term><literal>motif</literal></term> + <term><literal>plastique</literal></term> + <listitem><para>Use styles from + <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link> + </para></listitem> + </varlistentry> + </variablelist> + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme; + + environment.variables.QT_STYLE_OVERRIDE = cfg.style; + + environment.systemPackages = packages; + + }; +} diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 0c6a7e2431aa..fb2b58eed720 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -42,22 +42,16 @@ in config = { - environment.etc."sysctl.d/nixos.conf".text = + environment.etc."sysctl.d/60-nixos.conf".text = concatStrings (mapAttrsToList (n: v: optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n" ) config.boot.kernel.sysctl); systemd.services.systemd-sysctl = { wantedBy = [ "multi-user.target" ]; - restartTriggers = [ config.environment.etc."sysctl.d/nixos.conf".source ]; + restartTriggers = [ config.environment.etc."sysctl.d/60-nixos.conf".source ]; }; - # Enable hardlink and symlink restrictions. See - # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=800179c9b8a1e796e441674776d11cd4c05d61d7 - # for details. - boot.kernel.sysctl."fs.protected_hardlinks" = true; - boot.kernel.sysctl."fs.protected_symlinks" = true; - # Hide kernel pointers (e.g. in /proc/modules) for unprivileged # users as these make it easier to exploit kernel vulnerabilities. boot.kernel.sysctl."kernel.kptr_restrict" = 1; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index ef5e6346f02e..59cea51c611b 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -267,6 +267,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) { next if !defined $u; $hashedPassword = "!" if !$spec->{mutableUsers}; $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME + chomp $hashedPassword; push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n"; $shadowSeen{$name} = 1; } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c3f228c9bcc4..25f1c67ce830 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/config/vte.nix b/nixos/modules/config/vte.nix new file mode 100644 index 000000000000..d4a8c926fef2 --- /dev/null +++ b/nixos/modules/config/vte.nix @@ -0,0 +1,52 @@ +# VTE + +{ config, pkgs, lib, ... }: + +with lib; + +let + + vteInitSnippet = '' + # Show current working directory in VTE terminals window title. + # Supports both bash and zsh, requires interactive shell. + . ${pkgs.vte}/etc/profile.d/vte.sh + ''; + +in + +{ + + options = { + + programs.bash.vteIntegration = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable Bash integration for VTE terminals. + This allows it to preserve the current directory of the shell + across terminals. + ''; + }; + + programs.zsh.vteIntegration = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable Zsh integration for VTE terminals. + This allows it to preserve the current directory of the shell + across terminals. + ''; + }; + + }; + + config = mkMerge [ + (mkIf config.programs.bash.vteIntegration { + programs.bash.interactiveShellInit = mkBefore vteInitSnippet; + }) + + (mkIf config.programs.zsh.vteIntegration { + programs.zsh.interactiveShellInit = vteInitSnippet; + }) + ]; +} diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix new file mode 100644 index 000000000000..f57502d4c83e --- /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 f8e021f551e8..8109ef76c402 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 f65239a5bc0a..1578e1547bc1 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 1c3c9cb30b41..2536ba73a1de 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/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 0c407b199367..7f355a132496 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -73,8 +73,8 @@ in firmwareSize = mkOption { type = types.int; - # As of 2019-05-31 the Raspberry pi firmware + u-bot takes ~13MiB - default = 20; + # As of 2019-08-18 the Raspberry pi firmware + u-boot takes ~18MiB + default = 30; description = '' Size of the /boot/firmware partition, in megabytes. ''; diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 518dbbbf21e3..4680cd8ae95a 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/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 6e0b49fa9af0..3c47e79d0512 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/ids.nix b/nixos/modules/misc/ids.nix index 1047df95cdf5..efd8544d6a21 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -251,7 +251,7 @@ gale = 223; matrix-synapse = 224; rspamd = 225; - rmilter = 226; + # rmilter = 226; # unused, removed 2019-08-22 cfdyndns = 227; gammu-smsd = 228; pdnsd = 229; @@ -340,6 +340,7 @@ cockroachdb = 313; zoneminder = 314; paperless = 315; + mailman = 316; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -559,7 +560,7 @@ gale = 223; matrix-synapse = 224; rspamd = 225; - rmilter = 226; + # rmilter = 226; # unused, removed 2019-08-22 cfdyndns = 227; pdnsd = 229; octoprint = 230; @@ -640,6 +641,7 @@ cockroachdb = 313; zoneminder = 314; paperless = 315; + mailman = 316; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e0c192246c0c..afb74581e239 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 df453aac9fef..6331e76c648f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,12 +20,14 @@ ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix + ./config/locale.nix ./config/malloc.nix ./config/networking.nix ./config/no-x-libs.nix ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix + ./config/qt5.nix ./config/resolvconf.nix ./config/shells-environment.nix ./config/swap.nix @@ -33,10 +35,10 @@ ./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 + ./config/vte.nix ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix @@ -46,6 +48,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 +109,16 @@ ./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/gnome-terminal.nix + ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix @@ -209,6 +219,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 @@ -277,24 +288,18 @@ ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix ./services/desktops/gsignond.nix + ./services/desktops/gvfs.nix ./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 ./services/desktops/gnome3/gnome-online-miners.nix ./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 ./services/desktops/gnome3/sushi.nix @@ -382,7 +387,6 @@ ./services/mail/spamassassin.nix ./services/mail/rspamd.nix ./services/mail/rss2email.nix - ./services/mail/rmilter.nix ./services/mail/roundcube.nix ./services/mail/nullmailer.nix ./services/misc/airsonic.nix @@ -433,13 +437,13 @@ ./services/misc/logkeys.nix ./services/misc/leaps.nix ./services/misc/lidarr.nix - ./services/misc/mantisbt.nix ./services/misc/mathics.nix ./services/misc/matrix-synapse.nix ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix + ./services/misc/metabase.nix ./services/misc/mwlib.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix @@ -517,7 +521,6 @@ ./services/monitoring/scollector.nix ./services/monitoring/smartd.nix ./services/monitoring/sysstat.nix - ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix @@ -605,6 +608,7 @@ ./services/networking/iodine.nix ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix + ./services/networking/jormungandr.nix ./services/networking/iwd.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix @@ -644,6 +648,7 @@ ./services/networking/nullidentdmod.nix ./services/networking/nylon.nix ./services/networking/ocserv.nix + ./services/networking/ofono.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix ./services/networking/openntpd.nix @@ -784,6 +789,7 @@ ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix ./services/web-apps/miniflux.nix + ./services/web-apps/moodle.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix @@ -797,6 +803,7 @@ ./services/web-apps/zabbix.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix + ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/hitch/default.nix ./services/web-servers/hydron.nix @@ -819,6 +826,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 @@ -858,7 +866,6 @@ ./system/activation/activation-script.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix - ./system/boot/coredump.nix ./system/boot/emergency-mode.nix ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 9e9ddd4f3788..626d8b1d2bde 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -14,8 +14,6 @@ with lib; nix.allowedUsers = mkDefault [ "@users" ]; - environment.memoryAllocator.provider = mkDefault "graphene-hardened"; - security.hideProcessInformation = mkDefault true; security.lockKernelModules = mkDefault true; @@ -44,6 +42,9 @@ with lib; # Disable legacy virtual syscalls "vsyscall=none" + + # Enable page allocator randomization + "page_alloc.shuffle=1" ]; boot.blacklistedKernelModules = [ @@ -92,23 +93,17 @@ with lib; # Disable ftrace debugging boot.kernel.sysctl."kernel.ftrace_enabled" = mkDefault false; - # Enable reverse path filtering (that is, do not attempt to route packets - # that "obviously" do not belong to the iface's network; dropped packets are - # logged as martians). + # Enable strict reverse path filtering (that is, do not attempt to route + # packets that "obviously" do not belong to the iface's network; dropped + # packets are logged as martians). boot.kernel.sysctl."net.ipv4.conf.all.log_martians" = mkDefault true; - boot.kernel.sysctl."net.ipv4.conf.all.rp_filter" = mkDefault true; + boot.kernel.sysctl."net.ipv4.conf.all.rp_filter" = mkDefault "1"; boot.kernel.sysctl."net.ipv4.conf.default.log_martians" = mkDefault true; - boot.kernel.sysctl."net.ipv4.conf.default.rp_filter" = mkDefault true; + boot.kernel.sysctl."net.ipv4.conf.default.rp_filter" = mkDefault "1"; # Ignore broadcast ICMP (mitigate SMURF) boot.kernel.sysctl."net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault true; - # Ignore route information from sender - boot.kernel.sysctl."net.ipv4.conf.all.accept_source_route" = mkDefault false; - boot.kernel.sysctl."net.ipv4.conf.default.accept_source_route" = mkDefault false; - boot.kernel.sysctl."net.ipv6.conf.all.accept_source_route" = mkDefault false; - boot.kernel.sysctl."net.ipv6.conf.default.accept_source_route" = mkDefault false; - # Ignore incoming ICMP redirects (note: default is needed to ensure that the # setting is applied to interfaces added after the sysctls are set) boot.kernel.sysctl."net.ipv4.conf.all.accept_redirects" = mkDefault false; @@ -121,4 +116,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 580ea4a58e5b..1a6e06995603 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/dconf.nix b/nixos/modules/programs/dconf.nix index b7bfb8504b6f..eeebc3558bdf 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -34,11 +34,11 @@ in services.dbus.packages = [ pkgs.gnome3.dconf ]; - environment.variables.GIO_EXTRA_MODULES = optional cfg.enable - "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; - # https://github.com/NixOS/nixpkgs/pull/31891 - #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # For dconf executable + environment.systemPackages = [ pkgs.gnome3.dconf ]; + + # Needed for unwrapped applications + environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ]; }; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3c6d356ef998..66eb83482664 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -21,11 +21,11 @@ in PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; XCURSOR_PATH = [ "$HOME/.icons" ]; + XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc }; - 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 5f040a16f067..473fddb09d02 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 7fb558a98953..64f6a94e7641 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 000000000000..c15896efbb51 --- /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 139534cdb892..1cf839a6ddb0 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 f6efb6684240..bfa3d409ee30 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/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix new file mode 100644 index 000000000000..0036677a1576 --- /dev/null +++ b/nixos/modules/programs/gnome-terminal.nix @@ -0,0 +1,36 @@ +# GNOME Terminal. + +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.programs.gnome-terminal; + +in + +{ + + # Added 2019-08-19 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-terminal-server" "enable" ] + [ "programs" "gnome-terminal" "enable" ]) + ]; + + options = { + + programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal"; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; + services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; + systemd.packages = [ pkgs.gnome3.gnome-terminal ]; + + programs.bash.vteIntegration = true; + programs.zsh.vteIntegration = true; + }; +} diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 9618d61a1f5b..bcbc994efe9b 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -83,7 +83,8 @@ in systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable { wantedBy = [ "sockets.target" ]; }; - + + environment.systemPackages = with pkgs; [ cfg.package ]; systemd.packages = [ cfg.package ]; environment.interactiveShellInit = '' diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/programs/gpaste.nix index 5a8258775e0a..4f6deb77e5eb 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 08a6cd0a6049..000000000000 --- 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/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index bd1a77680663..6e9eefd74d18 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -69,9 +69,7 @@ in promptInit = mkOption { default = '' - if [ "$TERM" != dumb ]; then - autoload -U promptinit && promptinit && prompt walters - fi + autoload -U promptinit && promptinit && prompt walters && setopt prompt_sp ''; description = '' Shell script code used to initialise the zsh prompt. @@ -213,6 +211,14 @@ in ${cfg.promptInit} + # Need to disable features to support TRAMP + if [ "$TERM" = dumb ]; then + unsetopt zle prompt_cr prompt_subst + unset RPS1 RPROMPT + PS1='$ ' + PROMPT='$ ' + fi + # Read system-wide modifications. if test -f /etc/zshrc.local; then . /etc/zshrc.local diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4ae642222740..348ad094e5ad 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" ]) @@ -68,8 +72,8 @@ with lib; # PAM (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) - (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") - (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # rmilter/rspamd + (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service") # Xsession script (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ]) @@ -174,6 +178,9 @@ with lib; The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>. '') + # phpfpm + (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.") + # zabbixServer (mkRenamedOptionModule [ "services" "zabbixServer" "dbServer" ] [ "services" "zabbixServer" "database" "host" ]) @@ -221,6 +228,8 @@ 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.") + (mkRemovedOptionModule [ "systemd" "coredump" "enable" ] "Enabled by default. Set boot.kernel.sysctl.\"kernel.core_pattern\" = \"core\"; to disable.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -257,7 +266,21 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) - ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" + # 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" ] (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 687cdfb5ba57..39112c3970d5 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/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 9562ad1b164e..d4b0b098b78e 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -19,6 +19,20 @@ in { TCP: 9100 - 9200 ''; }; + user = mkOption { + type = types.str; + default = "roon-server"; + description = '' + User to run the Roon Server as. + ''; + }; + group = mkOption { + type = types.str; + default = "roon-server"; + description = '' + Group to run the Roon Server as. + ''; + }; }; }; @@ -33,8 +47,8 @@ in { serviceConfig = { ExecStart = "${pkgs.roon-server}/opt/start.sh"; LimitNOFILE = 8192; - DynamicUser = true; - SupplementaryGroups = "audio"; + User = cfg.user; + Group = cfg.group; StateDirectory = name; }; }; @@ -45,5 +59,15 @@ in { ]; allowedUDPPorts = [ 9003 ]; }; + + + users.groups."${cfg.group}" = {}; + users.users."${cfg.user}" = + if cfg.user == "roon-server" then { + isSystemUser = true; + description = "Roon Server user"; + groups = [ cfg.group "audio" ]; + } + else {}; }; } diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index b845f370fb70..1884f3536a97 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 000000000000..d9a37037992e --- /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 5ddf8ba4bfbd..77e404116c8a 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 052ff1f308eb..84d2c8674f4e 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -86,7 +86,24 @@ 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; + MemoryDenyWriteExecute = true; }; }; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 7ff899970ccd..10250bb5193a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -330,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 1492d855aa03..7fb0024f37dc 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/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 4286251357f7..748a025414a7 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.services.gnome3.gnome-online-accounts.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ]; + environment.systemPackages = [ pkgs.gnome-online-accounts ]; - services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ]; + services.dbus.packages = [ pkgs.gnome-online-accounts ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix deleted file mode 100644 index fd14efee5f2e..000000000000 --- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix +++ /dev/null @@ -1,41 +0,0 @@ -# GNOME Documents daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - ###### interface - - options = { - - services.gnome3.gnome-terminal-server = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable GNOME Terminal server service, - needed for gnome-terminal. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.gnome3.gnome-terminal-server.enable { - - environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - - services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - - systemd.packages = [ pkgs.gnome3.gnome-terminal ]; - - }; - -} diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index 1f6ce2ae968e..f83962877700 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -12,14 +12,7 @@ with lib; services.gnome3.gnome-user-share = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable GNOME User Share, a service that exports the - contents of the Public folder in your home directory on the local network. - ''; - }; + enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; }; @@ -30,12 +23,13 @@ with lib; config = mkIf config.services.gnome3.gnome-user-share.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-user-share ]; + environment.systemPackages = [ + pkgs.gnome3.gnome-user-share + ]; - services.xserver.displayManager.sessionCommands = with pkgs.gnome3; '' - # Don't let gnome-control-center depend upon gnome-user-share - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name} - ''; + systemd.packages = [ + pkgs.gnome3.gnome-user-share + ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix deleted file mode 100644 index 4e99d191f18c..000000000000 --- a/nixos/modules/services/desktops/gnome3/gvfs.nix +++ /dev/null @@ -1,43 +0,0 @@ -# gvfs backends - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - ###### interface - - options = { - - services.gnome3.gvfs = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable gvfs backends, userspace virtual filesystem used - by GNOME components via D-Bus. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.gnome3.gvfs.enable { - - environment.systemPackages = [ pkgs.gnome3.gvfs ]; - - services.dbus.packages = [ pkgs.gnome3.gvfs ]; - - systemd.packages = [ pkgs.gnome3.gvfs ]; - - services.udev.packages = [ pkgs.libmtp.bin ]; - - }; - -} diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix index 20154fc2fed3..b390d8368c65 100644 --- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.tracker-miners.enable { - environment.systemPackages = [ pkgs.gnome3.tracker-miners ]; + environment.systemPackages = [ pkgs.tracker-miners ]; - services.dbus.packages = [ pkgs.gnome3.tracker-miners ]; + services.dbus.packages = [ pkgs.tracker-miners ]; - systemd.packages = [ pkgs.gnome3.tracker-miners ]; + systemd.packages = [ pkgs.tracker-miners ]; }; diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index c061f7890499..2e8292742264 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.gnome3.tracker.enable { - environment.systemPackages = [ pkgs.gnome3.tracker ]; + environment.systemPackages = [ pkgs.tracker ]; - services.dbus.packages = [ pkgs.gnome3.tracker ]; + services.dbus.packages = [ pkgs.tracker ]; - systemd.packages = [ pkgs.gnome3.tracker ]; + systemd.packages = [ pkgs.tracker ]; }; diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix new file mode 100644 index 000000000000..1d002eac41de --- /dev/null +++ b/nixos/modules/services/desktops/gvfs.nix @@ -0,0 +1,59 @@ +# GVfs + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.gvfs; + +in + +{ + + # Added 2019-08-19 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gvfs" "enable" ] + [ "services" "gvfs" "enable" ]) + ]; + + ###### interface + + options = { + + services.gvfs = { + + enable = mkEnableOption "GVfs, a userspace virtual filesystem"; + + # gvfs can be built with multiple configurations + package = mkOption { + type = types.package; + default = pkgs.gnome3.gvfs; + description = "Which GVfs package to use."; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + services.dbus.packages = [ cfg.package ]; + + systemd.packages = [ cfg.package ]; + + services.udev.packages = [ pkgs.libmtp.bin ]; + + # Needed for unwrapped applications + environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; + + }; + +} diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index a3041ae22e78..acd69f18376c 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 39a68f4b5536..eb9288fca586 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/trezord.nix b/nixos/modules/services/hardware/trezord.nix index c06a0665d02f..62824ed7350a 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -4,6 +4,12 @@ with lib; let cfg = config.services.trezord; in { + + ### docs + + meta = { + doc = ./trezord.xml; + }; ### interface @@ -16,6 +22,22 @@ in { Enable Trezor bridge daemon, for use with Trezor hardware bitcoin wallets. ''; }; + + emulator.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable Trezor emulator support. + ''; + }; + + emulator.port = mkOption { + type = types.port; + default = 21324; + description = '' + Listening port for the Trezor emulator. + ''; + }; }; }; @@ -44,7 +66,7 @@ in { path = []; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.trezord}/bin/trezord-go"; + ExecStart = "${pkgs.trezord}/bin/trezord-go ${optionalString cfg.emulator.enable "-e ${builtins.toString cfg.emulator.port}"}"; User = "trezord"; }; }; diff --git a/nixos/modules/services/hardware/trezord.xml b/nixos/modules/services/hardware/trezord.xml new file mode 100644 index 000000000000..972d409d9d0e --- /dev/null +++ b/nixos/modules/services/hardware/trezord.xml @@ -0,0 +1,26 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="trezor"> + <title>Trezor</title> + <para> + Trezor is an open-source cryptocurrency hardware wallet and security token + allowing secure storage of private keys. + </para> + <para> + It offers advanced features such U2F two-factor authorization, SSH login + through + <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>, + <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a + <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>. + For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>. + </para> + <para> + To enable Trezor support, add the following to your <filename>configuration.nix</filename>: +<programlisting> +<xref linkend="opt-services.trezord.enable"/> = true; +</programlisting> + This will add all necessary udev rules and start Trezor Bridge. + </para> +</chapter> diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 612ae06d0a79..54799d699a74 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.awstats; + httpd = config.services.httpd; package = pkgs.awstats; in @@ -67,50 +68,43 @@ in environment.etc."awstats/awstats.conf".source = pkgs.runCommand "awstats.conf" { preferLocalBuild = true; } ( let - cfg-httpd = config.services.httpd; logFormat = - if cfg-httpd.logFormat == "combined" then "1" else - if cfg-httpd.logFormat == "common" then "4" else - throw "awstats service doesn't support Apache log format `${cfg-httpd.logFormat}`"; + if httpd.logFormat == "combined" then "1" else + if httpd.logFormat == "common" then "4" else + throw "awstats service doesn't support Apache log format `${httpd.logFormat}`"; in '' sed \ -e 's|^\(DirData\)=.*$|\1="${cfg.vardir}"|' \ -e 's|^\(DirIcons\)=.*$|\1="icons"|' \ -e 's|^\(CreateDirDataIfNotExists\)=.*$|\1=1|' \ - -e 's|^\(SiteDomain\)=.*$|\1="${cfg-httpd.hostName}"|' \ - -e 's|^\(LogFile\)=.*$|\1="${cfg-httpd.logDir}/access_log"|' \ + -e 's|^\(SiteDomain\)=.*$|\1="${httpd.hostName}"|' \ + -e 's|^\(LogFile\)=.*$|\1="${httpd.logDir}/access_log"|' \ -e 's|^\(LogFormat\)=.*$|\1=${logFormat}|' \ < '${package.out}/wwwroot/cgi-bin/awstats.model.conf' > "$out" echo '${cfg.extraConfig}' >> "$out" ''); + systemd.tmpfiles.rules = optionals cfg.service.enable [ + "d '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -" + "Z '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -" + ]; + # The httpd sub-service showing awstats. - services.httpd.enable = mkIf cfg.service.enable true; - services.httpd.extraSubservices = mkIf cfg.service.enable [ { function = { serverInfo, ... }: { - extraConfig = - '' - Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/" - Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/" - Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/" - ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/" + services.httpd = optionalAttrs cfg.service.enable { + enable = true; + extraConfig = '' + Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/" + Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/" + Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/" + ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/" - <Directory "${package.out}/wwwroot"> - Options None - AllowOverride None - Order allow,deny - Allow from all - </Directory> - ''; - startupScript = - let - inherit (serverInfo.serverConfig) user group; - in pkgs.writeScript "awstats_startup.sh" - '' - mkdir -p '${cfg.vardir}' - chown '${user}:${group}' '${cfg.vardir}' - ''; - };}]; + <Directory "${package.out}/wwwroot"> + Options None + Require all granted + </Directory> + ''; + }; systemd.services.awstats-update = mkIf (cfg.updateAt != null) { description = "awstats log collector"; diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix index 5b5cc294e5c7..374a3dd75c1c 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 dab1b29aa4be..2b08ab1e6aa6 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/rmilter.nix b/nixos/modules/services/mail/rmilter.nix deleted file mode 100644 index 466365b6b305..000000000000 --- a/nixos/modules/services/mail/rmilter.nix +++ /dev/null @@ -1,252 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - rspamdCfg = config.services.rspamd; - postfixCfg = config.services.postfix; - cfg = config.services.rmilter; - - inetSocket = addr: port: "inet:${addr}:${toString port}"; - unixSocket = sock: "unix:${sock}"; - - systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path - else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}"; - rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path - else inetSocket cfg.bindSocket.address cfg.bindSocket.port; - - rmilterConf = '' - pidfile = /run/rmilter/rmilter.pid; - bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket}; - tempdir = /tmp; - '' + (with cfg.rspamd; if enable then '' - spamd { - servers = ${concatStringsSep ", " servers}; - connect_timeout = 1s; - results_timeout = 20s; - error_time = 10; - dead_time = 300; - maxerrors = 10; - reject_message = "${rejectMessage}"; - ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} - - # rspamd_metric - metric for using with rspamd - # Default: "default" - rspamd_metric = "default"; - ${extraConfig} - }; - '' else "") + cfg.extraConfig; - - rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; - -in - -{ - - ###### interface - - options = { - - services.rmilter = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to run the rmilter daemon."; - }; - - debug = mkOption { - type = types.bool; - default = false; - description = "Whether to run the rmilter daemon in debug mode."; - }; - - user = mkOption { - type = types.string; - default = "rmilter"; - description = '' - User to use when no root privileges are required. - ''; - }; - - group = mkOption { - type = types.string; - default = "rmilter"; - description = '' - Group to use when no root privileges are required. - ''; - }; - - bindSocket.type = mkOption { - type = types.enum [ "unix" "inet" ]; - default = "unix"; - description = '' - What kind of socket rmilter should listen on. Either "unix" - for an Unix domain socket or "inet" for a TCP socket. - ''; - }; - - bindSocket.path = mkOption { - type = types.str; - default = "/run/rmilter.sock"; - description = '' - Path to Unix domain socket to listen on. - ''; - }; - - bindSocket.address = mkOption { - type = types.str; - default = "[::1]"; - example = "0.0.0.0"; - description = '' - Inet address to listen on. - ''; - }; - - bindSocket.port = mkOption { - type = types.int; - default = 11990; - description = '' - Inet port to listen on. - ''; - }; - - socketActivation = mkOption { - type = types.bool; - default = true; - description = '' - Enable systemd socket activation for rmilter. - - Disabling socket activation is not recommended when a Unix - domain socket is used and could lead to incorrect - permissions. - ''; - }; - - rspamd = { - enable = mkOption { - type = types.bool; - default = rspamdCfg.enable; - description = "Whether to use rspamd to filter mails"; - }; - - servers = mkOption { - type = types.listOf types.str; - default = ["r:/run/rspamd/rspamd.sock"]; - description = '' - Spamd socket definitions. - Is server name is prefixed with r: it is rspamd server. - ''; - }; - - whitelist = mkOption { - type = types.listOf types.str; - default = [ ]; - description = "list of ips or nets that should be not checked with spamd"; - }; - - rejectMessage = mkOption { - type = types.str; - default = "Spam message rejected; If this is not spam contact abuse"; - description = "reject message for spam"; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Custom snippet to append to end of `spamd' section"; - }; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Custom snippet to append to rmilter config"; - }; - - postfix = { - enable = mkOption { - type = types.bool; - default = false; - description = "Add rmilter to postfix main.conf"; - }; - - configFragment = mkOption { - type = types.str; - description = "Addon to postfix configuration"; - default = '' - smtpd_milters = ${rmilterSocket} - milter_protocol = 6 - milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} - ''; - }; - }; - - }; - - }; - - - ###### implementation - - config = mkMerge [ - - (mkIf cfg.enable { - warnings = [ - ''`config.services.rmilter' is deprecated, `rmilter' deprecated and unsupported by upstream, and will be removed from next releases. Use built-in rspamd milter instead.'' - ]; - - users.users = singleton { - name = cfg.user; - description = "rmilter daemon"; - uid = config.ids.uids.rmilter; - group = cfg.group; - }; - - users.groups = singleton { - name = cfg.group; - gid = config.ids.gids.rmilter; - }; - - systemd.services.rmilter = { - description = "Rmilter Service"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - Restart = "always"; - RuntimeDirectory = "rmilter"; - RuntimeDirectoryMode = "0750"; - }; - - }; - - systemd.sockets.rmilter = mkIf cfg.socketActivation { - description = "Rmilter service socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = systemdSocket; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0660"; - }; - }; - }) - - (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { - users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ]; - }) - - (mkIf (cfg.enable && cfg.postfix.enable) { - services.postfix.extraConfig = cfg.postfix.configFragment; - users.users.${postfixCfg.user}.extraGroups = [ cfg.group ]; - }) - ]; -} diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index e8b2e11bf726..bdedfa1bb701 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.roundcube; + fpm = config.services.phpfpm.pools.roundcube; in { options.services.roundcube = { @@ -105,7 +106,7 @@ in extraConfig = '' location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/phpfpm/roundcube; + fastcgi_pass unix:${fpm.socket}; include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } @@ -119,24 +120,27 @@ in enable = true; }; - services.phpfpm.poolConfigs.roundcube = '' - listen = /run/phpfpm/roundcube - listen.owner = nginx - listen.group = nginx - listen.mode = 0660 - user = nginx - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 20 - pm.max_requests = 500 - php_admin_value[error_log] = 'stderr' - php_admin_flag[log_errors] = on - php_admin_value[post_max_size] = 25M - php_admin_value[upload_max_filesize] = 25M - catch_workers_output = yes - ''; + services.phpfpm.pools.roundcube = { + user = "nginx"; + phpOptions = '' + error_log = 'stderr' + log_errors = on + post_max_size = 25M + upload_max_filesize = 25M + ''; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0660"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = true; + }; + }; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; systemd.services.roundcube-setup = let diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 5541b8b79b7e..e59d5715de05 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 a123736005ab..df454abc8267 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/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 2f3f76d79ff3..09c3a89d6a68 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/misc/mantisbt.nix b/nixos/modules/services/misc/mantisbt.nix deleted file mode 100644 index 7e3474feb672..000000000000 --- a/nixos/modules/services/misc/mantisbt.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.services.mantisbt; - - freshInstall = cfg.extraConfig == ""; - - # combined code+config directory - mantisbt = let - config_inc = pkgs.writeText "config_inc.php" ("<?php\n" + cfg.extraConfig); - src = pkgs.fetchurl { - url = "mirror://sourceforge/mantisbt/${name}.tar.gz"; - sha256 = "1pl6xn793p3mxc6ibpr2bhg85vkdlcf57yk7pfc399g47l8x4508"; - }; - name = "mantisbt-1.2.19"; - in - # We have to copy every time; otherwise config won't be found. - pkgs.runCommand name - { preferLocalBuild = true; allowSubstitutes = false; } - ('' - mkdir -p "$out" - cd "$out" - tar -xf '${src}' --strip-components=1 - ln -s '${config_inc}' config_inc.php - '' - + lib.optionalString (!freshInstall) "rm -r admin/" - ); -in -{ - options.services.mantisbt = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the mantisbt web service. - This switches on httpd with PHP and database. - ''; - }; - urlPrefix = mkOption { - type = types.string; - default = "/mantisbt"; - description = "The URL prefix under which the mantisbt service appears."; - }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - The contents of config_inc.php, without leading <?php. - If left empty, the admin directory will be accessible. - ''; - }; - }; - - - config = mkIf cfg.enable { - services.mysql.enable = true; - services.httpd.enable = true; - services.httpd.enablePHP = true; - # The httpd sub-service showing mantisbt. - services.httpd.extraSubservices = [ { function = { ... }: { - extraConfig = - '' - Alias ${cfg.urlPrefix} "${mantisbt}" - ''; - };}]; - }; -} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 00c8e7408030..3eb649b08a2f 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -684,7 +684,7 @@ in { fi ''; serviceConfig = { - Type = "simple"; + Type = "notify"; User = "matrix-synapse"; Group = "matrix-synapse"; WorkingDirectory = cfg.dataDir; diff --git a/nixos/modules/services/misc/metabase.nix b/nixos/modules/services/misc/metabase.nix new file mode 100644 index 000000000000..e78100a046a2 --- /dev/null +++ b/nixos/modules/services/misc/metabase.nix @@ -0,0 +1,103 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.metabase; + + inherit (lib) mkEnableOption mkIf mkOption; + inherit (lib) optional optionalAttrs types; + + dataDir = "/var/lib/metabase"; + +in { + + options = { + + services.metabase = { + enable = mkEnableOption "Metabase service"; + + listen = { + ip = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP address that Metabase should listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 3000; + description = '' + Listen port for Metabase. + ''; + }; + }; + + ssl = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable SSL (https) support. + ''; + }; + + port = mkOption { + type = types.port; + default = 8443; + description = '' + Listen port over SSL (https) for Metabase. + ''; + }; + + keystore = mkOption { + type = types.nullOr types.path; + default = "${dataDir}/metabase.jks"; + example = "/etc/secrets/keystore.jks"; + description = '' + <link xlink:href="https://www.digitalocean.com/community/tutorials/java-keytool-essentials-working-with-java-keystores">Java KeyStore</link> file containing the certificates. + ''; + }; + + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for Metabase. + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.metabase = { + description = "Metabase server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + environment = { + MB_PLUGINS_DIR = "${dataDir}/plugins"; + MB_DB_FILE = "${dataDir}/metabase.db"; + MB_JETTY_HOST = cfg.listen.ip; + MB_JETTY_PORT = toString cfg.listen.port; + } // optionalAttrs (cfg.ssl.enable) { + MB_JETTY_SSL = true; + MB_JETTY_SSL_PORT = toString cfg.ssl.port; + MB_JETTY_SSL_KEYSTORE = cfg.ssl.keystore; + }; + serviceConfig = { + DynamicUser = true; + StateDirectory = baseNameOf dataDir; + ExecStart = "${pkgs.metabase}/bin/metabase"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ] ++ optional cfg.ssl.enable cfg.ssl.port; + }; + + }; +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 6bc88c66dc19..088dfd71860b 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,9 @@ let nix = cfg.package.out; - isNix20 = versionAtLeast (getVersion nix) "2.0pre"; + nixVersion = getVersion nix; + + isNix20 = versionAtLeast nixVersion "2.0pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -61,6 +63,9 @@ let builders = ''} system-features = ${toString cfg.systemFeatures} + ${optionalString (versionAtLeast nixVersion "2.3pre") '' + sandbox-fallback = false + ''} $extraOptions END '' + optionalString cfg.checkConfig ( diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index cf56ae89b399..bf38b9ad7a2d 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -2,6 +2,7 @@ let cfg = config.services.zoneminder; + fpm = config.services.phpfpm.pools.zoneminder; pkg = pkgs.zoneminder; dirName = pkg.dirName; @@ -19,8 +20,6 @@ let useCustomDir = cfg.storageDir != null; - socket = "/run/phpfpm/${dirName}.sock"; - zms = "/cgi-bin/zms"; dirs = dirList: [ dirName ] ++ map (e: "${dirName}/${e}") dirList; @@ -201,7 +200,10 @@ in { "zoneminder/80-nixos.conf".source = configFile; }; - networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.port + 6802 # zmtrigger + ]; services = { fcgiwrap = lib.mkIf useNginx { @@ -274,7 +276,7 @@ in { fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param HTTP_PROXY ""; - fastcgi_pass unix:${socket}; + fastcgi_pass unix:${fpm.socket}; } } ''; @@ -284,30 +286,27 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { - listen = socket; + inherit user group; phpOptions = '' date.timezone = "${config.time.timeZone}" ${lib.concatStringsSep "\n" (map (e: "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)} ''; - extraConfig = '' - user = ${user} - group = ${group} - - listen.owner = ${user} - listen.group = ${group} - listen.mode = 0660 - - pm = dynamic - pm.start_servers = 1 - pm.min_spare_servers = 1 - pm.max_spare_servers = 2 - pm.max_requests = 500 - pm.max_children = 5 - pm.status_path = /$pool-status - ping.path = /$pool-ping - ''; + settings = lib.mapAttrs (name: lib.mkDefault) { + "listen.owner" = user; + "listen.group" = group; + "listen.mode" = "0660"; + + "pm" = "dynamic"; + "pm.start_servers" = 1; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 2; + "pm.max_requests" = 500; + "pm.max_children" = 5; + "pm.status_path" = "/$pool-status"; + "ping.path" = "/$pool-ping"; + }; }; }; }; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 6ca420a05b23..695a8c42e85e 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -84,6 +84,16 @@ in { type = types.bool; description = "Cadvisor storage driver, enable secure communication."; }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional cadvisor options. + + See <link xlink:href='https://github.com/google/cadvisor/blob/master/docs/runtime_options.md'/> for available options. + ''; + }; }; }; @@ -112,6 +122,7 @@ in { -logtostderr=true \ -listen_ip="${cfg.listenAddress}" \ -port="${toString cfg.port}" \ + ${escapeShellArgs cfg.extraOptions} \ ${optionalString (cfg.storageDriver != null) '' -storage_driver "${cfg.storageDriver}" \ -storage_driver_user "${cfg.storageDriverHost}" \ diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index ce3d53fb2c17..7f78db74677c 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 c2f6b585d493..bf1084eecc3a 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 4d11360d07e9..f4eec7e0d284 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 d8384e0d35b3..647d67533b89 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 f69b389760f7..ca4366121e12 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/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index 9c400a1e3e46..2b647b6b1ade 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -11,7 +11,7 @@ let healthLauncher = writeScriptBin "riemann-health" '' #!/bin/sh - exec ${pkgs.riemann-tools}/bin/riemann-health --host ${riemannHost} + exec ${pkgs.riemann-tools}/bin/riemann-health ${builtins.concatStringsSep " " cfg.extraArgs} --host ${riemannHost} ''; @@ -34,8 +34,16 @@ in { Address of the host riemann node. Defaults to localhost. ''; }; + extraArgs = mkOption { + type = types.listOf types.string; + default = []; + description = '' + A list of commandline-switches forwarded to a riemann-tool. + See for example `riemann-health --help` for available options. + ''; + example = ["-p 5555" "--timeout=30" "--attribute=myattribute=42"]; + }; }; - }; config = mkIf cfg.enableHealth { diff --git a/nixos/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix deleted file mode 100644 index 32d4314d5f77..000000000000 --- a/nixos/modules/services/monitoring/systemhealth.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.systemhealth; - - systemhealth = with pkgs; stdenv.mkDerivation { - name = "systemhealth-1.0"; - src = fetchurl { - url = "https://www.brianlane.com/downloads/systemhealth/systemhealth-1.0.tar.bz2"; - sha256 = "1q69lz7hmpbdpbz36zb06nzfkj651413n9icx0njmyr3xzq1j9qy"; - }; - buildInputs = [ python ]; - installPhase = '' - mkdir -p $out/bin - # Make it work for kernels 3.x, not so different than 2.6 - sed -i 's/2\.6/4.0/' system_health.py - cp system_health.py $out/bin - ''; - }; - - rrdDir = "/var/lib/health/rrd"; - htmlDir = "/var/lib/health/html"; - - configFile = rrdDir + "/.syshealthrc"; - # The program will try to read $HOME/.syshealthrc, so we set the proper home. - command = "HOME=${rrdDir} ${systemhealth}/bin/system_health.py"; - - cronJob = '' - */5 * * * * wwwrun ${command} --log - 5 * * * * wwwrun ${command} --graph - ''; - - nameEqualName = s: "${s} = ${s}"; - interfacesSection = concatStringsSep "\n" (map nameEqualName cfg.interfaces); - - driveLine = d: "${d.path} = ${d.name}"; - drivesSection = concatStringsSep "\n" (map driveLine cfg.drives); - -in -{ - options = { - services.systemhealth = { - enable = mkOption { - default = false; - description = '' - Enable the system health monitor and its generation of graphs. - ''; - }; - - urlPrefix = mkOption { - default = "/health"; - description = '' - The URL prefix under which the System Health web pages appear in httpd. - ''; - }; - - interfaces = mkOption { - default = [ "lo" ]; - example = [ "lo" "eth0" "eth1" ]; - description = '' - Interfaces to monitor (minimum one). - ''; - }; - - drives = mkOption { - default = [ ]; - example = [ { name = "root"; path = "/"; } ]; - description = '' - Drives to monitor. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - services.cron.systemCronJobs = [ cronJob ]; - - system.activationScripts.systemhealth = stringAfter [ "var" ] - '' - mkdir -p ${rrdDir} ${htmlDir} - chown wwwrun:wwwrun ${rrdDir} ${htmlDir} - - cat >${configFile} << EOF - [paths] - rrdtool = ${pkgs.rrdtool}/bin/rrdtool - loadavg_rrd = loadavg - ps = /run/current-system/sw/bin/ps - df = /run/current-system/sw/bin/df - meminfo_rrd = meminfo - uptime_rrd = uptime - rrd_path = ${rrdDir} - png_path = ${htmlDir} - - [processes] - - [interfaces] - ${interfacesSection} - - [drives] - ${drivesSection} - - [graphs] - width = 400 - time = ['-3hours', '-32hours', '-8days', '-5weeks', '-13months'] - height = 100 - - [external] - - EOF - - chown wwwrun:wwwrun ${configFile} - - ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun - ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun - ''; - - services.httpd.extraSubservices = [ - { function = f: { - extraConfig = '' - Alias ${cfg.urlPrefix} ${htmlDir} - - <Directory ${htmlDir}> - Order allow,deny - Allow from all - </Directory> - ''; - }; - } - ]; - }; -} diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index bc755612fd9b..429b40227d47 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -225,7 +225,7 @@ in '' maxstartdelay = ${toString cfg.maxStartDelay} - ${flip concatStringsSep (flip map (attrValues cfg.ups) (ups: ups.summary)) " + ${flip concatStringsSep (forEach (attrValues cfg.ups) (ups: ups.summary)) " "} ''; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 9cfcd1697c11..90abed30db5d 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 f19bf9d81396..bbbfcf6a4738 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/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix index 4f37fc2a9e5c..77961b78cadb 100644 --- a/nixos/modules/services/network-filesystems/u9fs.nix +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -55,6 +55,7 @@ in sockets.u9fs = { description = "U9fs Listening Socket"; wantedBy = [ "sockets.target" ]; + after = [ "network.target" ]; inherit (cfg) listenStreams; socketConfig.Accept = "yes"; }; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index c40962f4aa82..3fb85b16cbe2 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -44,9 +44,7 @@ let parseModules = x: x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; - # would be nice to merge 'cfg' with a //, - # but the json nesting is wacky. - cjdrouteConf = builtins.toJSON ( { + cjdrouteConf = builtins.toJSON ( recursiveUpdate { admin = { bind = cfg.admin.bind; password = "@CJDNS_ADMIN_PASSWORD@"; @@ -71,7 +69,7 @@ let security = [ { exemptAngel = 1; setuser = "nobody"; } ]; - }); + } cfg.extraConfig); in @@ -91,6 +89,16 @@ in ''; }; + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = { router.interface.tunDevice = "tun10"; }; + description = '' + Extra configuration, given as attrs, that will be merged recursively + with the rest of the JSON generated by this module, at the root node. + ''; + }; + confFile = mkOption { type = types.nullOr types.path; default = null; @@ -246,7 +254,10 @@ in if cfg.confFile != null then "${pkg}/bin/cjdroute < ${cfg.confFile}" else '' source /etc/cjdns.keys - echo '${cjdrouteConf}' | sed \ + (cat <<'EOF' + ${cjdrouteConf} + EOF + ) | sed \ -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ | ${pkg}/bin/cjdroute diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 3a92a883fbf8..f080f12eaccd 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -15,7 +15,7 @@ let ++ cfg.extraConfigFiles; devices = attrValues (filterAttrs (_: i: i != null) cfg.interface); - systemdDevices = flip map devices + systemdDevices = forEach devices (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device"); in { diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index 0c2add424bac..5b58ea9b0c91 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -136,10 +136,16 @@ in "/.dns/127.0.0.1#${toString cfg.dns.port}" ]; - services.pdns-recursor.forwardZones = mkIf cfgs.pdns-recursor.resolveDNSChainQueries - { bit = "127.0.0.1:${toString cfg.dns.port}"; - dns = "127.0.0.1:${toString cfg.dns.port}"; - }; + services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries { + forwardZones = + { bit = "127.0.0.1:${toString cfg.dns.port}"; + dns = "127.0.0.1:${toString cfg.dns.port}"; + }; + luaConfig ='' + addNTA("bit", "namecoin doesn't support DNSSEC") + addNTA("dns", "namecoin doesn't support DNSSEC") + ''; + }; users.users = singleton { name = username; diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index ef177e4be345..0c6602e7f8ab 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -7,7 +7,7 @@ let inherit (lib) concatStringsSep optionalString; cfg = config.services.hylafax; - mapModems = lib.flip map (lib.attrValues cfg.modems); + mapModems = lib.forEach (lib.attrValues cfg.modems); mkConfigFile = name: conf: # creates hylafax config file, diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix new file mode 100644 index 000000000000..0c66b85fe8a5 --- /dev/null +++ b/nixos/modules/services/networking/jormungandr.nix @@ -0,0 +1,97 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.jormungandr; + + inherit (lib) mkEnableOption mkIf mkOption; + inherit (lib) optionalString types; + + dataDir = "/var/lib/jormungandr"; + + # Default settings so far, as the service matures we will + # move these out as separate settings + configSettings = { + storage = dataDir; + p2p = { + public_address = "/ip4/127.0.0.1/tcp/8299"; + messages = "high"; + blocks = "high"; + }; + rest = { + listen = "127.0.0.1:8607"; + }; + }; + + configFile = if cfg.configFile == null then + pkgs.writeText "jormungandr.yaml" (builtins.toJSON configSettings) + else cfg.configFile; + +in { + + options = { + + services.jormungandr = { + enable = mkEnableOption "jormungandr service"; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/jormungandr/node.yaml"; + description = '' + The path of the jormungandr blockchain configuration file in YAML format. + If no file is specified, a file is generated using the other options. + ''; + }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/secret/jormungandr.yaml"; + description = '' + The path of the jormungandr blockchain secret node configuration file in + YAML format. Do not store this in nix store! + ''; + }; + + genesisBlockHash = mkOption { + type = types.nullOr types.string; + default = null; + example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9"; + description = '' + Set the genesis block hash (the hash of the block0) so we can retrieve + the genesis block (and the blockchain configuration) from the existing + storage or from the network. + ''; + }; + + genesisBlockFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/jormungandr/block-0.bin"; + description = '' + The path of the genesis block file if we are hosting it locally. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd.services.jormungandr = { + description = "jormungandr server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = baseNameOf dataDir; + ExecStart = '' + ${pkgs.jormungandr}/bin/jormungandr --config ${configFile} \ + ${optionalString (cfg.secretFile != null) " --secret ${cfg.secretFile}"} \ + ${optionalString (cfg.genesisBlockHash != null) " --genesis-block-hash ${cfg.genesisBlockHash}"} \ + ${optionalString (cfg.genesisBlockFile != null) " --genesis-block ${cfg.genesisBlockFile}"} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ofono.nix b/nixos/modules/services/networking/ofono.nix new file mode 100644 index 000000000000..40ef9433de0f --- /dev/null +++ b/nixos/modules/services/networking/ofono.nix @@ -0,0 +1,44 @@ +# Ofono daemon. +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.ofono; + + plugin_path = + lib.concatMapStringsSep ":" + (plugin: "${plugin}/lib/ofono/plugins") + cfg.plugins + ; + +in + +{ + ###### interface + options = { + services.ofono = { + enable = mkEnableOption "Ofono"; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.modem-manager-gui ]"; + description = '' + The list of plugins to install. + ''; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + services.dbus.packages = [ pkgs.ofono ]; + + systemd.packages = [ pkgs.ofono ]; + + systemd.services.ofono.environment.OFONO_PLUGIN_PATH = mkIf (cfg.plugins != []) plugin_path; + + }; +} diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index d07deb9dcc67..ec69cc838da9 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -6,25 +6,27 @@ let dataDir = "/var/lib/pdns-recursor"; username = "pdns-recursor"; - cfg = config.services.pdns-recursor; - zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + cfg = config.services.pdns-recursor; - configFile = pkgs.writeText "recursor.conf" '' - local-address=${cfg.dns.address} - local-port=${toString cfg.dns.port} - allow-from=${concatStringsSep "," cfg.dns.allowFrom} + oneOrMore = type: with types; either type (listOf type); + valueType = with types; oneOf [ int str bool path ]; + configType = with types; attrsOf (nullOr (oneOrMore valueType)); - webserver-address=${cfg.api.address} - webserver-port=${toString cfg.api.port} - webserver-allow-from=${concatStringsSep "," cfg.api.allowFrom} + toBool = val: if val then "yes" else "no"; + serialize = val: with types; + if str.check val then val + else if int.check val then toString val + else if path.check val then toString val + else if bool.check val then toBool val + else if builtins.isList val then (concatMapStringsSep "," serialize val) + else ""; - forward-zones=${concatStringsSep "," zones} - export-etc-hosts=${if cfg.exportHosts then "yes" else "no"} - dnssec=${cfg.dnssecValidation} - serve-rfc1918=${if cfg.serveRFC1918 then "yes" else "no"} + configFile = pkgs.writeText "recursor.conf" + (concatStringsSep "\n" + (flip mapAttrsToList cfg.settings + (name: val: "${name}=${serialize val}"))); - ${cfg.extraConfig} - ''; + mkDefaultAttrs = mapAttrs (n: v: mkDefault v); in { options.services.pdns-recursor = { @@ -117,17 +119,55 @@ in { ''; }; - extraConfig = mkOption { + settings = mkOption { + type = configType; + default = { }; + example = literalExample '' + { + loglevel = 8; + log-common-errors = true; + } + ''; + description = '' + PowerDNS Recursor settings. Use this option to configure Recursor + settings not exposed in a NixOS option or to bypass one. + See the full documentation at + <link xlink:href="https://doc.powerdns.com/recursor/settings.html"/> + for the available options. + ''; + }; + + luaConfig = mkOption { type = types.lines; default = ""; description = '' - Extra options to be appended to the configuration file. + The content Lua configuration file for PowerDNS Recursor. See + <link xlink:href="https://doc.powerdns.com/recursor/lua-config/index.html"/>. ''; }; }; config = mkIf cfg.enable { + services.pdns-recursor.settings = mkDefaultAttrs { + local-address = cfg.dns.address; + local-port = cfg.dns.port; + allow-from = cfg.dns.allowFrom; + + webserver-address = cfg.api.address; + webserver-port = cfg.api.port; + webserver-allow-from = cfg.api.allowFrom; + + forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + export-etc-hosts = cfg.exportHosts; + dnssec = cfg.dnssecValidation; + serve-rfc1918 = cfg.serveRFC1918; + lua-config-file = pkgs.writeText "recursor.lua" cfg.luaConfig; + + log-timestamp = false; + disable-syslog = true; + }; + users.users."${username}" = { home = dataDir; createHome = true; @@ -150,8 +190,7 @@ in { AmbientCapabilities = "cap_net_bind_service"; ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \ --config-dir=${dataDir} \ - --socket-dir=${dataDir} \ - --disable-syslog + --socket-dir=${dataDir} ''; }; @@ -165,4 +204,10 @@ in { ''; }; }; + + imports = [ + (mkRemovedOptionModule [ "services" "pdns-recursor" "extraConfig" ] + "To change extra Recursor settings use services.pdns-recursor.settings instead.") + ]; + } diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index fe6d65a5f963..af12db590f00 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -35,10 +35,10 @@ in }; localAddress = mkOption { - type = types.str; - default = "0.0.0.0"; + type = types.coercedTo types.str singleton (types.listOf types.str); + default = [ "[::0]" "0.0.0.0" ]; description = '' - Local address to which the server binds. + Local addresses to which the server binds. ''; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 0f9d2420903b..91fc7d72bc6d 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -502,7 +502,7 @@ in assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] - ++ flip map cfg.listenAddresses ({ addr, ... }: { + ++ forEach cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; }); diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix index 3fbf6eb60e9d..b38bcd4cec05 100644 --- a/nixos/modules/services/networking/stubby.nix +++ b/nixos/modules/services/networking/stubby.nix @@ -168,7 +168,7 @@ in default = defaultUpstream; type = types.lines; description = '' - Add additional upstreams. See <citerefentry><refentrytitle>stubby + Replace default upstreams. See <citerefentry><refentrytitle>stubby </refentrytitle><manvolnum>1</manvolnum></citerefentry> for an example of the entry formatting. In Strict mode, at least one of the following settings must be supplied for each nameserver: diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 6239c88b7e41..c922ba15960f 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -176,6 +176,7 @@ in Type = "simple"; ExecStart = "${(removeSuffix "\n" cmd)} start"; ExecStop = "${(removeSuffix "\n" cmd)} stop"; + Restart = "on-failure"; User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 46bff6954cdd..05f97bfa539f 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 86b0c8d69beb..42c1b9482cb2 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 6b688c640d59..91d8f544e16b 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 bb036ee020f4..80fd65891ff8 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/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 25cec5b5b105..4a174564dd2c 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -106,14 +106,24 @@ in { path = with pkgs; [ iptables ipset iproute systemd ]; - postStart = '' + # The sshguard ipsets must exist before we invoke + # iptables. sshguard creates the ipsets after startup if + # necessary, but if we let sshguard do it, we can't reliably add + # the iptables rules because postStart races with the creation + # of the ipsets. So instead, we create both the ipsets and + # firewall rules before sshguard starts. + preStart = '' + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6 ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP ''; - preStop = '' + postStop = '' ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP + ${pkgs.ipset}/bin/ipset -quiet destroy sshguard4 + ${pkgs.ipset}/bin/ipset -quiet destroy sshguard6 ''; unitConfig.Documentation = "man:sshguard(8)"; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 88d2f69db572..20d5e3b28eb9 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -39,6 +39,16 @@ in { services.usbguard = { enable = mkEnableOption "USBGuard daemon"; + package = mkOption { + type = types.package; + default = pkgs.usbguard; + defaultText = "pkgs.usbguard"; + description = '' + The usbguard package to use. If you do not need the Qt GUI, use + <literal>pkgs.usbguard-nox</literal> to save disk space. + ''; + }; + ruleFile = mkOption { type = types.path; default = "/var/lib/usbguard/rules.conf"; @@ -179,7 +189,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.usbguard ]; + environment.systemPackages = [ cfg.package ]; systemd.services.usbguard = { description = "USBGuard daemon"; @@ -195,7 +205,7 @@ in { serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; + ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index f544928fb6b1..a94a471361ef 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -84,6 +84,18 @@ in The directory where transmission will create files. ''; }; + + user = mkOption { + type = types.str; + default = "transmission"; + description = "User account under which Transmission runs."; + }; + + group = mkOption { + type = types.str; + default = "transmission"; + description = "Group account under which Transmission runs."; + }; }; }; @@ -99,7 +111,8 @@ in serviceConfig.ExecStartPre = preStart; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - serviceConfig.User = "transmission"; + serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; # NOTE: transmission has an internal umask that also must be set (in settings.json) serviceConfig.UMask = "0002"; }; @@ -107,14 +120,19 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ pkgs.transmission ]; - users.groups.transmission.gid = config.ids.gids.transmission; - users.users.transmission = { - group = "transmission"; - uid = config.ids.uids.transmission; - description = "Transmission BitTorrent user"; - home = homeDir; - createHome = true; - }; + users.users = optionalAttrs (cfg.user == "transmission") (singleton + { name = "transmission"; + group = cfg.group; + uid = config.ids.uids.transmission; + description = "Transmission BitTorrent user"; + home = homeDir; + createHome = true; + }); + + users.groups = optionalAttrs (cfg.group == "transmission") (singleton + { name = "transmission"; + gid = config.ids.gids.transmission; + }); # AppArmor profile security.apparmor.profiles = mkIf apparmor [ diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 910e1d937bf3..95c8fb160510 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -1,14 +1,16 @@ { config, lib, pkgs, ... }: with lib; let cfg = config.services.icingaweb2; + fpm = config.services.phpfpm.pools.${poolName}; poolName = "icingaweb2"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; defaultConfig = { global = { - module_path = "${pkgs.icingaweb2}/modules${optionalString (builtins.length config.modulePath > 0) ":${concatStringsSep ":" config.modulePath}"}"; + module_path = "${pkgs.icingaweb2}/modules"; }; }; in { + meta.maintainers = with maintainers; [ das_j ]; + options.services.icingaweb2 = with types; { enable = mkEnableOption "the icingaweb2 web interface"; @@ -162,27 +164,26 @@ in { }; config = mkIf cfg.enable { - services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = '' - listen = "${phpfpmSocketName}" - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = icingaweb2 - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 10 - ''; + services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { + "${poolName}" = { + user = "icingaweb2"; + phpOptions = '' + extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so + date.timezone = "${cfg.timezone}" + ''; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 10; + }; + }; }; - services.phpfpm.phpOptions = mkIf (cfg.pool == "${poolName}") - '' - extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so - date.timezone = "${cfg.timezone}" - ''; - systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ]; services.nginx = { @@ -206,7 +207,7 @@ in { include ${config.services.nginx.package}/conf/fastcgi.conf; try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_pass unix:${fpm.socket}; fastcgi_param SCRIPT_FILENAME ${pkgs.icingaweb2}/public/index.php; ''; }; diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 5b2f3875aaa9..2797feb32ebf 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)"; }; @@ -120,15 +120,15 @@ in }; poolConfig = mkOption { - type = types.lines; - default = '' - pm = dynamic - pm.max_children = 32 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 4 - pm.max_requests = 500 - ''; + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; description = '' Options for the LimeSurvey PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives. @@ -203,17 +203,12 @@ in }; services.phpfpm.pools.limesurvey = { - listen = "/run/phpfpm/limesurvey.sock"; - extraConfig = '' - listen.owner = ${config.services.httpd.user}; - listen.group = ${config.services.httpd.group}; - user = ${user}; - group = ${group}; - - env[LIMESURVEY_CONFIG] = ${limesurveyConfig} - - ${cfg.poolConfig} - ''; + inherit user group; + phpEnv.LIMESURVEY_CONFIG = "${limesurveyConfig}"; + settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + } // cfg.poolConfig; }; services.httpd = { @@ -241,7 +236,7 @@ in <Directory "${pkg}/share/limesurvey"> <FilesMatch "\.php$"> <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/" + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" </If> </FilesMatch> diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 14aca45a342b..d9f840408cc8 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -176,7 +176,7 @@ in { # Use User-Private Group scheme to protect Matomo data, but allow administration / backup via 'matomo' group # Copy config folder chmod g+s "${dataDir}" - cp -r "${cfg.package}/config" "${dataDir}/" + cp -r "${cfg.package}/share/config" "${dataDir}/" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done @@ -225,22 +225,24 @@ in { serviceConfig.UMask = "0007"; }; - services.phpfpm.poolConfigs = let + services.phpfpm.pools = let # workaround for when both are null and need to generate a string, # which is illegal, but as assertions apparently are being triggered *after* config generation, # we have to avoid already throwing errors at this previous stage. socketOwner = if (cfg.nginx != null) then config.services.nginx.user else if (cfg.webServerUser != null) then cfg.webServerUser else ""; in { - ${pool} = '' - listen = "${phpSocket}" - listen.owner = ${socketOwner} - listen.group = root - listen.mode = 0600 - user = ${user} - env[PIWIK_USER_PATH] = ${dataDir} - ${cfg.phpfpmProcessManagerConfig} - ''; + ${pool} = { + listen = phpSocket; + extraConfig = '' + listen.owner = ${socketOwner} + listen.group = root + listen.mode = 0600 + user = ${user} + env[PIWIK_USER_PATH] = ${dataDir} + ${cfg.phpfpmProcessManagerConfig} + ''; + }; }; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 5bd5977e592b..ec2568bf952d 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -312,17 +312,17 @@ in }; poolConfig = mkOption { - type = types.lines; - default = '' - pm = dynamic - pm.max_children = 32 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 4 - pm.max_requests = 500 - ''; + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; description = '' - Options for MediaWiki's PHP pool. See the documentation on <literal>php-fpm.conf</literal> + Options for the MediaWiki PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives. ''; }; @@ -379,17 +379,12 @@ in }; services.phpfpm.pools.mediawiki = { - listen = "/run/phpfpm/mediawiki.sock"; - extraConfig = '' - listen.owner = ${config.services.httpd.user} - listen.group = ${config.services.httpd.group} - user = ${user} - group = ${group} - - env[MEDIAWIKI_CONFIG] = ${mediawikiConfig} - - ${cfg.poolConfig} - ''; + inherit user group; + phpEnv.MEDIAWIKI_CONFIG = "${mediawikiConfig}"; + settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + } // cfg.poolConfig; }; services.httpd = { @@ -403,7 +398,7 @@ in <Directory "${pkg}/share/mediawiki"> <FilesMatch "\.php$"> <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/" + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" </If> </FilesMatch> diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix new file mode 100644 index 000000000000..f2516c67c6b3 --- /dev/null +++ b/nixos/modules/services/web-apps/moodle.nix @@ -0,0 +1,300 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types; + inherit (lib) concatStringsSep literalExample mapAttrsToList optional optionalString; + + cfg = config.services.moodle; + fpm = config.services.phpfpm.pools.moodle; + + user = "moodle"; + group = config.services.httpd.group; + stateDir = "/var/lib/moodle"; + + moodleConfig = pkgs.writeText "config.php" '' + <?php // Moodle configuration file + + unset($CFG); + global $CFG; + $CFG = new stdClass(); + + $CFG->dbtype = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }'; + $CFG->dblibrary = 'native'; + $CFG->dbhost = '${cfg.database.host}'; + $CFG->dbname = '${cfg.database.name}'; + $CFG->dbuser = '${cfg.database.user}'; + ${optionalString (cfg.database.passwordFile != null) "$CFG->dbpass = file_get_contents('${cfg.database.passwordFile}');"} + $CFG->prefix = 'mdl_'; + $CFG->dboptions = array ( + 'dbpersist' => 0, + 'dbport' => '${toString cfg.database.port}', + ${optionalString (cfg.database.socket != null) "'dbsocket' => '${cfg.database.socket}',"} + 'dbcollation' => 'utf8mb4_unicode_ci', + ); + + $CFG->wwwroot = '${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}'; + $CFG->dataroot = '${stateDir}'; + $CFG->admin = 'admin'; + + $CFG->directorypermissions = 02777; + $CFG->disableupdateautodeploy = true; + + $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs'; + $CFG->pathtophp = '${pkgs.php}/bin/php'; + $CFG->pathtodu = '${pkgs.coreutils}/bin/du'; + $CFG->aspellpath = '${pkgs.aspell}/bin/aspell'; + $CFG->pathtodot = '${pkgs.graphviz}/bin/dot'; + + require_once('${cfg.package}/share/moodle/lib/setup.php'); + + // There is no php closing tag in this file, + // it is intentional because it prevents trailing whitespace problems! + ''; + + mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; +in +{ + # interface + options.services.moodle = { + enable = mkEnableOption "Moodle web application"; + + package = mkOption { + type = types.package; + default = pkgs.moodle; + defaultText = "pkgs.moodle"; + description = "The Moodle package to use."; + }; + + initialPassword = mkOption { + type = types.str; + example = "correcthorsebatterystaple"; + description = '' + Specifies the initial password for the admin, i.e. the password assigned if the user does not already exist. + The password specified here is world-readable in the Nix store, so it should be changed promptly. + ''; + }; + + database = { + type = mkOption { + type = types.enum [ "mysql" "pgsql" ]; + default = "mysql"; + description = ''Database engine to use.''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "Database host address."; + }; + + port = mkOption { + type = types.int; + description = "Database host port."; + default = { + "mysql" = 3306; + "pgsql" = 5432; + }.${cfg.database.type}; + defaultText = "3306"; + }; + + name = mkOption { + type = types.str; + default = "moodle"; + description = "Database name."; + }; + + user = mkOption { + type = types.str; + default = "moodle"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/moodle-dbpassword"; + description = '' + A file containing the password corresponding to + <option>database.user</option>. + ''; + }; + + socket = mkOption { + type = types.nullOr types.path; + default = + if mysqlLocal then "/run/mysqld/mysqld.sock" + else if pgsqlLocal then "/run/postgresql" + else null; + defaultText = "/run/mysqld/mysqld.sock"; + description = "Path to the unix socket file to use for authentication."; + }; + + createLocally = mkOption { + type = types.bool; + default = true; + description = "Create the database and database user locally."; + }; + }; + + virtualHost = mkOption { + type = types.submodule ({ + options = import ../web-servers/apache-httpd/per-server-options.nix { + inherit lib; + forMainServer = false; + }; + }); + example = { + hostName = "moodle.example.org"; + enableSSL = true; + adminAddr = "webmaster@example.org"; + sslServerCert = "/var/lib/acme/moodle.example.org/full.pem"; + sslServerKey = "/var/lib/acme/moodle.example.org/key.pem"; + }; + description = '' + Apache configuration can be done by adapting <option>services.httpd.virtualHosts</option>. + See <xref linkend="opt-services.httpd.virtualHosts"/> for further information. + ''; + }; + + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for the Moodle PHP pool. See the documentation on <literal>php-fpm.conf</literal> + for details on configuration directives. + ''; + }; + }; + + # implementation + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.database.createLocally -> cfg.database.user == user; + message = "services.moodle.database.user must be set to ${user} if services.moodle.database.createLocally is set true"; + } + { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "a password cannot be specified if services.moodle.database.createLocally is set to true"; + } + ]; + + services.mysql = mkIf mysqlLocal { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "SELECT, INSERT, UPDATE, DELETE, CREATE, CREATE TEMPORARY TABLES, DROP, INDEX, ALTER"; + }; + } + ]; + }; + + services.postgresql = mkIf pgsqlLocal { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.phpfpm.pools.moodle = { + inherit user group; + phpEnv.MOODLE_CONFIG = "${moodleConfig}"; + phpOptions = '' + zend_extension = opcache.so + opcache.enable = 1 + ''; + settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + } // cfg.poolConfig; + }; + + services.httpd = { + enable = true; + adminAddr = mkDefault cfg.virtualHost.adminAddr; + extraModules = [ "proxy_fcgi" ]; + virtualHosts = [ (mkMerge [ + cfg.virtualHost { + documentRoot = mkForce "${cfg.package}/share/moodle"; + extraConfig = '' + <Directory "${cfg.package}/share/moodle"> + <FilesMatch "\.php$"> + <If "-f %{REQUEST_FILENAME}"> + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" + </If> + </FilesMatch> + Options -Indexes + DirectoryIndex index.php + </Directory> + ''; + } + ]) ]; + }; + + systemd.tmpfiles.rules = [ + "d '${stateDir}' 0750 ${user} ${group} - -" + ]; + + systemd.services.moodle-init = { + wantedBy = [ "multi-user.target" ]; + before = [ "phpfpm-moodle.service" ]; + after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + environment.MOODLE_CONFIG = moodleConfig; + script = '' + ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$? + + [ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \ + --non-interactive \ + --allow-unstable + + [ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \ + --agree-license \ + --adminpass=${cfg.initialPassword} + + true + ''; + serviceConfig = { + User = user; + Group = group; + Type = "oneshot"; + }; + }; + + systemd.services.moodle-cron = { + description = "Moodle cron service"; + after = [ "moodle-init.service" ]; + environment.MOODLE_CONFIG = moodleConfig; + serviceConfig = { + User = user; + Group = group; + ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php"; + }; + }; + + systemd.timers.moodle-cron = { + description = "Moodle cron timer"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "minutely"; + }; + }; + + systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + + users.users."${user}".group = group; + + }; +} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a0214a75d93e..ada14ad39291 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.nextcloud; + fpm = config.services.phpfpm.pools.nextcloud; phpPackage = pkgs.php73; phpPackages = pkgs.php73Packages; @@ -410,25 +411,20 @@ in { }; services.phpfpm = { - pools.nextcloud = let - phpAdminValues = (toKeyValue - (foldr (a: b: a // b) {} - (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; }) - phpOptions))); - in { - phpOptions = phpOptionsExtensions; + pools.nextcloud = { + user = "nextcloud"; + group = "nginx"; + phpOptions = phpOptionsExtensions + phpOptionsStr; phpPackage = phpPackage; - listen = "/run/phpfpm/nextcloud"; - extraConfig = '' - listen.owner = nginx - listen.group = nginx - user = nextcloud - group = nginx - ${cfg.poolConfig} - env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config - env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin - ${phpAdminValues} - ''; + phpEnv = { + NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; + PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; + }; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + }; + extraConfig = cfg.poolConfig; }; }; @@ -489,7 +485,7 @@ in { fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass unix:/run/phpfpm/nextcloud; + fastcgi_pass unix:${fpm.socket}; fastcgi_intercept_errors on; fastcgi_request_buffering off; fastcgi_read_timeout 120s; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index b200a89260ac..6a1b4143bc16 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -9,11 +9,11 @@ with lib; let cfg = config.services.restya-board; + fpm = config.services.phpfpm.pools.${poolName}; runDir = "/run/restya-board"; poolName = "restya-board"; - phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; in @@ -180,7 +180,7 @@ in services.phpfpm.pools = { "${poolName}" = { - listen = phpfpmSocketName; + inherit (cfg) user group; phpOptions = '' date.timezone = "CET" @@ -191,20 +191,18 @@ in auth_password = ${cfg.email.password} ''} ''; - extraConfig = '' - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = ${cfg.user} - group = ${cfg.group} - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - catch_workers_output = 1 - ''; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; }; }; @@ -241,7 +239,7 @@ in tryFiles = "$uri =404"; extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_pass unix:${fpm.socket}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PHP_VALUE "upload_max_filesize=9G \n post_max_size=9G \n max_execution_time=200 \n max_input_time=200 \n memory_limit=256M"; diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix index cd0f743a5fb8..56b7cafffe8b 100644 --- a/nixos/modules/services/web-apps/selfoss.nix +++ b/nixos/modules/services/web-apps/selfoss.nix @@ -4,7 +4,6 @@ let cfg = config.services.selfoss; poolName = "selfoss_pool"; - phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; dataDir = "/var/lib/selfoss"; @@ -116,21 +115,22 @@ in config = mkIf cfg.enable { - services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = '' - listen = "${phpfpmSocketName}"; - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = nginx - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - catch_workers_output = 1 - ''; + services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { + "${poolName}" = { + user = "nginx"; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; + }; }; systemd.services.selfoss-config = { diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 1bd9de93735d..59b0ee1addc6 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -521,20 +521,19 @@ let services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { "${poolName}" = { - listen = "/var/run/phpfpm/${poolName}.sock"; - extraConfig = '' - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = ${cfg.user} - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - catch_workers_output = 1 - ''; + inherit (cfg) user; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; }; }; @@ -552,7 +551,7 @@ let locations."~ \.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.listen}; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_index index.php; ''; }; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 624b0089a037..98dc84588189 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -216,15 +216,15 @@ let }; poolConfig = mkOption { - type = types.lines; - default = '' - pm = dynamic - pm.max_children = 32 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 4 - pm.max_requests = 500 - ''; + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; description = '' Options for the WordPress PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives. @@ -280,15 +280,11 @@ in services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "wordpress-${hostName}" { - listen = "/run/phpfpm/wordpress-${hostName}.sock"; - extraConfig = '' - listen.owner = ${config.services.httpd.user} - listen.group = ${config.services.httpd.group} - user = ${user} - group = ${group} - - ${cfg.poolConfig} - ''; + inherit user group; + settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + } // cfg.poolConfig; } )) eachSite; @@ -303,7 +299,7 @@ in <Directory "${pkg hostName cfg}/share/wordpress"> <FilesMatch "\.php$"> <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:/run/phpfpm/wordpress-${hostName}.sock|fcgi://localhost/" + SetHandler "proxy:unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}|fcgi://localhost/" </If> </FilesMatch> diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index 4b5334579a99..fa358ffafbc3 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -133,15 +133,15 @@ in }; poolConfig = mkOption { - type = types.lines; - default = '' - pm = dynamic - pm.max_children = 32 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 4 - pm.max_requests = 500 - ''; + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; description = '' Options for the Zabbix PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives. ''; @@ -160,6 +160,8 @@ in ]; services.phpfpm.pools.zabbix = { + inherit user; + group = config.services.httpd.group; phpOptions = '' # https://www.zabbix.com/documentation/current/manual/installation/install memory_limit = 128M @@ -177,15 +179,11 @@ in '' + optionalString (cfg.database.type == "oracle") '' extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so ''; - listen = "/run/phpfpm/zabbix.sock"; - extraConfig = '' - listen.owner = ${config.services.httpd.user}; - listen.group = ${config.services.httpd.group}; - user = ${user}; - group = ${config.services.httpd.group}; - env[ZABBIX_CONFIG] = ${zabbixConfig} - ${cfg.poolConfig} - ''; + phpEnv.ZABBIX_CONFIG = zabbixConfig; + settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + } // cfg.poolConfig; }; services.httpd = { diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index ea9476a7c915..12200c879beb 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/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index d0b936cb019f..6a1db6087840 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -70,7 +70,7 @@ in { { CADDYPATH = cfg.dataDir; }; serviceConfig = { ExecStart = '' - ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ + ${cfg.package}/bin/caddy -root=/var/tmp -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix new file mode 100644 index 000000000000..80870118c334 --- /dev/null +++ b/nixos/modules/services/web-servers/darkhttpd.nix @@ -0,0 +1,77 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.darkhttpd; + + args = concatStringsSep " " ([ + cfg.rootDir + "--port ${toString cfg.port}" + "--addr ${cfg.address}" + ] ++ cfg.extraArgs + ++ optional cfg.hideServerId "--no-server-id" + ++ optional config.networking.enableIPv6 "--ipv6"); + +in { + options.services.darkhttpd = with types; { + enable = mkEnableOption "DarkHTTPd web server"; + + port = mkOption { + default = 80; + type = ints.u16; + description = '' + Port to listen on. + Pass 0 to let the system choose any free port for you. + ''; + }; + + address = mkOption { + default = "127.0.0.1"; + type = str; + description = '' + Address to listen on. + Pass `all` to listen on all interfaces. + ''; + }; + + rootDir = mkOption { + type = path; + description = '' + Path from which to serve files. + ''; + }; + + hideServerId = mkOption { + type = bool; + default = true; + description = '' + Don't identify the server type in headers or directory listings. + ''; + }; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + Additional configuration passed to the executable. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.darkhttpd = { + description = "Dark HTTPd"; + wants = [ "network.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/darkhttpd ${args}"; + AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + Restart = "on-failure"; + RestartSec = "2s"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 2b7fcb314041..c1a51fbf8b42 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -162,6 +162,10 @@ let ${cfg.appendConfig} ''; + configPath = if cfg.enableReload + then "/etc/nginx/nginx.conf" + else configFile; + vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let onlySSL = vhost.onlySSL || vhost.enableSSL; @@ -431,6 +435,16 @@ in "; }; + enableReload = mkOption { + default = false; + type = types.bool; + description = '' + Reload nginx when configuration file changes (instead of restart). + The configuration file is exposed at <filename>/etc/nginx/nginx.conf</filename>. + See also <literal>systemd.services.*.restartIfChanged</literal>. + ''; + }; + stateDir = mkOption { default = "/var/spool/nginx"; description = " @@ -638,10 +652,10 @@ in preStart = '' ${cfg.preStart} - ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t + ${cfg.package}/bin/nginx -c ${configPath} -p ${cfg.stateDir} -t ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + ExecStart = "${cfg.package}/bin/nginx -c ${configPath} -p ${cfg.stateDir}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; RestartSec = "10s"; @@ -649,6 +663,21 @@ in }; }; + environment.etc."nginx/nginx.conf" = mkIf cfg.enableReload { + source = configFile; + }; + + systemd.services.nginx-config-reload = mkIf cfg.enableReload { + wantedBy = [ "nginx.service" ]; + restartTriggers = [ configFile ]; + script = '' + if ${pkgs.systemd}/bin/systemctl -q is-active nginx.service ; then + ${pkgs.systemd}/bin/systemctl reload nginx.service + fi + ''; + serviceConfig.RemainAfterExit = true; + }; + security.acme.certs = filterAttrs (n: v: v != {}) ( let vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index ffafbc5e92f2..e95e71e0d997 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -4,41 +4,27 @@ with lib; let cfg = config.services.phpfpm; - enabled = cfg.poolConfigs != {} || cfg.pools != {}; - stateDir = "/run/phpfpm"; + runtimeDir = "/run/phpfpm"; - poolConfigs = - (mapAttrs mapPoolConfig cfg.poolConfigs) // - (mapAttrs mapPool cfg.pools); + toStr = value: + if true == value then "yes" + else if false == value then "no" + else toString value; - mapPoolConfig = n: p: { - phpPackage = cfg.phpPackage; - phpOptions = cfg.phpOptions; - config = p; - }; - - mapPool = n: p: { - phpPackage = p.phpPackage; - phpOptions = p.phpOptions; - config = '' - listen = ${p.listen} - ${p.extraConfig} - ''; - }; - - fpmCfgFile = pool: conf: pkgs.writeText "phpfpm-${pool}.conf" '' + fpmCfgFile = pool: poolOpts: pkgs.writeText "phpfpm-${pool}.conf" '' [global] - error_log = syslog - daemonize = no - ${cfg.extraConfig} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)} + ${optionalString (cfg.extraConfig != null) cfg.extraConfig} [${pool}] - ${conf} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") poolOpts.settings)} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "env[${n}] = ${toStr v}") poolOpts.phpEnv)} + ${optionalString (poolOpts.extraConfig != null) poolOpts.extraConfig} ''; - phpIni = pool: pkgs.runCommand "php.ini" { - inherit (pool) phpPackage phpOptions; + phpIni = poolOpts: pkgs.runCommand "php.ini" { + inherit (poolOpts) phpPackage phpOptions; preferLocalBuild = true; nixDefaults = '' sendmail_path = "/run/wrappers/bin/sendmail -t -i" @@ -48,13 +34,138 @@ let cat $phpPackage/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out ''; + poolOpts = { name, ... }: + let + poolOpts = cfg.pools."${name}"; + in + { + options = { + socket = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the unix socket file on which to accept FastCGI requests. + <note><para>This option is read-only and managed by NixOS.</para></note> + ''; + }; + + listen = mkOption { + type = types.str; + default = ""; + example = "/path/to/unix/socket"; + description = '' + The address on which to accept FastCGI requests. + ''; + }; + + phpPackage = mkOption { + type = types.package; + default = cfg.phpPackage; + defaultText = "config.services.phpfpm.phpPackage"; + description = '' + The PHP package to use for running this PHP-FPM pool. + ''; + }; + + phpOptions = mkOption { + type = types.lines; + default = cfg.phpOptions; + defaultText = "config.services.phpfpm.phpOptions"; + description = '' + "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool." + ''; + }; + + phpEnv = lib.mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Environment variables used for this PHP-FPM pool. + ''; + example = literalExample '' + { + HOSTNAME = "$HOSTNAME"; + TMP = "/tmp"; + TMPDIR = "/tmp"; + TEMP = "/tmp"; + } + ''; + }; + + user = mkOption { + type = types.str; + description = "User account under which this pool runs."; + }; + + group = mkOption { + type = types.str; + description = "Group account under which this pool runs."; + }; + + settings = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = {}; + description = '' + PHP-FPM pool directives. Refer to the "List of pool directives" section of + <link xlink:href="https://www.php.net/manual/en/install.fpm.configuration.php"/> + for details. Note that settings names must be enclosed in quotes (e.g. + <literal>"pm.max_children"</literal> instead of <literal>pm.max_children</literal>). + ''; + example = literalExample '' + { + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + } + ''; + }; + + extraConfig = mkOption { + type = with types; nullOr lines; + default = null; + description = '' + Extra lines that go into the pool configuration. + See the documentation on <literal>php-fpm.conf</literal> for + details on configuration directives. + ''; + }; + }; + + config = { + socket = if poolOpts.listen == "" then "${runtimeDir}/${name}.sock" else poolOpts.listen; + group = mkDefault poolOpts.user; + + settings = mapAttrs (name: mkDefault){ + listen = poolOpts.socket; + user = poolOpts.user; + group = poolOpts.group; + }; + }; + }; + in { options = { services.phpfpm = { + settings = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = {}; + description = '' + PHP-FPM global directives. Refer to the "List of global php-fpm.conf directives" section of + <link xlink:href="https://www.php.net/manual/en/install.fpm.configuration.php"/> + for details. Note that settings names must be enclosed in quotes (e.g. + <literal>"pm.max_children"</literal> instead of <literal>pm.max_children</literal>). + You need not specify the options <literal>error_log</literal> or + <literal>daemonize</literal> here, since they are generated by NixOS. + ''; + }; + extraConfig = mkOption { - type = types.lines; - default = ""; + type = with types; nullOr lines; + default = null; description = '' Extra configuration that should be put in the global section of the PHP-FPM configuration file. Do not specify the options @@ -80,64 +191,56 @@ in { '' date.timezone = "CET" ''; - description = - "Options appended to the PHP configuration file <filename>php.ini</filename>."; - }; - - poolConfigs = mkOption { - default = {}; - type = types.attrsOf types.lines; - example = literalExample '' - { mypool = ''' - listen = /run/phpfpm/mypool - user = nobody - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - '''; - } - ''; description = '' - A mapping between PHP-FPM pool names and their configurations. - See the documentation on <literal>php-fpm.conf</literal> for - details on configuration directives. If no pools are defined, - the phpfpm service is disabled. + Options appended to the PHP configuration file <filename>php.ini</filename>. ''; }; pools = mkOption { - type = types.attrsOf (types.submodule (import ./pool-options.nix { - inherit lib config; - })); + type = types.attrsOf (types.submodule poolOpts); default = {}; example = literalExample '' { mypool = { - listen = "/path/to/unix/socket"; + user = "php"; + group = "php"; phpPackage = pkgs.php; - extraConfig = ''' - user = nobody - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 + settings = ''' + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; '''; } }''; description = '' - PHP-FPM pools. If no pools or poolConfigs are defined, the PHP-FPM + PHP-FPM pools. If no pools are defined, the PHP-FPM service is disabled. ''; }; }; }; - config = mkIf enabled { + config = mkIf (cfg.pools != {}) { + + warnings = + mapAttrsToList (pool: poolOpts: '' + Using config.services.phpfpm.pools.${pool}.listen is deprecated and will become unsupported in a future release. Please reference the read-only option config.services.phpfpm.pools.${pool}.socket to access the path of your socket. + '') (filterAttrs (pool: poolOpts: poolOpts.listen != "") cfg.pools) ++ + mapAttrsToList (pool: poolOpts: '' + Using config.services.phpfpm.pools.${pool}.extraConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.phpfpm.pools.${pool}.settings. + '') (filterAttrs (pool: poolOpts: poolOpts.extraConfig != null) cfg.pools) ++ + optional (cfg.extraConfig != null) '' + Using config.services.phpfpm.extraConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.phpfpm.settings. + '' + ; + + services.phpfpm.settings = { + error_log = "syslog"; + daemonize = false; + }; systemd.slices.phpfpm = { description = "PHP FastCGI Process manager pools slice"; @@ -148,18 +251,15 @@ in { wantedBy = [ "multi-user.target" ]; }; - systemd.services = flip mapAttrs' poolConfigs (pool: poolConfig: + systemd.services = mapAttrs' (pool: poolOpts: nameValuePair "phpfpm-${pool}" { description = "PHP FastCGI Process Manager service for pool ${pool}"; after = [ "network.target" ]; wantedBy = [ "phpfpm.target" ]; partOf = [ "phpfpm.target" ]; - preStart = '' - mkdir -p ${stateDir} - ''; serviceConfig = let - cfgFile = fpmCfgFile pool poolConfig.config; - iniFile = phpIni poolConfig; + cfgFile = fpmCfgFile pool poolOpts; + iniFile = phpIni poolOpts; in { Slice = "phpfpm.slice"; PrivateDevices = true; @@ -168,10 +268,12 @@ in { # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; Type = "notify"; - ExecStart = "${poolConfig.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}"; + ExecStart = "${poolOpts.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${iniFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; + RuntimeDirectory = "phpfpm"; + RuntimeDirectoryPreserve = true; # Relevant when multiple processes are running }; } - ); + ) cfg.pools; }; } diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix deleted file mode 100644 index d9ad7eff71f2..000000000000 --- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, config }: - -let - fpmCfg = config.services.phpfpm; -in - -with lib; { - - options = { - - listen = mkOption { - type = types.str; - example = "/path/to/unix/socket"; - description = '' - The address on which to accept FastCGI requests. - ''; - }; - - phpPackage = mkOption { - type = types.package; - default = fpmCfg.phpPackage; - defaultText = "config.services.phpfpm.phpPackage"; - description = '' - The PHP package to use for running this PHP-FPM pool. - ''; - }; - - phpOptions = mkOption { - type = types.lines; - default = fpmCfg.phpOptions; - defaultText = "config.services.phpfpm.phpOptions"; - description = '' - "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool." - ''; - }; - - extraConfig = mkOption { - type = types.lines; - example = '' - user = nobody - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - ''; - - description = '' - Extra lines that go into the pool configuration. - See the documentation on <literal>php-fpm.conf</literal> for - details on configuration directives. - ''; - }; - }; -} - diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix new file mode 100644 index 000000000000..6ec395bb05ec --- /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 c02c9bfd94e8..a94a76ff0c0f 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/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cd7502421255..0caa93ad217f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -3,7 +3,9 @@ with lib; let + cfg = config.services.xserver.desktopManager.gnome3; + serviceCfg = config.services.gnome3; # Prioritize nautilus by default when opening directories mimeAppsList = pkgs.writeTextFile { @@ -15,20 +17,27 @@ 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 [org.gnome.desktop.background] - picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' + picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' [org.gnome.desktop.screensaver] - picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png' + picture-uri='file://${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 @@ -38,10 +47,19 @@ let flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; -in { +in + +{ options = { + services.gnome3 = { + core-os-services.enable = mkEnableOption "essential services for GNOME3"; + core-shell.enable = mkEnableOption "GNOME Shell services"; + core-utilities.enable = mkEnableOption "GNOME core utilities"; + games.enable = mkEnableOption "GNOME games"; + }; + services.xserver.desktopManager.gnome3 = { enable = mkOption { default = false; @@ -114,137 +132,194 @@ in { }; - config = mkIf cfg.enable { - - # Enable helpful DBus services. - security.polkit.enable = true; - services.udisks2.enable = true; - services.accounts-daemon.enable = true; - 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; - services.gnome3.gnome-settings-daemon.enable = true; - services.gnome3.gnome-terminal-server.enable = mkDefault true; - services.gnome3.gnome-user-share.enable = mkDefault true; - services.gnome3.gvfs.enable = true; - services.gnome3.rygel.enable = mkDefault true; - services.gnome3.seahorse.enable = mkDefault true; - services.gnome3.sushi.enable = mkDefault true; - services.gnome3.tracker.enable = mkDefault true; - services.gnome3.tracker-miners.enable = mkDefault true; - hardware.pulseaudio.enable = mkDefault true; - services.telepathy.enable = mkDefault true; - networking.networkmanager.enable = mkDefault true; - services.upower.enable = config.powerManagement.enable; - services.dbus.packages = - optional config.services.printing.enable pkgs.system-config-printer ++ - optional flashbackEnabled pkgs.gnome3.gnome-screensaver; - services.colord.enable = mkDefault true; - services.packagekit.enable = mkDefault true; - hardware.bluetooth.enable = mkDefault true; - services.hardware.bolt.enable = mkDefault true; - services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center - systemd.packages = [ pkgs.gnome3.vino ]; - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - - # If gnome3 is installed, build vim for gtk3 too. - nixpkgs.config.vim.gui = "gtk3"; - - fonts.fonts = [ - pkgs.dejavu_fonts pkgs.cantarell-fonts - pkgs.source-sans-pro - pkgs.source-code-pro # Default monospace font in 3.32 - ]; - - services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ] - ++ map - (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { - inherit (wm) wmName wmLabel wmCommand; - }) (optional cfg.flashback.enableMetacity { - wmName = "metacity"; - wmLabel = "Metacity"; - wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; - } ++ cfg.flashback.customSessions); - - environment.extraInit = '' - ${concatMapStrings (p: '' - if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} - fi - - if [ -d "${p}/lib/girepository-1.0" ]; then - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib - fi - '') cfg.sessionPath} - ''; + config = mkMerge [ + (mkIf (cfg.enable || flashbackEnabled) { + services.gnome3.core-os-services.enable = true; + services.gnome3.core-shell.enable = true; + services.gnome3.core-utilities.enable = mkDefault true; + services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; - services.geoclue2.enable = mkDefault true; - # GNOME should have its own geoclue agent - services.geoclue2.enableDemoAgent = false; + environment.extraInit = '' + ${concatMapStrings (p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi - services.geoclue2.appConfig."gnome-datetime-panel" = { - isAllowed = true; - isSystem = true; - }; - services.geoclue2.appConfig."gnome-color-panel" = { - isAllowed = true; - isSystem = true; - }; - services.geoclue2.appConfig."org.gnome.Shell" = { - isAllowed = true; - isSystem = true; - }; + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + '') cfg.sessionPath} + ''; - environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; + environment.systemPackages = cfg.sessionPath; - # Override default mimeapps - environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; + environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; - # Override GSettings schemas - environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + # Override GSettings schemas + environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - # Let nautilus find extensions - # TODO: Create nautilus-with-extensions package - environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; + # If gnome3 is installed, build vim for gtk3 too. + nixpkgs.config.vim.gui = "gtk3"; + }) - services.xserver.updateDbusEnvironment = true; + (mkIf flashbackEnabled { + services.xserver.displayManager.extraSessionFilePackages = map + (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { + inherit (wm) wmName wmLabel wmCommand; + }) (optional cfg.flashback.enableMetacity { + wmName = "metacity"; + wmLabel = "Metacity"; + wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; + } ++ cfg.flashback.customSessions); - environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; - environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath - ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ - pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ - ]; + security.pam.services.gnome-screensaver = { + enableGnomeKeyring = true; + }; - # Use the correct gnome3 packageSet - networking.networkmanager.basePackages = - { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; + services.dbus.packages = [ + pkgs.gnome3.gnome-screensaver + ]; + }) + + (mkIf serviceCfg.core-os-services.enable { + hardware.bluetooth.enable = mkDefault true; + hardware.pulseaudio.enable = mkDefault true; + programs.dconf.enable = true; + security.polkit.enable = true; + services.accounts-daemon.enable = true; + services.dleyna-renderer.enable = mkDefault true; + services.dleyna-server.enable = mkDefault true; + services.gnome3.at-spi2-core.enable = true; + services.gnome3.evolution-data-server.enable = true; + services.gnome3.gnome-keyring.enable = true; + services.gnome3.gnome-online-accounts.enable = mkDefault true; + services.gnome3.gnome-online-miners.enable = true; + services.gnome3.tracker-miners.enable = mkDefault true; + services.gnome3.tracker.enable = mkDefault true; + services.hardware.bolt.enable = mkDefault true; + services.packagekit.enable = mkDefault true; + services.udisks2.enable = true; + services.upower.enable = config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + + networking.networkmanager.enable = mkDefault true; + + # Use the correct gnome3 packageSet + networking.networkmanager.basePackages = { + inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc - networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-iodine networkmanager-l2tp; }; - - # Needed for themes and backgrounds - environment.pathsToLink = [ - "/share" - "/share/nautilus-python/extensions" - ]; + networkmanager-openconnect networkmanager-fortisslvpn + networkmanager-iodine networkmanager-l2tp; + }; - security.pam.services.gnome-screensaver = mkIf flashbackEnabled { - enableGnomeKeyring = true; - }; - }; + services.xserver.updateDbusEnvironment = true; + + # Needed for themes and backgrounds + environment.pathsToLink = [ + "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173 + ]; + }) + + (mkIf serviceCfg.core-shell.enable { + services.colord.enable = mkDefault true; + services.gnome3.glib-networking.enable = true; + services.gnome3.gnome-remote-desktop.enable = mkDefault true; + services.gnome3.gnome-settings-daemon.enable = true; + services.gnome3.gnome-user-share.enable = mkDefault true; + services.gnome3.rygel.enable = mkDefault true; + services.gvfs.enable = true; + services.telepathy.enable = mkDefault true; + systemd.packages = [ pkgs.gnome3.vino ]; + services.dbus.packages = + optional config.services.printing.enable pkgs.system-config-printer; + + services.geoclue2.enable = mkDefault true; + services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent + + services.geoclue2.appConfig."gnome-datetime-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."gnome-color-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."org.gnome.Shell" = { + isAllowed = true; + isSystem = true; + }; + fonts.fonts = with pkgs; [ + cantarell-fonts + dejavu_fonts + source-code-pro # Default monospace font in 3.32 + source-sans-pro + ]; + + environment.systemPackages = with pkgs.gnome3; [ + adwaita-icon-theme + gnome-backgrounds + gnome-bluetooth + gnome-control-center + gnome-getting-started-docs + gnome-shell + gnome-shell-extensions + gnome-themes-extra + gnome-user-docs + pkgs.glib # for gsettings + pkgs.gnome-menus + pkgs.gtk3.out # for gtk-launch + pkgs.hicolor-icon-theme + pkgs.shared-mime-info # for update-mime-database + pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + vino + ]; + }) + + (mkIf serviceCfg.core-utilities.enable { + environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator + gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan + gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks + pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs + gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit + gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage + ] config.environment.gnome3.excludePackages); + + # 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; + programs.gnome-terminal.enable = mkDefault true; + services.gnome3.seahorse.enable = mkDefault true; + services.gnome3.sushi.enable = mkDefault true; + + # Let nautilus find extensions + # TODO: Create nautilus-with-extensions package + environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; + + # Override default mimeapps for nautilus + environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; + + environment.pathsToLink = [ + "/share/nautilus-python/extensions" + ]; + }) + + (mkIf serviceCfg.games.enable { + environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski + gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-sudoku + gnome-taquin gnome-tetravex hitori iagno lightsoff quadrapassel + swell-foop tali + ] config.environment.gnome3.excludePackages); + }) + ]; } diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 4368adedb34b..bf53082b267d 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -58,7 +58,8 @@ in # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ "/share" ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.gvfs.enable = true; + services.gvfs.package = pkgs.gvfs; services.upower.enable = config.powerManagement.enable; }; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index a2d0810f90df..e1084b0053cc 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -94,17 +94,19 @@ in ]; programs.dconf.enable = true; + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + services.gnome3.at-spi2-core.enable = true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon; - services.gnome3.gvfs.enable = true; + services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; security.pam.services."mate-screensaver".unixAuth = true; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; - environment.pathsToLink = [ "/share" ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 8e1272f3c92b..ae23015d2005 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -99,10 +99,6 @@ in fi '') cfg.sessionPath} - # 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 @@ -123,15 +119,13 @@ 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; - services.gnome3.gvfs.enable = true; + services.gvfs.enable = true; services.gnome3.rygel.enable = mkDefault true; services.gsignond.enable = mkDefault true; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; @@ -140,7 +134,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; @@ -149,6 +142,19 @@ in isSystem = true; }; + programs.dconf.enable = true; + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + + # Harmonize Qt5 applications under Pantheon + qt5.enable = true; + qt5.platformTheme = "gnome"; + qt5.style = "adwaita"; + networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; @@ -161,11 +167,6 @@ in environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; - environment.variables.GIO_EXTRA_MODULES = [ - "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.gvfs}/lib/gio/modules" - ]; - environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this "/share" @@ -187,7 +188,6 @@ in glib-networking gnome-menus gnome3.adwaita-icon-theme - gnome3.dconf gtk3.out hicolor-icon-theme lightlocker diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6852154378d7..1102f73d1ac3 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -66,7 +66,6 @@ in exo garcon gtk-xfce-engine - gvfs libxfce4ui tumbler xfconf @@ -100,10 +99,6 @@ in "/share/gtksourceview-2.0" ]; - environment.variables = { - GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; - }; - services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; services.xserver.desktopManager.session = [{ @@ -128,5 +123,7 @@ in # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; + services.gvfs.enable = true; + services.gvfs.package = pkgs.xfce.gvfs; }; } diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 4345a3348081..55f8f75021bc 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/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index cbe000058dc6..10eef8aefbcd 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -129,7 +129,7 @@ in assertion = cfg.killer != null -> cfg.killtime >= 10; message = "killtime has to be at least 10 minutes according to `man xautolock`"; } - ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ] + ] ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ] (option: { assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index b1a316706976..c94a06438315 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -78,7 +78,7 @@ let in imap1 mkHead cfg.xrandrHeads; xrandrDeviceSection = let - monitors = flip map xrandrHeads (h: '' + monitors = forEach xrandrHeads (h: '' Option "monitor-${h.config.output}" "${h.name}" ''); # First option is indented through the space in the config but any @@ -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 5c88d27b6c65..f67d29005616 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/coredump.nix b/nixos/modules/system/boot/coredump.nix deleted file mode 100644 index 30f367da7666..000000000000 --- a/nixos/modules/system/boot/coredump.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - systemd.coredump = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enables storing core dumps in systemd. - Note that this alone is not enough to enable core dumps. The maximum - file size for core dumps must be specified in limits.conf as well. See - <option>security.pam.loginLimits</option> and the limits.conf(5) - man page (these specify the core dump limits for user login sessions) - and <option>systemd.extraConfig</option> (where e.g. - <literal>DefaultLimitCORE=1000000</literal> can be specified to set - the core dump limit for systemd system-level services). - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - example = "Storage=journal"; - description = '' - Extra config options for systemd-coredump. See coredump.conf(5) man page - for available options. - ''; - }; - }; - - }; - - config = mkMerge [ - (mkIf config.systemd.coredump.enable { - - systemd.additionalUpstreamSystemUnits = [ "systemd-coredump.socket" "systemd-coredump@.service" ]; - - environment.etc."systemd/coredump.conf".text = - '' - [Coredump] - ${config.systemd.coredump.extraConfig} - ''; - - # Have the kernel pass core dumps to systemd's coredump helper binary. - # From systemd's 50-coredump.conf file. See: - # <https://github.com/systemd/systemd/blob/v218/sysctl.d/50-coredump.conf.in> - boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %P %u %g %s %t %c %e"; - }) - - (mkIf (!config.systemd.coredump.enable) { - boot.kernel.sysctl."kernel.core_pattern" = mkDefault "core"; - - systemd.extraConfig = - '' - DefaultLimitCORE=0:infinity - ''; - }) - ]; - -} diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ee43fe100238..baa8c602a99e 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -36,6 +36,7 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; + type = types.unspecified // { merge = mergeEqualOption; }; apply = kernelPackages: kernelPackages.extend (self: super: { kernel = super.kernel.override { inherit randstructSeed; 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 c780a89b102c..0092ee92b62f 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/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 4e4d14985b0d..eca9dad64222 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -684,7 +684,7 @@ in assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint; message = "EFI paths must be absolute, not ${args.efiSysMountPoint}"; } - ] ++ flip map args.devices (device: { + ] ++ forEach args.devices (device: { assertion = device == "nodev" || hasPrefix "/" device; message = "GRUB devices must be absolute paths, not ${device} in ${args.path}"; })); diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f1aa9064bef4..f2060e21509c 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" @@ -55,6 +55,27 @@ let (assertMacAddress "MACAddress") ]; + # NOTE The PrivateKey directive is missing on purpose here, please + # do not add it to this list. The nix store is world-readable let's + # refrain ourselves from providing a footgun. + checkWireGuard = checkUnitConfig "WireGuard" [ + (assertOnlyFields [ + "PrivateKeyFile" "ListenPort" "FwMark" + ]) + (assertRange "FwMark" 1 4294967295) + ]; + + # NOTE The PresharedKey directive is missing on purpose here, please + # do not add it to this list. The nix store is world-readable,let's + # refrain ourselves from providing a footgun. + checkWireGuardPeer = checkUnitConfig "WireGuardPeer" [ + (assertOnlyFields [ + "PublicKey" "PresharedKeyFile" "AllowedIPs" + "Endpoint" "PersistentKeepalive" + ]) + (assertRange "PersistentKeepalive" 1 65535) + ]; + checkVlan = checkUnitConfig "VLAN" [ (assertOnlyFields ["Id" "GVRP" "MVRP" "LooseBinding" "ReorderHeader"]) (assertRange "Id" 0 4094) @@ -320,6 +341,46 @@ let ''; }; + wireguardConfig = mkOption { + default = {}; + example = { + PrivateKeyFile = "/etc/wireguard/secret.key"; + ListenPort = 51820; + FwMark = 42; + }; + type = types.addCheck (types.attrsOf unitOption) checkWireGuard; + description = '' + Each attribute in this set specifies an option in the + <literal>[WireGuard]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + Use <literal>PrivateKeyFile</literal> instead of + <literal>PrivateKey</literal>: the nix store is + world-readable. + ''; + }; + + wireguardPeers = mkOption { + default = []; + example = [ { wireguardPeerConfig={ + Endpoint = "192.168.1.1:51820"; + PublicKey = "27s0OvaBBdHoJYkH9osZpjpgSOVNw+RaKfboT/Sfq0g="; + PresharedKeyFile = "/etc/wireguard/psk.key"; + AllowedIPs = [ "10.0.0.1/32" ]; + PersistentKeepalive = 15; + };}]; + type = with types; listOf (submodule wireguardPeerOptions); + description = '' + Each item in this array specifies an option in the + <literal>[WireGuardPeer]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + Use <literal>PresharedKeyFile</literal> instead of + <literal>PresharedKey</literal>: the nix store is + world-readable. + ''; + }; + vlanConfig = mkOption { default = {}; example = { Id = "4"; }; @@ -450,6 +511,23 @@ let }; }; + wireguardPeerOptions = { + options = { + wireguardPeerConfig = mkOption { + default = {}; + example = { }; + type = types.addCheck (types.attrsOf unitOption) checkWireGuardPeer; + description = '' + Each attribute in this set specifies an option in the + <literal>[WireGuardPeer]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + }; + }; + + networkOptions = commonNetworkOptions // { networkConfig = mkOption { @@ -732,6 +810,16 @@ let ${attrsToSection def.bondConfig} ''} + ${optionalString (def.wireguardConfig != { }) '' + [WireGuard] + ${attrsToSection def.wireguardConfig} + + ''} + ${flip concatMapStrings def.wireguardPeers (x: '' + [WireGuardPeer] + ${attrsToSection x.wireguardPeerConfig} + + '')} ${def.extraConfig} ''; }; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 67cbe720ddc3..b817a45deba3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -44,13 +44,13 @@ EOF *) to ignore the error and continue EOF - read reply + read -n 1 reply if [ -n "$allowShell" -a "$reply" = f ]; then exec setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console" elif [ -n "$allowShell" -a "$reply" = i ]; then echo "Starting interactive shell..." - setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail + setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail elif [ "$reply" = r ]; then echo "Rebooting..." reboot -f diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 788e3f4a2ab1..4c2d130d5a5d 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 ee4ae845a7d5..c1f2c98afcd8 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 cf35504e5182..2a0360b12cbc 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -76,6 +76,10 @@ let "systemd-journald-dev-log.socket" "syslog.socket" + # Coredumps. + "systemd-coredump.socket" + "systemd-coredump@.service" + # SysV init compatibility. "systemd-initctl.socket" "systemd-initctl.service" @@ -427,7 +431,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 +502,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 +528,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 = '' @@ -529,13 +537,23 @@ in }; systemd.enableCgroupAccounting = mkOption { - default = false; + default = true; type = types.bool; description = '' Whether to enable cgroup accounting. ''; }; + systemd.coredump.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=journal"; + description = '' + Extra config options for systemd-coredump. See coredump.conf(5) man page + for available options. + ''; + }; + systemd.extraConfig = mkOption { default = ""; type = types.lines; @@ -761,18 +779,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; @@ -783,11 +804,12 @@ in [Manager] ${optionalString config.systemd.enableCgroupAccounting '' DefaultCPUAccounting=yes + DefaultBlockIOAccounting=yes DefaultIOAccounting=yes DefaultBlockIOAccounting=yes - DefaultMemoryAccounting=yes - DefaultTasksAccounting=yes + DefaultIPAccounting=yes ''} + DefaultLimitCORE=infinity ${config.systemd.extraConfig} ''; @@ -811,6 +833,12 @@ in ${config.services.journald.extraConfig} ''; + "systemd/coredump.conf".text = + '' + [Coredump] + ${config.systemd.coredump.extraConfig} + ''; + "systemd/logind.conf".text = '' [Login] KillUserProcesses=${if config.services.logind.killUserProcesses then "yes" else "no"} @@ -824,6 +852,10 @@ in [Sleep] ''; + # install provided sysctl snippets + "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; @@ -834,7 +866,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 d3a558738f4b..e0e8bb1f03de 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/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 857aaf1e6e30..fbca54978e5b 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -74,7 +74,7 @@ in enable = true; networks."99-main" = genericNetwork mkDefault; } - (mkMerge (flip map interfaces (i: { + (mkMerge (forEach interfaces (i: { netdevs = mkIf i.virtual ({ "40-${i.name}" = { netdevConfig = { @@ -90,7 +90,7 @@ in name = mkDefault i.name; DHCP = mkForce (dhcpStr (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ])); - address = flip map (interfaceIps i) + address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); networkConfig.IPv6PrivacyExtensions = "kernel"; } ]; @@ -102,7 +102,7 @@ in Kind = "bridge"; }; }; - networks = listToAttrs (flip map bridge.interfaces (bi: + networks = listToAttrs (forEach bridge.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bridge = name; @@ -173,7 +173,7 @@ in }; - networks = listToAttrs (flip map bond.interfaces (bi: + networks = listToAttrs (forEach bond.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bond = name; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index c75d7cbc408b..5ac753c92a78 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -926,7 +926,7 @@ in warnings = concatMap (i: i.warnings) interfaces; assertions = - (flip map interfaces (i: { + (forEach interfaces (i: { # With the linux kernel, interface name length is limited by IFNAMSIZ # to 16 bytes, including the trailing null byte. # See include/linux/if.h in the kernel sources @@ -934,12 +934,12 @@ in message = '' The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters. ''; - })) ++ (flip map slaveIfs (i: { + })) ++ (forEach slaveIfs (i: { assertion = i.ipv4.addresses == [ ] && i.ipv6.addresses == [ ]; message = '' The networking.interfaces."${i.name}" must not have any defined ips when it is a slave. ''; - })) ++ (flip map interfaces (i: { + })) ++ (forEach interfaces (i: { assertion = i.preferTempAddress -> cfg.enableIPv6; message = '' Temporary addresses are only needed when IPv6 is enabled. @@ -967,8 +967,8 @@ in "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces); } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) - (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))) - // listToAttrs (flip map (filter (i: i.preferTempAddress) interfaces) + (i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))) + // listToAttrs (forEach (filter (i: i.preferTempAddress) interfaces) (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2)); # Capabilities won't work unless we have at-least a 4.3 Linux @@ -1050,7 +1050,7 @@ in ${cfg.localCommands} ''; }; - } // (listToAttrs (flip map interfaces (i: + } // (listToAttrs (forEach interfaces (i: let deviceDependency = if (config.boot.isContainer || i.name == "lo") then [] diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 93e03c44c868..8fa19194bed4 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 d67790702f1f..0c4ad90b4eb6 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/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index c10e2b162ccc..b65374c92577 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -138,7 +138,7 @@ let --bind-ro=/nix/var/nix/daemon-socket \ --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ - --link-journal=try-guest \ + ${optionalString (!cfg.ephemeral) "--link-journal=try-guest"} \ --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ --setenv HOST_BRIDGE="$HOST_BRIDGE" \ --setenv HOST_ADDRESS="$HOST_ADDRESS" \ @@ -147,6 +147,7 @@ let --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv HOST_PORT="$HOST_PORT" \ --setenv PATH="$PATH" \ + ${optionalString cfg.ephemeral "--ephemeral"} \ ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" } \ @@ -247,6 +248,8 @@ let Type = "notify"; + RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i"; + # Note that on reboot, systemd-nspawn returns 133, so this # unit will be restarted. On poweroff, it returns 0, so the # unit won't be restarted. @@ -419,6 +422,7 @@ let { extraVeths = {}; additionalCapabilities = []; + ephemeral = false; allowedDevices = []; hostAddress = null; hostAddress6 = null; @@ -511,6 +515,26 @@ in information. ''; }; + + ephemeral = mkOption { + type = types.bool; + default = false; + description = '' + Runs container in ephemeral mode with the empty root filesystem at boot. + This way container will be bootstrapped from scratch on each boot + and will be cleaned up on shutdown leaving no traces behind. + Useful for completely stateless, reproducible containers. + + Note that this option might require to do some adjustments to the container configuration, + e.g. you might want to set + <varname>systemd.network.networks.$interface.dhcpConfig.ClientIdentifier</varname> to "mac" + if you use <varname>macvlans</varname> option. + This way dhcp client identifier will be stable between the container restarts. + + Note that the container journal will not be linked to the host if this option is enabled. + ''; + }; + enableTun = mkOption { type = types.bool; default = false; @@ -659,12 +683,14 @@ in unit = { description = "Container '%i'"; - unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ]; + unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; path = [ pkgs.iproute ]; - environment.INSTANCE = "%i"; - environment.root = "/var/lib/containers/%i"; + environment = { + root = "/var/lib/containers/%i"; + INSTANCE = "%i"; + }; preStart = preStartScript dummyConfig; @@ -703,11 +729,13 @@ in } else {}); in - unit // { + recursiveUpdate unit { preStart = preStartScript containerConfig; script = startScript containerConfig; postStart = postStartScript containerConfig; serviceConfig = serviceDirectives containerConfig; + unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i"; + environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i"; } // ( if containerConfig.autoStart then { diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 5c59188b68b2..79766970c757 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -159,12 +159,6 @@ in # functionality/features (e.g. TCP Window scaling). "net.ipv4.tcp_syncookies" = mkDefault "1"; - # ignores source-routed packets - "net.ipv4.conf.all.accept_source_route" = mkDefault "0"; - - # ignores source-routed packets - "net.ipv4.conf.default.accept_source_route" = mkDefault "0"; - # ignores ICMP redirects "net.ipv4.conf.all.accept_redirects" = mkDefault "0"; @@ -186,10 +180,10 @@ in # don't allow traffic between networks or act as a router "net.ipv4.conf.default.send_redirects" = mkDefault "0"; - # reverse path filtering - IP spoofing protection + # strict reverse path filtering - IP spoofing protection "net.ipv4.conf.all.rp_filter" = mkDefault "1"; - # reverse path filtering - IP spoofing protection + # strict path filtering - IP spoofing protection "net.ipv4.conf.default.rp_filter" = mkDefault "1"; # ignores ICMP broadcasts to avoid participating in Smurf attacks diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 394b4ce56563..16b79d869193 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -104,6 +104,18 @@ in { ''; }; + onBoot = mkOption { + type = types.enum ["start" "ignore" ]; + default = "start"; + description = '' + Specifies the action to be done to / on the guests when the host boots. + The "start" option starts all guests that were running prior to shutdown + regardless of their autostart settings. The "ignore" option will not + start the formally running guest on boot. However, any guest marked as + autostart will still be automatically started by libvirtd. + ''; + }; + onShutdown = mkOption { type = types.enum ["shutdown" "suspend" ]; default = "suspend"; @@ -221,6 +233,7 @@ in { path = with pkgs; [ coreutils libvirt gawk ]; restartIfChanged = false; + environment.ON_BOOT = "${cfg.onBoot}"; environment.ON_SHUTDOWN = "${cfg.onShutdown}"; }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index b9a9515f94ef..7146aebf54be 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 25dd9f3f4283..e3e4ddab72c6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -47,6 +47,7 @@ in codimd = handleTest ./codimd.nix {}; colord = handleTest ./colord.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; + containers-ephemeral = handleTest ./containers-ephemeral.nix {}; containers-extra_veth = handleTest ./containers-extra_veth.nix {}; containers-hosts = handleTest ./containers-hosts.nix {}; containers-imperative = handleTest ./containers-imperative.nix {}; @@ -56,7 +57,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 {}; @@ -73,7 +74,7 @@ in #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; - ejabberd = handleTest ./ejabberd.nix {}; + ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; env = handleTest ./env.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; @@ -93,8 +94,10 @@ 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 + glusterfs = handleTest ./glusterfs.nix {}; + gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + gnome3 = handleTest ./gnome3.nix {}; + gnome-photos = handleTest ./gnome-photos.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; google-oslogin = handleTest ./google-oslogin {}; @@ -114,6 +117,7 @@ in hound = handleTest ./hound.nix {}; hydra = handleTest ./hydra {}; i3wm = handleTest ./i3wm.nix {}; + icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; incron = handleTest ./incron.nix {}; influxdb = handleTest ./influxdb.nix {}; @@ -124,6 +128,7 @@ in jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; jenkins = handleTest ./jenkins.nix {}; + jormungandr = handleTest ./jormungandr.nix {}; kafka = handleTest ./kafka.nix {}; kerberos = handleTest ./kerberos/default.nix {}; kernel-latest = handleTest ./kernel-latest.nix {}; @@ -138,8 +143,9 @@ in latestKernel.login = handleTest ./login.nix { latestKernel = true; }; ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; + libxmlb = handleTest ./libxmlb.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 {}; @@ -150,10 +156,12 @@ in mediawiki = handleTest ./mediawiki.nix {}; memcached = handleTest ./memcached.nix {}; mesos = handleTest ./mesos.nix {}; + metabase = handleTest ./metabase.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; mongodb = handleTest ./mongodb.nix {}; + moodle = handleTest ./moodle.nix {}; morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; mpd = handleTest ./mpd.nix {}; @@ -210,13 +218,15 @@ 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 {}; prometheus = handleTest ./prometheus.nix {}; prometheus2 = handleTest ./prometheus-2.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; - prosody = handleTest ./prosody.nix {}; + prosody = handleTest ./xmpp/prosody.nix {}; + prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; quagga = handleTest ./quagga.nix {}; quake3 = handleTest ./quake3.nix {}; @@ -248,6 +258,7 @@ in systemd = handleTest ./systemd.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; + systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; @@ -255,6 +266,7 @@ in tinydns = handleTest ./tinydns.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; + trezord = handleTest ./trezord.nix {}; udisks2 = handleTest ./udisks2.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix new file mode 100644 index 000000000000..1ef8717d9a0e --- /dev/null +++ b/nixos/tests/containers-ephemeral.nix @@ -0,0 +1,56 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-ephemeral"; + + machine = { pkgs, ... }: { + virtualisation.memorySize = 768; + virtualisation.writableStore = true; + + containers.webserver = { + ephemeral = true; + privateNetwork = true; + hostAddress = "10.231.136.1"; + localAddress = "10.231.136.2"; + config = { + services.nginx = { + enable = true; + virtualHosts.localhost = { + root = (pkgs.runCommand "localhost" {} '' + mkdir "$out" + echo hello world > "$out/index.html" + ''); + }; + }; + networking.firewall.allowedTCPPorts = [ 80 ]; + }; + }; + }; + + testScript = '' + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Start the webserver container. + $machine->succeed("nixos-container start webserver"); + + # Check that container got its own root folder + $machine->succeed("ls /run/containers/webserver"); + + # Check that container persistent directory is not created + $machine->fail("ls /var/lib/containers/webserver"); + + # Since "start" returns after the container has reached + # multi-user.target, we should now be able to access it. + my $ip = $machine->succeed("nixos-container show-ip webserver"); + chomp $ip; + $machine->succeed("ping -n -c1 $ip"); + $machine->succeed("curl --fail http://$ip/ > /dev/null"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); + + # Check that container's root folder was removed + $machine->fail("ls /run/containers/webserver"); + ''; +}) diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix new file mode 100644 index 000000000000..9fd8bd2ed129 --- /dev/null +++ b/nixos/tests/glusterfs.nix @@ -0,0 +1,65 @@ +import ./make-test.nix ({ ... } : + +let + client = { pkgs, ... } : { + environment.systemPackages = [ pkgs.glusterfs ]; + fileSystems = pkgs.lib.mkVMOverride + [ { mountPoint = "/gluster"; + fsType = "glusterfs"; + device = "server1:/gv0"; + } ]; + }; + + server = { pkgs, ... } : { + networking.firewall.enable = false; + services.glusterfs.enable = true; + + # create a mount point for the volume + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + virtualisation.emptyDiskImages = [ 1024 ]; + + fileSystems = pkgs.lib.mkVMOverride + [ { mountPoint = "/data"; + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + } + ]; + }; +in { + name = "glusterfs"; + + nodes = { + server1 = server; + server2 = server; + client1 = client; + client2 = client; + }; + + testScript = '' + $server1->waitForUnit("glusterd.service"); + $server2->waitForUnit("glusterd.service"); + + # establish initial contact + $server1->succeed("sleep 2"); + $server1->succeed("gluster peer probe server2"); + $server1->succeed("gluster peer probe server1"); + + $server1->succeed("gluster peer status | grep Connected"); + + # create volumes + $server1->succeed("mkdir -p /data/vg0"); + $server2->succeed("mkdir -p /data/vg0"); + $server1->succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0"); + $server1->succeed("gluster volume start gv0"); + + # test clients + $client1->waitForUnit("gluster.mount"); + $client2->waitForUnit("gluster.mount"); + + $client1->succeed("echo test > /gluster/file1"); + $client2->succeed("grep test /gluster/file1"); + ''; +}) diff --git a/nixos/tests/gnome-photos.nix b/nixos/tests/gnome-photos.nix new file mode 100644 index 000000000000..2ecda1d68ce3 --- /dev/null +++ b/nixos/tests/gnome-photos.nix @@ -0,0 +1,42 @@ +# run installed tests +import ./make-test.nix ({ pkgs, lib, ... }: + +let + + # gsettings tool with access to gsettings-desktop-schemas + desktop-gsettings = with pkgs; stdenv.mkDerivation { + name = "desktop-gsettings"; + dontUnpack = true; + nativeBuildInputs = [ glib wrapGAppsHook ]; + buildInputs = [ gsettings-desktop-schemas ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + ln -s ${glib.bin}/bin/gsettings $out/bin/desktop-gsettings + runHook postInstall + ''; + }; + +in + +{ + name = "gnome-photos"; + meta = { + maintainers = pkgs.gnome-photos.meta.maintainers; + }; + + machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + programs.dconf.enable = true; + services.gnome3.at-spi2-core.enable = true; # needed for dogtail + environment.systemPackages = with pkgs; [ gnome-desktop-testing desktop-gsettings ]; + services.dbus.packages = with pkgs; [ gnome-photos ]; + }; + + testScript = '' + $machine->waitForX; + # dogtail needs accessibility enabled + $machine->succeed("desktop-gsettings set org.gnome.desktop.interface toolkit-accessibility true 2>&1"); + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.gnome-photos.installedTests}/share' 2>&1"); + ''; +}) diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix deleted file mode 100644 index c2808d87d99d..000000000000 --- 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 000000000000..f12361da0372 --- /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 b58c9e5a0e32..b6fe602a7327 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/icingaweb2.nix b/nixos/tests/icingaweb2.nix new file mode 100644 index 000000000000..ea1b94c526b1 --- /dev/null +++ b/nixos/tests/icingaweb2.nix @@ -0,0 +1,71 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "icingaweb2"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ das_j ]; + }; + + nodes = { + icingaweb2 = { config, pkgs, ... }: { + services.icingaweb2 = { + enable = true; + + modulePackages = with pkgs.icingaweb2Modules; { + particles = theme-particles; + spring = theme-spring; + }; + + modules = { + doc.enable = true; + migrate.enable = true; + setup.enable = true; + test.enable = true; + translation.enable = true; + }; + + generalConfig = { + global = { + module_path = "${pkgs.icingaweb2}/modules"; + }; + }; + + authentications = { + icingaweb = { + backend = "external"; + }; + }; + + groupBackends = { + icingaweb = { + backend = "db"; + resource = "icingaweb_db"; + }; + }; + + resources = { + # Not used, so no DB server needed + icingaweb_db = { + type = "db"; + db = "mysql"; + host = "localhost"; + username = "icingaweb2"; + password = "icingaweb2"; + dbname = "icingaweb2"; + }; + }; + + roles = { + Administrators = { + users = "*"; + permissions = "*"; + }; + }; + }; + }; + }; + + testScript = '' + startAll(); + $icingaweb2->waitForUnit("multi-user.target"); + $icingaweb2->succeed("curl -sSf http://icingaweb2/authentication/login"); + ''; +}) diff --git a/nixos/tests/jormungandr.nix b/nixos/tests/jormungandr.nix new file mode 100644 index 000000000000..2abafc53ce51 --- /dev/null +++ b/nixos/tests/jormungandr.nix @@ -0,0 +1,77 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "jormungandr"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + # Testing the Byzantine Fault Tolerant protocol + bft = { ... }: { + environment.systemPackages = [ pkgs.jormungandr ]; + services.jormungandr.enable = true; + services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin"; + services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml"; + }; + + # Testing the Ouroboros Genesis Praos protocol + genesis = { ... }: { + environment.systemPackages = [ pkgs.jormungandr ]; + services.jormungandr.enable = true; + services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin"; + services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml"; + }; + }; + + testScript = '' + startAll; + + ## Testing BFT + # Let's wait for the StateDirectory + $bft->waitForFile("/var/lib/jormungandr/"); + + # First, we generate the genesis file for our new blockchain + $bft->succeed("jcli genesis init > /root/genesis.yaml"); + + # We need to generate our secret key + $bft->succeed("jcli key generate --type=Ed25519 > /root/key.prv"); + + # We include the secret key into our services.jormungandr.secretFile + $bft->succeed("mkdir -p /etc/secrets"); + $bft->succeed("echo -e \"bft:\\n signing_key:\" \$(cat /root/key.prv) > /etc/secrets/jormungandr.yaml"); + + # After that, we generate our public key from it + $bft->succeed("cat /root/key.prv | jcli key to-public > /root/key.pub"); + + # We add our public key as a consensus leader in the genesis configration file + $bft->succeed("sed -ie \"s/ed25519_pk1vvwp2s0n5jl5f4xcjurp2e92sj2awehkrydrlas4vgqr7xzt33jsadha32/\$(cat /root/key.pub)/\" /root/genesis.yaml"); + + # Now we can generate the genesis block from it + $bft->succeed("jcli genesis encode --input /root/genesis.yaml --output /var/lib/jormungandr/block-0.bin"); + + # We should have everything to start the service now + $bft->succeed("systemctl restart jormungandr"); + $bft->waitForUnit("jormungandr.service"); + + # Now we can test if we are able to reach the REST API + $bft->waitUntilSucceeds("curl -L http://localhost:8607/api/v0/node/stats | grep uptime"); + + ## Testing Genesis + # Let's wait for the StateDirectory + $genesis->waitForFile("/var/lib/jormungandr/"); + + # Bootstraping the configuration + $genesis->succeed("jormungandr-bootstrap -g -p 8607 -s 1"); + + # Moving generated files in place + $genesis->succeed("mkdir -p /etc/secrets"); + $genesis->succeed("mv pool-secret1.yaml /etc/secrets/jormungandr.yaml"); + $genesis->succeed("mv block-0.bin /var/lib/jormungandr/"); + + # We should have everything to start the service now + $genesis->succeed("systemctl restart jormungandr"); + $genesis->waitForUnit("jormungandr.service"); + + # Now we can create and delegate an account + $genesis->succeed("./create-account-and-delegate.sh | tee -a /tmp/delegate.log"); + ''; +}) diff --git a/nixos/tests/libxmlb.nix b/nixos/tests/libxmlb.nix new file mode 100644 index 000000000000..3bee568ac5a2 --- /dev/null +++ b/nixos/tests/libxmlb.nix @@ -0,0 +1,17 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "libxmlb"; + meta = { + maintainers = pkgs.libxmlb.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libxmlb.installedTests}/share'"); + ''; +}) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 8a9a7408d292..c805f1ed9f3c 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/metabase.nix b/nixos/tests/metabase.nix new file mode 100644 index 000000000000..be9e5ed5b1e8 --- /dev/null +++ b/nixos/tests/metabase.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "metabase"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + machine = { ... }: { + services.metabase.enable = true; + virtualisation.memorySize = 1024; + }; + }; + + testScript = '' + startAll; + $machine->waitForUnit("metabase.service"); + $machine->waitForOpenPort(3000); + $machine->waitUntilSucceeds("curl -L http://localhost:3000/setup | grep Metabase"); + ''; +}) diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix new file mode 100644 index 000000000000..565a6b636949 --- /dev/null +++ b/nixos/tests/moodle.nix @@ -0,0 +1,22 @@ +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "moodle"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { ... }: + { services.moodle.enable = true; + services.moodle.virtualHost.hostName = "localhost"; + services.moodle.virtualHost.adminAddr = "root@example.com"; + services.moodle.initialPassword = "correcthorsebatterystaple"; + + # Ensure the virtual machine has enough memory to avoid errors like: + # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes) + virtualisation.memorySize = 2000; + }; + + testScript = '' + startAll; + $machine->waitForUnit('phpfpm-moodle.service'); + $machine->succeed('curl http://localhost/') =~ /You are not logged in/ or die; + ''; +}) diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 86b7f9c044d8..bd5447de15ff 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/networking.nix b/nixos/tests/networking.nix index 949d946bdc4c..6ce64dcebea0 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -21,7 +21,7 @@ let useNetworkd = networkd; firewall.checkReversePath = true; firewall.allowedUDPPorts = [ 547 ]; - interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: + interfaces = mkOverride 0 (listToAttrs (forEach vlanIfs (n: nameValuePair "eth${toString n}" { ipv4.addresses = [ { address = "192.168.${toString n}.1"; prefixLength = 24; } ]; ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index d66d99821c11..d0b7306ae83b 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -3,15 +3,15 @@ # generated virtual hosts config. # 2. whether the ETag header is properly generated whenever we're serving # files in Nix store paths - +# 3. nginx doesn't restart on configuration changes (only reloads) import ./make-test.nix ({ pkgs, ... }: { name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mbbx6spp ]; }; - nodes = let - commonConfig = { pkgs, ... }: { + nodes = { + webserver = { pkgs, lib, ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' log_format ceeformat '@cee: {"status":"$status",' @@ -32,30 +32,42 @@ import ./make-test.nix ({ pkgs, ... }: { location /favicon.ico { allow all; access_log off; log_not_found off; } ''; }; + services.nginx.virtualHosts.localhost = { root = pkgs.runCommand "testdir" {} '' mkdir "$out" echo hello world > "$out/index.html" ''; }; - }; - in { - webserver = commonConfig; - newwebserver = { pkgs, lib, ... }: { - imports = [ commonConfig ]; - services.nginx.virtualHosts.localhost = { - root = lib.mkForce (pkgs.runCommand "testdir2" {} '' - mkdir "$out" - echo hello world > "$out/index.html" - ''); - }; + services.nginx.enableReload = true; + + nesting.clone = [ + { + services.nginx.virtualHosts.localhost = { + root = lib.mkForce (pkgs.runCommand "testdir2" {} '' + mkdir "$out" + echo content changed > "$out/index.html" + ''); + }; + } + + { + services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }]; + } + + { + services.nginx.package = pkgs.nginxUnstable; + } + ]; }; + }; testScript = { nodes, ... }: let - newServerSystem = nodes.newwebserver.config.system.build.toplevel; - switch = "${newServerSystem}/bin/switch-to-configuration test"; + etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1"; + justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2"; + reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-3"; in '' my $url = 'http://localhost/index.html'; @@ -77,9 +89,23 @@ import ./make-test.nix ({ pkgs, ... }: { subtest "check ETag if serving Nix store paths", sub { my $oldEtag = checkEtag; - $webserver->succeed('${switch}'); + $webserver->succeed("${etagSystem}/bin/switch-to-configuration test >&2"); + $webserver->sleep(1); # race condition my $newEtag = checkEtag; die "Old ETag $oldEtag is the same as $newEtag" if $oldEtag eq $newEtag; }; + + subtest "config is reloaded on nixos-rebuild switch", sub { + $webserver->succeed("${justReloadSystem}/bin/switch-to-configuration test >&2"); + $webserver->waitForOpenPort("8080"); + $webserver->fail("journalctl -u nginx | grep -q -i stopped"); + $webserver->succeed("journalctl -u nginx | grep -q -i reloaded"); + }; + + subtest "restart when nginx package changes", sub { + $webserver->succeed("${reloadRestartSystem}/bin/switch-to-configuration test >&2"); + $webserver->waitForUnit("nginx"); + $webserver->succeed("journalctl -u nginx | grep -q -i stopped"); + }; ''; }) diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix index 19bde9babad5..ae44aec7944f 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php-pcre.nix @@ -8,30 +8,25 @@ import ./make-test.nix ({ ...}: { services.httpd = { enable = true; adminAddr = "please@dont.contact"; - extraSubservices = lib.singleton { - function = f: { - enablePHP = true; - phpOptions = "pcre.jit = true"; + enablePHP = true; + phpOptions = "pcre.jit = true"; + extraConfig = + let + testRoot = pkgs.writeText "index.php" + '' + <?php + preg_match('/(${testString})/', '${testString}', $result); + var_dump($result); + ?> + ''; + in + '' + Alias / ${testRoot}/ - extraConfig = - let - testRoot = pkgs.writeText "index.php" - '' - <?php - preg_match('/(${testString})/', '${testString}', $result); - var_dump($result); - ?> - ''; - in - '' - Alias / ${testRoot}/ - - <Directory ${testRoot}> - Require all granted - </Directory> - ''; - }; - }; + <Directory ${testRoot}> + Require all granted + </Directory> + ''; }; }; testScript = { ... }: diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix new file mode 100644 index 000000000000..791b041ba95b --- /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 e8702c1ffbf1..74583ae55623 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/prosody.nix b/nixos/tests/prosody.nix deleted file mode 100644 index a39bae7898dc..000000000000 --- a/nixos/tests/prosody.nix +++ /dev/null @@ -1,38 +0,0 @@ -import ./make-test.nix { - name = "prosody"; - - machine = { pkgs, ... }: { - services.prosody = { - enable = true; - # TODO: use a self-signed certificate - c2sRequireEncryption = false; - extraConfig = '' - storage = "sql" - ''; - virtualHosts.test = { - domain = "example.com"; - enabled = true; - }; - }; - environment.systemPackages = [ - (pkgs.callPackage ./xmpp-sendmessage.nix {}) - ]; - }; - - testScript = '' - $machine->waitForUnit('prosody.service'); - $machine->succeed('prosodyctl status') =~ /Prosody is running/; - - # set password to 'nothunter2' (it's asked twice) - $machine->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com'); - # set password to 'y' - $machine->succeed('yes | prosodyctl adduser azurediamond@example.com'); - # correct password to 'hunter2' - $machine->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com'); - - $machine->succeed("send-message"); - - $machine->succeed('prosodyctl deluser cthon98@example.com'); - $machine->succeed('prosodyctl deluser azurediamond@example.com'); - ''; -} diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix deleted file mode 100644 index e7b99b10602a..000000000000 --- a/nixos/tests/subversion.nix +++ /dev/null @@ -1,121 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : - -let - - # Build some packages with coverage instrumentation. - overrides = pkgs: - with pkgs.stdenvAdapters; - let - do = pkg: pkg.override (args: { - stdenv = addCoverageInstrumentation args.stdenv; - }); - in - rec { - apr = do pkgs.apr; - aprutil = do pkgs.aprutil; - apacheHttpd = do pkgs.apacheHttpd; - mod_python = do pkgs.mod_python; - subversion = do pkgs.subversion; - - # To build the kernel with coverage instrumentation, we need a - # special patch to make coverage data available under /proc. - linux = pkgs.linux.override (orig: { - stdenv = overrideInStdenv pkgs.stdenv [ pkgs.keepBuildTree ]; - extraConfig = - '' - GCOV_KERNEL y - GCOV_PROFILE_ALL y - ''; - }); - }; - -in - -{ - name = "subversion"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco ]; - }; - - nodes = - { webserver = - { ... }: - - { - services.httpd.enable = true; - services.httpd.adminAddr = "e.dolstra@tudelft.nl"; - services.httpd.extraSubservices = - [ { function = import <services/subversion>; - urlPrefix = ""; - dataDir = "/data/subversion"; - userCreationDomain = "192.168.0.0/16"; - } - ]; - nixpkgs.config.packageOverrides = overrides; - }; - - client = - { pkgs, ... }: - - { - environment.systemPackages = [ pkgs.subversion ]; - nixpkgs.config.packageOverrides = overrides; - }; - - }; - - testScript = - '' - startAll; - - $webserver->waitForOpenPort(80); - - print STDERR $client->succeed("svn --version"); - - print STDERR $client->succeed("curl --fail http://webserver/"); - - # Create a new user through the web interface. - $client->succeed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser"); - - # Let Alice create a new repository. - $client->succeed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create"); - - $client->succeed("curl --fail http://webserver/") =~ /alice/ or die; - - # Let Alice do a checkout. - my $svnFlags = "--non-interactive --username alice --password foobar"; - $client->succeed("svn co $svnFlags http://webserver/repos/xyzzy wc"); - $client->succeed("echo hello > wc/world"); - $client->succeed("svn add wc/world"); - $client->succeed("svn ci $svnFlags -m 'Added world.' wc/world"); - - # Create a new user on the server through the create-user.pl script. - $webserver->execute("svn-server-create-user.pl bob bob\@example.org Bob"); - $webserver->succeed("svn-server-resetpw.pl bob fnord"); - $client->succeed("curl --fail http://webserver/") =~ /bob/ or die; - - # Bob should not have access to the repo. - my $svnFlagsBob = "--non-interactive --username bob --password fnord"; - $client->fail("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2"); - - # Bob should not be able change the ACLs of the repo. - # !!! Repoman should really return a 403 here. - $client->succeed("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy") - =~ /not authorised/ or die; - - # Give Bob access. - $client->succeed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy"); - - # So now his checkout should succeed. - $client->succeed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2"); - - # Test ViewVC and WebSVN - $client->succeed("curl --fail -u alice:foobar http://webserver/viewvc/xyzzy"); - $client->succeed("curl --fail -u alice:foobar http://webserver/websvn/xyzzy"); - $client->succeed("curl --fail -u alice:foobar http://webserver/repos-xml/xyzzy"); - - # Stop Apache to gather all the coverage data. - $webserver->stopJob("httpd"); - ''; - -}) diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 811a466ff941..0de76b688bdc 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-networkd-wireguard.nix b/nixos/tests/systemd-networkd-wireguard.nix new file mode 100644 index 000000000000..f1ce1e791ce3 --- /dev/null +++ b/nixos/tests/systemd-networkd-wireguard.nix @@ -0,0 +1,80 @@ +let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...}: { + imports = [ common/user-account.nix ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking.useNetworkd = true; + networking.firewall.enable = false; + virtualisation.vlans = [ 1 ]; + environment.systemPackages = with pkgs; [ wireguard-tools ]; + boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; + systemd.network = { + enable = true; + netdevs = { + "90-wg0" = { + netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; + wireguardConfig = { + PrivateKeyFile = privkpath ; + ListenPort = 51820; + FwMark = 42; + }; + wireguardPeers = [ {wireguardPeerConfig={ + Endpoint = "192.168.1.${peerId}:51820"; + PublicKey = pubk; + PresharedKeyFile = pkgs.writeText "psk.key" "yTL3sCOL33Wzi6yCnf9uZQl/Z8laSE+zwpqOHC4HhFU="; + AllowedIPs = [ "10.0.0.${peerId}/32" ]; + PersistentKeepalive = 15; + };}]; + }; + }; + networks = { + "99-nope" = { + matchConfig.Name = "eth*"; + linkConfig.Unmanaged = true; + }; + "90-wg0" = { + matchConfig = { Name = "wg0"; }; + address = [ "10.0.0.${nodeId}/32" ]; + routes = [ + { routeConfig = { Gateway = "10.0.0.${nodeId}"; Destination = "10.0.0.0/24"; }; } + ]; + }; + "90-eth1" = { + matchConfig = { Name = "eth1"; }; + address = [ "192.168.1.${nodeId}/24" ]; + }; + }; + }; + }; +in import ./make-test.nix ({pkgs, ... }: { + name = "networkd-wireguard"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ninjatrappeur ]; + }; + nodes = { + node1 = { pkgs, ... }@attrs: + let localConf = { + privkpath = pkgs.writeText "priv.key" "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00="; + pubk = "iRxpqj42nnY0Qz8MAQbSm7bXxXP5hkPqWYIULmvW+EE="; + nodeId = "1"; + peerId = "2"; + }; + in generateNodeConf (attrs // localConf); + + node2 = { pkgs, ... }@attrs: + let localConf = { + privkpath = pkgs.writeText "priv.key" "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k="; + pubk = "27s0OvaBBdHoJYkH9osZpjpgSOVNw+RaKfboT/Sfq0g="; + nodeId = "2"; + peerId = "1"; + }; + in generateNodeConf (attrs // localConf); + }; +testScript = '' + startAll; + $node1->waitForUnit('systemd-networkd-wait-online.service'); + $node2->waitForUnit('systemd-networkd-wait-online.service'); + $node1->succeed('ping -c 5 10.0.0.2'); + $node2->succeed('ping -c 5 10.0.0.1'); + # Is the fwmark set? + $node2->succeed('wg | grep -q 42'); +''; +}) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 4d470126abee..1c201e3b5dcc 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,24 @@ 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"'); }; + + subtest "systemd-shutdown works", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + $machine->succeed('test -e /tmp/shared/shutdown-test'); + }; + + # Test settings from /etc/sysctl.d/50-default.conf are applied + subtest "systemd sysctl settings are applied", sub { + $machine->waitForUnit('multi-user.target'); + $machine->succeed('sysctl net.core.default_qdisc | grep -q "fq_codel"'); + }; + + # Test cgroup accounting is enabled + subtest "systemd cgroup accounting is enabled", sub { + $machine->waitForUnit('multi-user.target'); + $machine->succeed('systemctl show testservice1.service -p IOAccounting | grep -q "yes"'); + $machine->succeed('systemctl status testservice1.service | grep -q "CPU:"'); + }; ''; -} +}) diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix new file mode 100644 index 000000000000..1c85bf539345 --- /dev/null +++ b/nixos/tests/trezord.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "trezord"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + machine = { ... }: { + services.trezord.enable = true; + services.trezord.emulator.enable = true; + }; + }; + + testScript = '' + startAll; + $machine->waitForUnit("trezord.service"); + $machine->waitForOpenPort(21325); + $machine->waitUntilSucceeds("curl -L http://localhost:21325/status/ | grep Version"); + ''; +}) diff --git a/nixos/tests/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 0691dfe780d2..196a04aca300 100644 --- a/nixos/tests/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: { +import ../make-test.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ajs124 ]; @@ -45,8 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: { ip: "127.0.0.1" module: ejabberd_service access: local - shaper_rule: fast - ip: "127.0.0.1" + shaper: fast ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text ## password storage (see auth_password_format option). @@ -181,7 +180,6 @@ import ./make-test.nix ({ pkgs, ... }: { mod_client_state: {} mod_configure: {} # requires mod_adhoc ## mod_delegation: {} # for xep0356 - mod_echo: {} #mod_irc: # host: "irc.@HOST@" # default_encoding: "utf-8" diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix new file mode 100644 index 000000000000..62b4a17421e5 --- /dev/null +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -0,0 +1,77 @@ +import ../make-test.nix { + name = "prosody-mysql"; + + nodes = { + client = { nodes, pkgs, ... }: { + environment.systemPackages = [ + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + ]; + }; + server = { config, pkgs, ... }: { + nixpkgs.overlays = [ + (self: super: { + prosody = super.prosody.override { + withDBI = true; + withExtraLibs = [ pkgs.luaPackages.luadbi-mysql ]; + }; + }) + ]; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} example.com + ''; + networking.firewall.enable = false; + services.prosody = { + enable = true; + # TODO: use a self-signed certificate + c2sRequireEncryption = false; + extraConfig = '' + storage = "sql" + sql = { + driver = "MySQL"; + database = "prosody"; + host = "mysql"; + port = 3306; + username = "prosody"; + password = "password123"; + }; + ''; + virtualHosts.test = { + domain = "example.com"; + enabled = true; + }; + }; + }; + mysql = { config, pkgs, ... }: { + networking.firewall.enable = false; + services.mysql = { + enable = true; + initialScript = pkgs.writeText "mysql_init.sql" '' + CREATE DATABASE prosody; + CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123'; + GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server'; + FLUSH PRIVILEGES; + ''; + package = pkgs.mariadb; + }; + }; + }; + + testScript = { nodes, ... }: '' + $mysql->waitForUnit('mysql.service'); + $server->waitForUnit('prosody.service'); + $server->succeed('prosodyctl status') =~ /Prosody is running/; + + # set password to 'nothunter2' (it's asked twice) + $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com'); + # set password to 'y' + $server->succeed('yes | prosodyctl adduser azurediamond@example.com'); + # correct password to 'hunter2' + $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com'); + + $client->succeed("send-message"); + + $server->succeed('prosodyctl deluser cthon98@example.com'); + $server->succeed('prosodyctl deluser azurediamond@example.com'); + ''; +} + diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix new file mode 100644 index 000000000000..8331c7b6d331 --- /dev/null +++ b/nixos/tests/xmpp/prosody.nix @@ -0,0 +1,46 @@ +import ../make-test.nix { + name = "prosody"; + + nodes = { + client = { nodes, pkgs, ... }: { + environment.systemPackages = [ + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + ]; + }; + server = { config, pkgs, ... }: { + networking.extraHosts = '' + ${config.networking.primaryIPAddress} example.com + ''; + networking.firewall.enable = false; + services.prosody = { + enable = true; + # TODO: use a self-signed certificate + c2sRequireEncryption = false; + extraConfig = '' + storage = "sql" + ''; + virtualHosts.test = { + domain = "example.com"; + enabled = true; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + $server->waitForUnit('prosody.service'); + $server->succeed('prosodyctl status') =~ /Prosody is running/; + + # set password to 'nothunter2' (it's asked twice) + $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com'); + # set password to 'y' + $server->succeed('yes | prosodyctl adduser azurediamond@example.com'); + # correct password to 'hunter2' + $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com'); + + $client->succeed("send-message"); + + $server->succeed('prosodyctl deluser cthon98@example.com'); + $server->succeed('prosodyctl deluser azurediamond@example.com'); + ''; +} diff --git a/nixos/tests/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 2a075a018134..2a075a018134 100644 --- a/nixos/tests/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index ad48ea2a6257..ddce5c3f7150 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; }; - patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" ]; + ++ optionals withGui [ "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch deleted file mode 100644 index 1b74a48a84aa..000000000000 --- a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/txmempool.h -+++ b/src/txmempool.h -@@ -204,7 +204,7 @@ - class CompareTxMemPoolEntryByDescendantScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - bool fUseADescendants = UseDescendantScore(a); - bool fUseBDescendants = UseDescendantScore(b); -@@ -226,7 +226,7 @@ - } - - // Calculate which score to use for an entry (avoiding division). -- bool UseDescendantScore(const CTxMemPoolEntry &a) -+ bool UseDescendantScore(const CTxMemPoolEntry &a) const - { - double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); - double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); -@@ -241,7 +241,7 @@ - class CompareTxMemPoolEntryByScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); - double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); -@@ -255,7 +255,7 @@ - class CompareTxMemPoolEntryByEntryTime - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - return a.GetTime() < b.GetTime(); - } diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 13ec55bb589d..a75b20b39109 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,34 +1,32 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui +, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3 +, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: with stdenv.lib; stdenv.mkDerivation rec { - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.0.3.0"; + version = "1.6.0.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; - rev = "v${version}"; - sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx"; + rev = "bucash${version}"; + sha256 = "0f0mnal4jf8xdj7w5m4rdlcqkrkbpxi88c006m5k45lmjmj141zr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] + ++ optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] + ++ optionals withGui [ qtbase qttools qrencode ] ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; - patches = [ - ./bitcoin-unlimited-const-comparators.patch - ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix deleted file mode 100644 index 499bc4be4c83..000000000000 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent -, withGui -, Foundation, ApplicationServices, AppKit }: - -with stdenv.lib; -stdenv.mkDerivation rec{ - - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11H"; - - src = fetchFromGitHub { - owner = "bitcoinxt"; - repo = "bitcoinxt"; - rev = "v${version}"; - sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib libevent - miniupnpc utillinux protobuf curl ] - ++ optionals withGui [ qt4 qrencode ] - ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; - - configureFlags = [ - "--with-boost-libdir=${boost.out}/lib" - "--with-libcurl-headers=${curl.dev}/include" - ] ++ optionals withGui [ "--with-gui=qt4" ]; - - enableParallelBuilding = true; - - meta = { - description = "Peer-to-peer electronic cash system (XT client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - Bitcoin XT is an implementation of a Bitcoin full node, based upon the - source code of Bitcoin Core. It is built by taking the latest stable - Core release, applying a series of patches, and then doing deterministic - builds so anyone can check the downloads correspond to the source code. - ''; - homepage = https://bitcoinxt.software/; - maintainers = with maintainers; [ jefdaj ]; - license = licenses.mit; - broken = stdenv.isDarwin; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index ce0a31dfe68b..b1d84f91251e 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/default.nix b/pkgs/applications/altcoins/default.nix index 5293c1eefa36..5b5bfb897cf3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: +{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: rec { @@ -11,7 +11,7 @@ rec { bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt5.callPackage ./bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -23,15 +23,6 @@ rec { bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - boost = boost165; withGui = true; - }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - boost = boost165; withGui = false; - }; - btc1 = callPackage ./btc1.nix { inherit (darwin.apple_sdk.frameworks) AppKit; boost = boost165; @@ -69,9 +60,6 @@ rec { masari = callPackage ./masari.nix { boost = boost165; }; - memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; - memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; - mist = callPackage ./mist.nix { }; namecoin = callPackage ./namecoin.nix { withGui = true; }; @@ -90,7 +78,6 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = openssl_1_1; }; parity = callPackage ./parity { }; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 0452f4013345..e5f149a0efe7 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -1,24 +1,24 @@ { stdenv , fetchFromGitHub , pkgconfig, autoreconfHook -, db5, openssl, boost, zlib, miniupnpc +, db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, utillinux, qt4, qrencode , withGui }: 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/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index 78ce074eafd3..664159be2013 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -34,5 +34,8 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; + + # upstream doesn't support newer openssl versions, use 1.0.1 for testing + broken = true; }; } diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 9ef348abc50e..740ecfa228fd 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/jormungandr/default.nix b/pkgs/applications/altcoins/jormungandr/default.nix index d58e05184b63..8c276d6bb805 100644 --- a/pkgs/applications/altcoins/jormungandr/default.nix +++ b/pkgs/applications/altcoins/jormungandr/default.nix @@ -1,27 +1,44 @@ { stdenv +, lib , fetchgit , rustPlatform , openssl , pkgconfig , protobuf -, rustup +, darwin }: rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.3.1"; + version = "0.3.3"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "0ys8sw73c7binxnl79dqi7sxva62bgifbhgyzvvjvmjjdxgq4kfp"; + sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j"; fetchSubmodules = true; }; - cargoSha256 = "0fphjzz78ym15qbka01idnq6vkyf4asrnhrhvxngwc3bifmnj937"; + cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal"; - nativeBuildInputs = [ pkgconfig protobuf rustup ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ pkgconfig protobuf ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + patchPhase = '' + sed -i "s~SCRIPTPATH=.*~SCRIPTPATH=$out/templates/~g" scripts/bootstrap + ''; + + installPhase = '' + install -d $out/bin $out/templates + install -m755 target/*/release/jormungandr $out/bin/ + install -m755 target/*/release/jcli $out/bin/ + install -m755 scripts/send-transaction $out/templates + install -m755 scripts/jcli-helpers $out/bin/ + install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap + install -m644 scripts/faucet-send-money.shtempl $out/templates/ + install -m644 scripts/create-account-and-delegate.shtempl $out/templates/ + install -m644 scripts/faucet-send-certificate.shtempl $out/templates/ + ''; PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix deleted file mode 100644 index 944c82250d47..000000000000 --- a/pkgs/applications/altcoins/memorycoin.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode -, withGui }: - -with stdenv.lib; -stdenv.mkDerivation rec{ - - name = "memorycoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.8.5"; - - src = fetchurl { - url = "https://github.com/memorycoin/memorycoin/archive/v${version}.tar.gz"; - sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl db48 boost zlib utillinux protobuf ] - ++ optionals withGui [ qt4 qmake4Hook qrencode ]; - - qmakeFlags = ["USE_UPNP=-"]; - makeFlags = ["USE_UPNP=-"]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - preBuild = "unset AR;" - + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); - - installPhase = - if withGui - then "install -D bitcoin-qt $out/bin/memorycoin-qt" - else "install -D bitcoind $out/bin/memorycoind"; - - # `make build/version.o`: - # make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop. - enableParallelBuilding = false; - - meta = { - description = "Peer-to-peer, CPU-based electronic cash system"; - longDescription= '' - Memorycoin is a cryptocurrency that aims to empower the - economically and financially marginalized. It allows individuals - to participate in the internet economy even when they live in - countries where credit card companies and PayPal(R) refuse to - operate. Individuals can store and transfer wealth with just a - memorized pass phrase. - - Memorycoin is based on the Bitcoin code, but with some key - differences. - ''; - homepage = http://www.bitcoin.org/; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index cce0b1c64883..4b6a88fd410a 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.1"; + sha256 = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh"; + cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017"; 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 57b1faf71f70..873f83190fde 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.6"; + sha256 = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy"; + cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x"; 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 011a44fe1709..79831f3304df 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/altcoins/pivx.nix b/pkgs/applications/altcoins/pivx.nix index 995b8deccd95..e2cf8aa182f3 100644 --- a/pkgs/applications/altcoins/pivx.nix +++ b/pkgs/applications/altcoins/pivx.nix @@ -50,5 +50,12 @@ stdenv.mkDerivation rec { homepage = https://www.dash.org; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; + + # upstream doesn't support newer openssl versions + # https://github.com/PIVX-Project/PIVX/issues/748 + # "Your system is most probably using openssl 1.1 which is not the + # officialy supported version. Either use 1.0.1 or run again configure + # with the given option." + broken = true; }; } diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/altcoins/wasabiwallet/default.nix index 9eef471adad2..7185b3510601 100644 --- a/pkgs/applications/altcoins/wasabiwallet/default.nix +++ b/pkgs/applications/altcoins/wasabiwallet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, openssl_1_1, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: +{ stdenv, fetchurl, makeDesktopItem, openssl, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: stdenv.mkDerivation rec { pname = "wasabiwallet"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cd $out/opt/${pname} for i in $(find . -type f -name '*.so') wassabee do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl_1_1 stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i done patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee ln -s $out/opt/${pname}/wassabee $out/bin/${pname} diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index a61f7dc0a905..680694aa403d 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/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 099e4428016e..07d5684e98e7 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://gmpclient.org; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 464552584a45..e4d508b2a1f5 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 6d186cccde34..bc7c2ff9a24f 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ 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"; }; buildInputs = [ diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index c1379c57fe5b..c574c862f521 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec { SoundCloud, Google Play Music, and more ''; license = licenses.asl20; - maintainers = with maintainers; [ rickynils fpletz ]; + maintainers = [ maintainers.fpletz ]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index 3754bf763b20..d41fb12ae8d3 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/martijnboland/moped; description = "A web client for Mopidy"; license = licenses.mit; - maintainers = [ maintainers.rickynils ]; + maintainers = []; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 9a6e1bef994c..483852455aa7 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://www.mopidy.com/; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; - maintainers = [ maintainers.rickynils ]; + maintainers = []; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 3d40e4c39f4d..c9a1e9bea808 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }: let desktopItem = makeDesktopItem rec { @@ -8,7 +8,7 @@ let genericName = "Munt synthesiser"; categories = "Audio;AudioVideo;"; }; -in stdenv.mkDerivation rec { +in mkDerivation rec { version = "2.3.0"; pname = "munt"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9407a1c26882..a595bb069005 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/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index e503793ab39c..b424bce2433b 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw }: +{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw, mkDerivation }: -stdenv.mkDerivation rec { - name = "padthv1-${version}"; - version = "0.9.8"; +mkDerivation rec { + pname = "padthv1"; + version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji"; + url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; + sha256 = "0axansxwa3vfc1n6a7jbaqyz6wmsffi37i4ggsl08gmqywz255xb"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 322a4e238461..7c4520967850 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/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 6ad931d4867a..9c59b5466c74 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,14 @@ -{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: +{ fetchurl +, stdenv +, meson +, ninja +, gettext +, pkgconfig +, pulseaudioFull +, glibmm +, gtkmm3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { name = "paprefs-1.1"; @@ -8,9 +18,19 @@ stdenv.mkDerivation rec { sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; }; - nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; - - buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + pulseaudioFull + glibmm + gtkmm3 + ]; meta = with stdenv.lib; { description = "PulseAudio Preferences"; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index ce2979a5e530..0cff6c419a08 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0a4c9bebde7c..83fb17189e1d 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.5"; + version = "4.6.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "11ihr29szpqlk9wkscns00ijihyvn5659bj1p7r1ixwgfv708apq"; + sha256 = "15w1kc1b0i8wrkrbfzrvcscanxvcsz336bfyi1awb1lbclvd3sf4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 2e4658a68c98..6530d737c33d 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.980"; + version = "5.981"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0ij5cx43gf05q0d57p4slsp7wkq2cdb3ymh2n5iqgqjl9rf26h1q"; + sha256 = "0v4347i0pgzlinas4431dfbv1h9fk6vihvahh73valxvhydyxr8q"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index a8896f3945b1..32e241cf557b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.5"; + name = "snd-19.6"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y"; + sha256 = "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 2e55306029f0..9a27ed302e6c 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -28,13 +28,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { name = "VCV-Rack-${version}"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2"; + sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx"; fetchSubmodules = true; }; @@ -78,7 +78,7 @@ with stdenv.lib; stdenv.mkDerivation rec { # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a # no-derivatives clause license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ]; - maintainers = with maintainers; [ moredread ]; + maintainers = with maintainers; [ moredread nathyong ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 7e43225eedc1..ece2f5677912 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/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4f8e520cb9f2..2ff51db54041 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext -, gnome3, libnotify, itstool, glib, gtk3, libxml2 +, gnome3, libnotify, itstool, glib, gtk3, libxml2, gnome-online-accounts , coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnotify libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror + at-spi2-core dbus gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 794a881090cb..7f57d24b263f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,19 +8,15 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.4.2.0"; # "Android Studio 3.4.2" - build = "183.5692245"; - sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm"; - }; - betaVersion = { - version = "3.5.0.19"; # "Android Studio 3.5 RC 2" - build = "191.5763348"; - sha256Hash = "0z7mjpk0cqwk4ysd3cdsahlg70ax90353qvvag9wgyzl2x2sr6d2"; + version = "3.5.0.21"; # "Android Studio 3.5" + build = "191.5791312"; + sha256Hash = "0vvk2vhklxg9wfi4lv4sahs5ahhb1mki1msy3yixmr56vipgv52p"; }; + betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" - build = "191.5618338"; - sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; + version = "3.6.0.7"; # "Android Studio 3.6 Canary 7" + build = "192.5807797"; + sha256Hash = "1l47miiyd8z7v0hbvda06953pp9ilyrsma83gxqx35ghnc0n7g81"; }; 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 7af3742349a6..7db4d3e947bf 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 000000000000..e5655ca8315d --- /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 000000000000..5e12c4f5c858 --- /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 000000000000..038ff96ad3bd --- /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 7f0a318741fc..31e87df6d85a 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 e7ed5a32b652..5f0c863b5861 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; } + in elpaPackages // { inherit elpaBuild; }); + +in generateElpa { } diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix new file mode 100644 index 000000000000..4c1a0dd2312d --- /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/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 24e541f26952..9574ec43a612 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (import ./libgenerated.nix lib self) melpaDerivation; super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); - generic = import ./melpa-generic.nix; - overrides = rec { shared = { # Expects bash to be at /bin/bash @@ -50,6 +48,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # part of a larger package caml = dontConfigure super.caml; + cmake-mode = super.cmake-mode.overrideAttrs (attrs: { + buildInputs = (attrs.buildInputs or []) ++ [ + external.openssl + ]; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ + external.pkgconfig + ]; + }); + # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; @@ -64,6 +71,23 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; }); + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; + + postBuild = '' + cd source/sqlite + make + cd - + ''; + + postInstall = '' + install -m=755 -D source/sqlite/emacsql-sqlite \ + $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite + ''; + + stripDebugList = [ "share" ]; + }); + evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -105,20 +129,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header initsplit = markBroken super.initsplit; - irony = super.irony.overrideAttrs(old: { + irony = super.irony.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; preConfigure = '' cd server ''; preBuild = '' make + install -D bin/irony-server $out/bin/irony-server + cd .. ''; - postInstall = '' - mkdir -p $out - mv $out/share/emacs/site-lisp/elpa/*/server/bin $out - rm -rf $out/share/emacs/site-lisp/elpa/*/server - ''; - preCheck = '' + checkPhase = '' cd source/server + make check + cd ../.. ''; dontUseCmakeBuildDir = true; doCheck = true; @@ -215,6 +239,24 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # 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; @@ -232,55 +274,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - 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 = shared.vterm; - zmq = super.zmq.overrideAttrs(old: { stripDebugList = [ "share" ]; preBuild = '' @@ -401,13 +394,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # 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; - }; - }); - orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time @@ -443,6 +429,55 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (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 = diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index d3ad7fa4093c..1f37cf624f9f 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 +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 d0f1ce982ce0..00bcb16b31b4 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/update-elpa b/pkgs/applications/editors/emacs-modes/update-elpa new file mode 100755 index 000000000000..ba2964b2ead0 --- /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-org b/pkgs/applications/editors/emacs-modes/update-org new file mode 100755 index 000000000000..2119a1672287 --- /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/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index ce553fa8b288..b08e3b5fa23c 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }: +{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: -stdenv.mkDerivation rec { - name = "focuswriter-${version}"; - version = "1.7.2"; +mkDerivation rec { + pname = "focuswriter"; + version = "1.7.3"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1qsfcrscm3s0h7wcl6qn8zi0irr70zdacjxsdk73kpk1dhl2j85k"; + sha256 = "155wf7z1g2yx6fb41w29kcb0m2rhnk9ci5yw882yy86s4x20b1jq"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 844999b03663..92355552fcec 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.1.4"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1ccb7g5nzipfmvx6ycg9cn3s7bykpwws62239hg0frlb6xx9y969"; /* updated by script */ + sha256 = "13y2c3vzlklwz9cd7anpfdc3dqwh714xivm1g59s6p4x9sy172lp"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0va5dcvjxq7mlkz0di5zl1ra5gv6cls3wy40fvkpm2vlirg0m31s"; /* updated by script */ + sha256 = "1babydzmgaas1rxjv11yhgbp0l5scsdwy17l9927qwlbgccf24mb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0nw9s4vc7dbj2daxi88m1hqyl3rbzvahbw4mhp409ngac3l2pqmh"; /* updated by script */ + sha256 = "16wmsf6c8x95d050grqgv6aaxlkc6pqhbqzlz6fzsngjnbkn64yj"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "02ddxqwflqrr5xf27s1gmaz7ai400cxzlbiz2wrs9vqsdcpj9jbr"; /* updated by script */ + sha256 = "1pbqnyqly09m7lw6356dydbvppq4i94rsk7c3y40mrc285qzj413"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0qhj3wai0jb3bg8ddck27ivx2q60xsbk8pj6ryqp5dh75ja4zx1s"; /* updated by script */ + sha256 = "0mslmhakjjgwj76hbfw9dcidic6zprjfjryggic7dqywl7vjwc95"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "04nrdgnyxywy0yfari26ghc371yni1rx3h0pmc4fw02ibbqx1f1y"; /* updated by script */ + sha256 = "1m198p6586dych6mrgwqxs486qndypsmnikl0rxx45ddrwfjl42g"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0acwfxp0ky3014zcvmlsig1732h87jvmf2wwjankamrk6ynmlvgh"; /* updated by script */ + sha256 = "0a3fi2wjj0166199pyhvvpaih9nx0xr6q7zf7jfj8i7khpkdk8i5"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0948jlpfz5d4k12mn2xrl8z5kc44a3986kl5znvzr5b8h65xw8l3"; /* updated by script */ + sha256 = "03i7qi0kcnx0irih468xaz7hzicaa5yh399r676drs22ak23qwrq"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0b0p18pcq4ml8nds4460a1ml8qjsq38kxwdrsh2ca5s194cbaapq"; /* updated by script */ + sha256 = "1p0mlch7qvkvgxjscx6rl65v6h8g6fwk8rcb8s27qkcjm0d78ic8"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.2"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1f4mdarmh7m9jq432d0s9jds9288g0zgpxnlpmx12i26vvq8kykd"; /* updated by script */ + sha256 = "0l0kwc1mih55px8j6bvp1g3pxrv0scd9vpydwvkaqmq5x0r1n3jf"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index e6f95f74011f..54e99b35b5eb 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.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf"; + sha256 = "07j06k2f5rbwgknwcbj70wwn831a54is4kiwlpfd4la2c05slmy5"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 099153995c9d..8763905fbfd8 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.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg"; + sha256 = "1dazd77bkjs11h318q4ia6ijk0d0s04v0zm8lwqlgcj271sqrfqb"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 989432fc65df..be80587ef3a6 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.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff"; + sha256 = "12iqgmhaxm9q085h50dzkswcmsp02jzm4jjgrhkx4jlzmf4w4jb8"; }; 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 6bbdaf77a69b..44f8c243bd6d 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.4"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; + sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index efece505ab94..92ff745d1a6a 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.9"; + version = "2.2.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "1im7jq7vi2sbdrh95kbydbbfwdll6z9zh1w1vzh7ny1sigfphkpm"; + sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index aa1e2a6b5bd7..ec799c0fa49c 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 fa547875a175..3d215b288564 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 ab79c3e780b2..efda2c583604 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 f5c62b6f36ed..49ebe579ed4a 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.3"; + version = "1.9.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "09acknajbkfpw8f5pay2qj69dzhwbiplsvpp1hy9ma6msmxkr6cm"; + sha256 = "119ri6lkzqapi5k0v818qkhg1916jj9s6bh72yqvc2wmyjnn2dbw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 27c956dcd14e..f90e17a6065b 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 871ca1c671dc..90d89ce7799f 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 d20f413700e8..2d52aedc831c 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/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4fa93d78235e..b0b80a4ec001 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tiled"; version = "1.2.4"; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index ec2d75ffaf66..369184a35e23 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 7e4035ac336a..369ed7728909 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" = "17g7mra9a52qlrrj77cw16vqvc7fsvbhc03wrl4iq1afzxsyqi22"; - "x86_64-darwin" = "1is04anvhl2b354h5w7i5qi7ixhzna277f7xdy4qj9gjby6zydc6"; + "x86_64-linux" = "1np7j6xv0bxmq7762ml0h6pib8963s2vdmyvigi0fz2iik92zv8z"; + "x86_64-darwin" = "0f87cv1sbcvix9f7hhw0vsypp0bf627xdyh4bmh0g41k17ls8wvc"; }.${system}; in callPackage ./generic.nix rec { - version = "1.37.0"; + version = "1.37.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fbcc6d0c7374..49472fde464b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1ay4zvkbln2wf2j1d71mn13b6p2fqvzgz45mzrgaqwsszhbg4xzp"; - "x86_64-darwin" = "17r9krb1qd92ybx078hkw9zlyym6kbnmbl91vjdilsq77bkf9jmw"; + "x86_64-linux" = "0j6188gm66bwffyg0vn3ak8242vs2vb2cw92b9wfkiml6sfg555n"; + "x86_64-darwin" = "0iblg0hn6jdds7d2hzp0icb5yh6hhw3fd5g4iim64ibi7lpwj2cj"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.1"; + version = "1.37.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 2bd2207a97a4..003a17aa3d44 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-53"; - sha256 = "0cgfsng2d14891fqwf7mlclsi576c42v0h5r6i4208bakcr25vzk"; + version = "7.0.8-58"; + sha256 = "0yfw32nydwy7ag7ina1zc6yssa146x4v35hjv6v59bci9mmj9fb1"; patches = []; }; in diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 52fd3cebec26..552ca714476f 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,19 +1,20 @@ { stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 -, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid +, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.9.0"; + version = "3.9.2"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0fk62farnsxz59q82kxagibxmn9p9ckp6ix0wqg297gvasgad31q"; + sha256 = "18yzw7bss1dkmmd8lxr9x8s46qmpnqci202g16zrp6j9jdj094d3"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib + at-spi2-core.out gdk-pixbuf glib gtk3 diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e16ef45fe1eb..a32681c754ca 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = https://www.darktable.org; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; + maintainers = with maintainers; [ goibhniu flosse mrVanDalo ]; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 02af754a72c6..3f922530e73e 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/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 3eff3360a6c4..fbc6cd2fafef 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A light-weight image viewer"; homepage = "https://feh.finalrewind.org/"; license = licenses.mit; - maintainers = [ maintainers.viric maintainers.willibutz ]; + maintainers = with maintainers; [ viric willibutz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 1787b1d9e7fc..008bfdf881e5 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -157,17 +157,17 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { ufraw = pkgs.ufraw.gimpPlugin; gimplensfun = pluginDerivation rec { - version = "0.2.4"; + version = "unstable-2018-10-21"; name = "gimplensfun-${version}"; src = fetchFromGitHub { owner = "seebk"; repo = "GIMP-Lensfun"; - rev = version; - sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz"; + rev = "1c5a5c1534b5faf098b7441f8840d22835592f17"; + sha256 = "1jj3n7spkjc63aipwdqsvq9gi07w13bb1v8iqzvxwzld2kxa3c8w"; }; - buildInputs = with pkgs; [ lensfun exiv2 ]; + buildInputs = with pkgs; [ lensfun gexiv2 ]; installPhase = " installPlugins gimp-lensfun diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix new file mode 100644 index 000000000000..f591dd5a60dd --- /dev/null +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -0,0 +1,125 @@ +{ stdenv +, fetchurl +, at-spi2-core +, babl +, dbus +, desktop-file-utils +, dleyna-renderer +, gdk-pixbuf +, gegl +, geocode-glib +, gettext +, gexiv2 +, gfbgraph +, glib +, gnome-online-accounts +, gnome3 +, gobject-introspection +, grilo +, grilo-plugins +, gsettings-desktop-schemas +, gtk3 +, itstool +, libdazzle +, libgdata +, libxml2 +, meson +, ninja +, nixosTests +, pkgconfig +, python3 +, tracker +, tracker-miners +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-photos"; + version = "3.32.1"; + + outputs = [ "out" "installedTests" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn"; + }; + + patches = [ + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + gobject-introspection # for setup hook + glib # for setup hook + itstool + libxml2 + meson + ninja + pkgconfig + (python3.withPackages (pkgs: with pkgs; [ + dogtail + pygobject3 + pyatspi + ])) + wrapGAppsHook + ]; + + buildInputs = [ + babl + dbus + dleyna-renderer + gdk-pixbuf + gegl + geocode-glib + gexiv2 + gfbgraph + glib + gnome-online-accounts + gnome3.adwaita-icon-theme + grilo + grilo-plugins + gsettings-desktop-schemas + gtk3 + libdazzle + libgdata + tracker + tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + + at-spi2-core # for tests + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + patchShebangs tests/basic.py + ''; + + postFixup = '' + wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}" + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + + tests = { + installed-tests = nixosTests.gnome-photos; + }; + }; + + meta = with stdenv.lib; { + description = "Access, organize and share your photos"; + homepage = https://wiki.gnome.org/Apps/Photos; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch new file mode 100644 index 000000000000..218108328dd8 --- /dev/null +++ b/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch @@ -0,0 +1,23 @@ +diff --git a/meson.build b/meson.build +index dee932dc..f8851913 100644 +--- a/meson.build ++++ b/meson.build +@@ -16,8 +16,8 @@ + photos_docdir = join_paths(photos_datadir, 'doc', meson.project_name()) + photos_libdir = join_paths(photos_prefix, get_option('libdir'), meson.project_name()) + +-photos_installed_test_metadir = join_paths(photos_datadir, 'installed-tests', meson.project_name()) +-photos_installed_test_execdir = join_paths(photos_libexecdir, 'installed-tests', meson.project_name()) ++photos_installed_test_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) ++photos_installed_test_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) + + photos_namespace = 'org.gnome.Photos' + +diff --git a/meson_options.txt b/meson_options.txt +index f34b5cc0..8e09970b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,2 +1,3 @@ + option('dogtail', type: 'boolean', value: true, description: 'test using dogtail') + option('installed_tests', type: 'boolean', value: false, description: 'Enable installation of some test cases') ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 7ecee8d6d631..9af1a0fc9141 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, perlPackages, wrapGAppsHook, + # libs librsvg, sane-backends, sane-frontends, - imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, - xvfb_run, hicolor-icon-theme, liberation_ttf, file, pdftk }: + # runtime dependencies + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + # test dependencies + xvfb_run, liberation_ttf, file, tesseract }: with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.3.0"; + version = "2.5.5"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0mcsmly0j9pmyzh6py8r6sfa30hc6gv300hqq3dxj4hv653vhkk9"; + sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -66,7 +69,8 @@ perlPackages.buildPerlPackage rec { --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ - --prefix PATH : "${unpaper}/bin" + --prefix PATH : "${unpaper}/bin" \ + --prefix PATH : "${pdftk}/bin" ''; enableParallelBuilding = true; @@ -76,16 +80,17 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" "man" ]; checkInputs = [ - xvfb_run - hicolor-icon-theme imagemagick libtiff djvulibre poppler_utils ghostscript - file - pdftk unpaper + pdftk + + xvfb_run + file + tesseract # tests are expecting tesseract 3.x precisely ]; checkPhase = '' @@ -97,7 +102,6 @@ perlPackages.buildPerlPackage rec { description = "A GUI to produce PDFs or DjVus from scanned documents"; homepage = http://gscan2pdf.sourceforge.net/; license = licenses.gpl3; - maintainers = [ maintainers.pacien ]; + maintainers = with maintainers; [ pacien ]; }; } - diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 1511901ab916..0efb08741835 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -11,6 +11,7 @@ , pantheon , desktop-file-utils , xorg +, hicolor-icon-theme , wrapGAppsHook }: @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils + hicolor-icon-theme # for setup-hook meson ninja pantheon.vala diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix new file mode 100644 index 000000000000..b86560d1319e --- /dev/null +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchzip +, alsaLib +, glib +, gst_all_1 +, libGLU_combined +, xorg +}: + +stdenv.mkDerivation rec { + pname = "kodelife"; + version = "0.8.3.93"; + + src = fetchzip { + url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip"; + sha256 = "1gidh0745g5mc8h5ypm2wamv1paymnrq3nh3yx1j70jwjg8v2v7g"; + }; + + dontConfigure = true; + dontBuild = true; + dontStrip = true; + dontPatchELF = true; + + installPhase = '' + mkdir -p $out/bin + mv KodeLife $out/bin + ''; + + preFixup = let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib + alsaLib + glib + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libGLU_combined + xorg.libX11 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/bin/KodeLife + ''; + + meta = with stdenv.lib; { + homepage = "https://hexler.net/products/kodelife"; + description = "Real-time GPU shader editor"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index e582b5ee0524..4e61fccaa372 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -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 00b33b652164..7225efadebd9 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 789ee1a6d89f..c1b2beadcd53 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.2"; + version = "0.2.3"; src = fetchFromGitHub { - owner = "hhrutter"; + owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "1knvi0v9nfzw40dayrw5cjidg9h900143v1pi6240yd7r7isx348"; + sha256 = "11q57j3wzmy2glkv53i9n7jkp14x4bqm20f3rqs3gkm4j9bcas4y"; }; modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing/default.nix index 6f90131db12a..9972ea757098 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - version = "3.4"; - name = "processing3-${version}"; + pname = "processing"; + version = "3.5.3"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0265-${version}"; - sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; + rev = "processing-0269-${version}"; + sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "0ai0cr62gc7n6y22ki3qibyj1qnlaxv1miqxmmahfk3hpbyfqz9n"; + sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; } } ./java/reference.zip @@ -39,16 +39,16 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - cp -dpR build/linux/work $out/${name} + cp -dpR build/linux/work $out/${pname} - rmdir $out/${name}/java - ln -s ${jdk} $out/${name}/java + rmdir $out/${pname}/java + ln -s ${jdk} $out/${pname}/java - makeWrapper $out/${name}/processing $out/bin/processing \ + makeWrapper $out/${pname}/processing $out/bin/processing \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + makeWrapper $out/${pname}/processing-java $out/bin/processing-java \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 5991a3351ee1..28d05480dae1 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.16"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; + sha256 = "0ij3li17jcqjx79ldv6zg2ckn8m2l9n4xvvq2x79y4q8yx9fqg85"; }; # 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 index 6fa8efbf68c6..f96b70a77b47 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,12 +6,12 @@ let pname = "runwayml"; - version = "0.8.1"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "0pqnlwk804cly2x9kph39g9ps5dv75ybi2v1fgrvmhk3wbmwmpb0"; + sha256 = "0rg7ipp7kx0l4qgcymfg5d3saz0c6d2j0c6rf28rwqgbm92gbjjq"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 50cd9485a3e8..39b4640dc431 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,38 +1,70 @@ -{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib -, withGimpPlugin ? true, gimp ? null -, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: +{ stdenv +, fetchFromGitHub + +, autoconf +, automake +, autoreconfHook +, bzip2 +, cfitsio +, exiv2 +, gettext +, gimp ? null +, gtk2 +, gtkimageview +, lcms2 +, lensfun +, libjpeg +, libtiff +, perl +, pkgconfig +, zlib + +, withGimpPlugin ? true +}: assert withGimpPlugin -> gimp != null; stdenv.mkDerivation rec { - name = "ufraw-0.22"; + pname = "ufraw"; + version = "unstable-2019-06-12"; - src = fetchurl { - # XXX: These guys appear to mutate uploaded tarballs! - url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; + # The original ufraw repo is unmaintained and broken; + # this is a fork that collects patches + src = fetchFromGitHub { + owner = "sergiomb2"; + repo = "ufraw"; + rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6"; + sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7"; }; outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ]; + buildInputs = [ - gtk2 gtkimageview bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms2 lensfun + bzip2 + cfitsio + exiv2 + gtk2 + gtkimageview + lcms2 + lensfun + libjpeg + libtiff + zlib ] ++ stdenv.lib.optional withGimpPlugin gimp; configureFlags = [ - "--enable-extras" - "--enable-dst-correction" "--enable-contrast" + "--enable-dst-correction" ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; postInstall = stdenv.lib.optionalString withGimpPlugin '' moveToOutput "lib/gimp" "$gimpPlugin" ''; - meta = { - homepage = http://ufraw.sourceforge.net/; + meta = with stdenv.lib; { + homepage = https://github.com/sergiomb2/ufraw; description = "Utility to read and manipulate raw images from digital cameras"; @@ -46,9 +78,9 @@ stdenv.mkDerivation rec { the camera's tone curves. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ + maintainers = with maintainers; [ gloaming ]; + platforms = with platforms; all; }; } diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 5d3564f38e6a..e401a7c0b8e0 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 abcbe4434506..c82b00e66e80 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,10 +48,6 @@ stdenv.mkDerivation rec { odfpy ]); - qtWrapperArgs = [ - "--prefix PATH : ${poppler_utils.out}/bin" - ]; - installPhase = '' runHook preInstall @@ -74,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 --prefix PYTHONPATH : $PYTHONPATH - done - # Replace @out@ by the output path. mkdir -p $out/share/applications/ cp {$calibreDesktopItem,$ebookEditDesktopItem,$ebookViewerDesktopItem}/share/applications/* $out/share/applications/ @@ -91,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 000000000000..43ff1d73f78f --- /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 000000000000..829fd4e12231 --- /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/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 26a297481d04..8d13ac42e1fc 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; license = licenses.mit; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix new file mode 100644 index 000000000000..e93d0ab69a7b --- /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/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index a77f87f6f1f1..2fadc89c48d9 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; homepage = https://njw.me.uk/getxbook/; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index d4ff7269987c..0af84365158e 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,5 +1,6 @@ -{ stdenv, mkDerivation, fetchurl -, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity +{ stdenv, fetchFromGitHub, mkDerivation +, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools +, qtconnectivity, qtcharts , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -15,20 +16,22 @@ let }; in mkDerivation rec { name = "golden-cheetah-${version}"; - version = "3.4"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; - sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf"; + version = "3.5-DEV1903"; + + src = fetchFromGitHub { + owner = "GoldenCheetah"; + repo = "GoldenCheetah"; + rev = "v${version}"; + sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3"; }; + buildInputs = [ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib - qtconnectivity + qtconnectivity qtcharts ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; - NIX_LDFLAGS = [ - "-lz" - ]; + + NIX_LDFLAGS = [ "-lz" ]; qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; @@ -38,6 +41,7 @@ in mkDerivation rec { echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 9a12ba2bfd55..6cd77318754c 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 6de5553ac7cf..f9bdf94db179 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/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index e326e9c10087..6e9296da267b 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.11"; + version = "7.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1b4ky7m990h3rmam9lb1w6vns1mxd8ri6is3a8qgdl8kd6xcl5d7"; + sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix new file mode 100644 index 000000000000..b84053b94adc --- /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/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0bb3f15fdc18..2b49a5ae9a97 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { name = "hugo-${version}"; - version = "0.55.4"; + version = "0.57.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y"; + sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8"; }; - modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23"; + modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/applications/misc/jekyll/basic/Gemfile index 2d3446a81134..c4ba46e2ac6a 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile +++ b/pkgs/applications/misc/jekyll/basic/Gemfile @@ -1,8 +1,6 @@ source "https://rubygems.org" gem "jekyll" # jekyll alone might be enough for most use-cases -gem "rouge" -gem "activesupport", "~> 4.2" gem "jekyll-avatar" gem "jekyll-mentions" gem "jekyll-seo-tag" diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 7954b6dc03ed..54c703bb8592 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,11 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11.1) - i18n (~> 0.7) + activesupport (6.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.8) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) @@ -17,43 +18,47 @@ 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) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) - jekyll (3.8.6) + jekyll (4.0.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (>= 0.9.5, < 2) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + terminal-table (~> 1.8) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-mentions (1.5.1) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (2.0.0) + sassc (> 2.0.1, < 3.0) jekyll-seo-tag (2.6.1) jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.3.1) 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) - kramdown (1.17.0) + kramdown (2.1.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -62,7 +67,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,30 +75,29 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.5.1) + rouge (3.9.0) ruby_dep (1.5.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.1.0) + ffi (~> 1.9) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) + unicode-display_width (1.6.0) + zeitwerk (2.1.9) PLATFORMS ruby DEPENDENCIES - activesupport (~> 4.2) jekyll jekyll-avatar jekyll-mentions jekyll-seo-tag jekyll-sitemap jemoji - rouge BUNDLED WITH 1.17.2 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 741b5e2a0691..41e599c02020 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v"; type = "gem"; }; - version = "4.2.11.1"; + version = "6.0.0"; }; addressable = { dependencies = ["public_suffix"]; @@ -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"]; @@ -119,21 +119,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "0.9.5"; + version = "1.6.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; + sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; type = "gem"; }; - version = "3.8.6"; + version = "4.0.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -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"]; @@ -158,15 +158,15 @@ version = "1.5.1"; }; jekyll-sass-converter = { - dependencies = ["sass"]; + dependencies = ["sassc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; + sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2"; type = "gem"; }; - version = "1.5.2"; + version = "2.0.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -207,20 +207,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; type = "gem"; }; - version = "1.17.0"; + version = "2.1.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; liquid = { groups = ["default"]; @@ -279,10 +290,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 +342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3"; type = "gem"; }; - version = "3.5.1"; + version = "3.9.0"; }; ruby_dep = { groups = ["default"]; @@ -356,27 +367,27 @@ }; version = "1.0.5"; }; - sass = { - dependencies = ["sass-listen"]; + sassc = { + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; + sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs"; type = "gem"; }; - version = "3.7.4"; + version = "2.1.0"; }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; + terminal-table = { + dependencies = ["unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; type = "gem"; }; - version = "4.0.0"; + version = "1.8.0"; }; thread_safe = { groups = ["default"]; @@ -399,4 +410,24 @@ }; version = "1.2.5"; }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + type = "gem"; + }; + version = "1.6.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw"; + type = "gem"; + }; + version = "2.1.9"; + }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index aba5e06e3769..8e7499bad61a 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -1,30 +1,27 @@ source "https://rubygems.org" + gem "jekyll" -gem "rouge" -gem "activesupport", "~> 4.2" + gem "jekyll-avatar" gem "jekyll-mentions" gem "jekyll-seo-tag" gem "jekyll-sitemap" gem "jemoji" + # Optional dependencies: -gem "coderay", "~> 1.1.0" gem "jekyll-coffeescript" #gem "jekyll-docs" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" gem "jekyll-redirect-from" -gem "kramdown", "~> 1.14" +gem "kramdown-syntax-coderay" gem "mime-types", "~> 3.0" -gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1" +gem "rdoc", "~> 6.0" gem "tomlrb", "~> 1.2" platform :ruby, :mswin, :mingw, :x64_mingw do - gem "classifier-reborn", "~> 2.2.0" - gem "liquid-c", "~> 3.0" - gem "pygments.rb", "~> 1.0" - gem "rdiscount", "~> 2.0" - gem "redcarpet", "~> 3.2", ">= 3.2.3" - gem "yajl-ruby", "~> 1.3.1" + gem "classifier-reborn", "~> 2.2" + gem "liquid-c", "~> 4.0" + gem "yajl-ruby", "~> 1.4" end diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 7baf6a45fc54..6410b885ea47 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,11 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11.1) - i18n (~> 0.7) + activesupport (6.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + zeitwerk (~> 2.1, >= 2.1.8) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) classifier-reborn (2.2.0) @@ -28,27 +29,29 @@ 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) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) - jekyll (3.8.6) + jekyll (4.0.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (>= 0.9.5, < 2) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + terminal-table (~> 1.8) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) coffee-script-source (~> 1.12) @@ -62,21 +65,26 @@ GEM jekyll-paginate (1.1.0) jekyll-redirect-from (0.15.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (2.0.0) + sassc (> 2.0.1, < 3.0) jekyll-seo-tag (2.6.1) jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.3.1) 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) - kramdown (1.17.0) + kramdown (2.1.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + kramdown-syntax-coderay (1.0.1) + coderay (~> 1.1) + kramdown (~> 2.0) liquid (4.0.3) - liquid-c (3.0.0) + liquid-c (4.0.0) liquid (>= 3.0.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -88,47 +96,41 @@ GEM mime-types-data (3.2019.0331) mini_portile2 (2.4.0) 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) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.1.1) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rdiscount (2.2.0.1) rdoc (6.1.1) - redcarpet (3.4.0) - rouge (3.5.1) + rouge (3.9.0) ruby_dep (1.5.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.1.0) + ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) tomlrb (1.2.8) tzinfo (1.2.5) thread_safe (~> 0.1) - yajl-ruby (1.3.1) + unicode-display_width (1.6.0) + yajl-ruby (1.4.1) + zeitwerk (2.1.9) PLATFORMS ruby DEPENDENCIES - activesupport (~> 4.2) - classifier-reborn (~> 2.2.0) - coderay (~> 1.1.0) + classifier-reborn (~> 2.2) jekyll jekyll-avatar jekyll-coffeescript @@ -140,16 +142,12 @@ DEPENDENCIES jekyll-seo-tag jekyll-sitemap jemoji - kramdown (~> 1.14) - liquid-c (~> 3.0) + kramdown-syntax-coderay + liquid-c (~> 4.0) mime-types (~> 3.0) - pygments.rb (~> 1.0) - rdiscount (~> 2.0) rdoc (~> 6.0) - redcarpet (~> 3.2, >= 3.2.3) - rouge tomlrb (~> 1.2) - yajl-ruby (~> 1.3.1) + yajl-ruby (~> 1.4) BUNDLED WITH 1.17.2 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 63209d4ff45a..80d67022e7af 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v"; type = "gem"; }; - version = "4.2.11.1"; + version = "6.0.0"; }; addressable = { dependencies = ["public_suffix"]; @@ -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"]; @@ -216,21 +216,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "0.9.5"; + version = "1.6.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; + sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; type = "gem"; }; - version = "3.8.6"; + version = "4.0.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -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"]; @@ -309,15 +309,15 @@ version = "0.15.0"; }; jekyll-sass-converter = { - dependencies = ["sass"]; + dependencies = ["sassc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; + sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2"; type = "gem"; }; - version = "1.5.2"; + version = "2.0.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -358,20 +358,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + type = "gem"; + }; + version = "2.1.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; + }; + kramdown-syntax-coderay = { + dependencies = ["coderay" "kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03vpfpmxcdbqyh6kxrjf5xa9qgvwqj0cfv2khz5h32fp5f5dmrda"; type = "gem"; }; - version = "1.17.0"; + version = "1.0.1"; }; liquid = { groups = ["default"]; @@ -413,10 +435,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a5n7q314ma32y7v9a1g6ps60b14zfn2q4nip4j5aknblz51v7gi"; + sha256 = "0ibcpajsgq530xrz3dk578mfvivrlfd624j6ifz6ms4w69j8jqj6"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -480,28 +502,6 @@ }; version = "5.11.3"; }; - multi_json = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "mswin"; - } { - engine = "rbx"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; multipart-post = { groups = ["default"]; platforms = []; @@ -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"]; @@ -555,29 +555,6 @@ }; version = "3.1.1"; }; - "pygments.rb" = { - dependencies = ["multi_json"]; - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "mswin"; - } { - engine = "rbx"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; - type = "gem"; - }; - version = "1.2.1"; - }; rb-fsevent = { groups = ["default"]; platforms = []; @@ -599,28 +576,6 @@ }; version = "0.10.0"; }; - rdiscount = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "mswin"; - } { - engine = "rbx"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; - type = "gem"; - }; - version = "2.2.0.1"; - }; rdoc = { groups = ["default"]; platforms = []; @@ -631,37 +586,15 @@ }; version = "6.1.1"; }; - redcarpet = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "mswin"; - } { - engine = "rbx"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3"; type = "gem"; }; - version = "3.5.1"; + version = "3.9.0"; }; ruby_dep = { groups = ["default"]; @@ -683,38 +616,38 @@ }; version = "1.0.5"; }; - sass = { - dependencies = ["sass-listen"]; + sassc = { + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; + sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs"; type = "gem"; }; - version = "3.7.4"; + version = "2.1.0"; }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; + sawyer = { + dependencies = ["addressable" "faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; type = "gem"; }; - version = "4.0.0"; + version = "0.8.2"; }; - sawyer = { - dependencies = ["addressable" "faraday"]; + terminal-table = { + dependencies = ["unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; type = "gem"; }; - version = "0.8.2"; + version = "1.8.0"; }; thread_safe = { groups = ["default"]; @@ -747,6 +680,16 @@ }; version = "1.2.5"; }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + type = "gem"; + }; + version = "1.6.0"; + }; yajl-ruby = { groups = ["default"]; platforms = [{ @@ -764,9 +707,19 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rn4kc9fha990yd252wglh6rcyh35cavm1vpyfj8krlcwph09g30"; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.1"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw"; + type = "gem"; + }; + version = "2.1.9"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 6bc608ee5d4e..ed3c86722699 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -20,11 +20,11 @@ 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/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 85dfda405b05..594bf1eb75ae 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -32,13 +32,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m"; + sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch index d7ffb7dbba1f..6232d1118a7b 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 658548f7..f8f10bdb 100644 +index 74b1a7ff..0a713a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -288,6 +288,7 @@ if(MINGW) +@@ -307,6 +307,7 @@ if(MINGW) set(PLUGIN_INSTALL_DIR ".") set(DATA_INSTALL_DIR "share") elseif(APPLE AND WITH_APP_BUNDLE) @@ -10,24 +10,24 @@ index 658548f7..f8f10bdb 100644 set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man") set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") -@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON) +@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON) if(APPLE) set(CMAKE_MACOSX_RPATH TRUE) - find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH) - if(NOT MACDEPLOYQT_EXE) -- message(FATAL_ERROR "macdeployqt is required to build in macOS") +- message(FATAL_ERROR "macdeployqt is required to build on macOS") - else() - message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}") - endif() - endif() - - # Debian sets the the build type to None for package builds. + elseif(MINGW) + find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH) + if(NOT WINDEPLOYQT_EXE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 110dc606..f9b58818 100644 +index f142f368..0742512d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE) +@@ -351,11 +351,6 @@ if(APPLE AND WITH_APP_BUNDLE) set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") include(CPack) @@ -40,10 +40,10 @@ index 110dc606..f9b58818 100644 install(TARGETS ${PROGNAME} diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt -index f1c5387f..abf70b48 100644 +index 7427450a..a0a58d71 100644 --- a/src/autotype/mac/CMakeLists.txt +++ b/src/autotype/mac/CMakeLists.txt -@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE) +@@ -8,7 +8,6 @@ if(WITH_APP_BUNDLE) add_custom_command(TARGET keepassx-autotype-cocoa POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 2e32bbd611a1..6aa94b2fecb8 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, python3 }: +{ stdenv, pkgs, python3, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; @@ -9,6 +9,14 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; }; + # Include a khal.desktop file via upstream commit. + # This patch should be removed when updating to the next version, probably. + patches = [ (fetchpatch { + name = "add-khal-dot-desktop.patch"; + url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch"; + sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c"; + }) ]; + propagatedBuildInputs = [ atomicwrites click @@ -26,11 +34,19 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ]; checkInputs = [ pytest ]; postInstall = '' + # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal + + # man page + make -C doc man + install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1 + + # desktop + install -Dm755 misc/khal.desktop -t $out/share/applications ''; doCheck = !stdenv.isAarch64; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 01f33cd5b121..3b7e9e9d139d 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -95,7 +95,7 @@ buildPythonApplication rec { '' else '' cp -r linux-package/{bin,share,lib} $out ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" + wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall # ZSH completions need to be invoked with `source`: diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index c9583961de41..999665bf6bb5 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "libosmocore-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - sha256 = "1ayxpq03mv547sirdy3j9vnsjd1q07adhwwnl3wffz3c39wlax68"; + sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 8bbb179d9d51..601e8c611e4b 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "19.04"; + version = "19.07"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5"; + sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b3e739864171..bcfd1adb4b44 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -15,23 +15,25 @@ , libuv , libzen , lsb-release +, mkDerivation , pkgconfig -, qt5 +, qtbase +, qttools , sqlite , swig , unzip , wget }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "megasync-${version}"; - version = "4.1.1.0"; + version = "4.2.3.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2"; + sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv"; fetchSubmodules = true; }; @@ -41,8 +43,7 @@ stdenv.mkDerivation rec { doxygen lsb-release pkgconfig - qt5.qmake - qt5.qttools + qttools swig ]; buildInputs = [ @@ -57,8 +58,7 @@ stdenv.mkDerivation rec { libtool libuv libzen - qt5.qtbase - qt5.qtsvg + qtbase sqlite unzip wget diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix new file mode 100644 index 000000000000..0f4e72502bba --- /dev/null +++ b/pkgs/applications/misc/moolticute/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl +, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets +}: + +stdenv.mkDerivation rec { + name = "moolticute-${version}"; + version = "0.30.8"; + + src = fetchurl { + url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz"; + sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf"; + }; + + preConfigure = "mkdir -p build && cd build"; + nativeBuildInputs = [ pkgconfig qmake qttools ]; + qmakeFlags = [ "../Moolticute.pro" ]; + + outputs = [ "out" "udev" ]; + preInstall = '' + mkdir -p $udev/lib/udev/rules.d + sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | + sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules + ''; + + buildInputs = [ libusb1 qtbase qtwebsockets ]; + + meta = with stdenv.lib; { + description = "GUI app and daemon to work with Mooltipass device via USB"; + longDescription = '' + To install udev rules, add `services.udev.packages == [ moolticute.udev ]` + into `nixos/configuration.nix`. + ''; + homepage = https://github.com/mooltipass/moolticute; + license = licenses.gpl3Plus; + maintainers = [ maintainers.kirikaza ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index 882bb75219d6..adba36329359 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "netsurf-buildsystem-${version}"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"; + sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6"; }; makeFlags = [ diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 660b5db61058..411b318a3925 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper}: stdenv.mkDerivation rec { - version = "4.1.5.2"; + version = "4.3.0"; pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip; - sha256 = "1mdnsvjgsccpd5xwpqzgva5jjp8yd1akq9aqpild4v6k70lqql2b"; + url = mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip; + sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 98ebde981c0a..332c696d8da2 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobject-introspection , intltool, yelp-tools, itstool, libxmlxx3 -, python, pygobject3, gtk3, gnome3, substituteAll +, python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas , speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python @@ -31,6 +31,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 intltool yelp-tools itstool gobject-introspection + hicolor-icon-theme # setup-hook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e0a1e33dc628..977511273425 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/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index d8512754f6a7..3a288a81c37f 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.unix; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yegortimoshenko globin ]; }; } diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix new file mode 100644 index 000000000000..81c001509f34 --- /dev/null +++ b/pkgs/applications/misc/rsclock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rsClock"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "valebes"; + repo = pname; + rev = "v${version}"; + sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh"; + }; + + cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n"; + + meta = with stdenv.lib; { + description = "A simple terminal clock written in Rust"; + homepage = "https://github.com/valebes/rsClock"; + license = licenses.mit; + maintainers = with maintainers; [valebes]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix new file mode 100644 index 000000000000..a04b0dcbba6a --- /dev/null +++ b/pkgs/applications/misc/sampler/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub, alsaLib }: + +buildGoModule rec { + pname = "sampler"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "sqshq"; + repo = pname; + rev = "v${version}"; + sha256 = "129vifb1y57vyqj9p23gq778jschndh2y2ingwvjz0a6lrm45vpf"; + }; + + modSha256 = "0wgwnn50lrg6ix5ll2jdwi421wgqgsv4y9xd5hfj81kya3dxcbw0"; + + subPackages = [ "." ]; + + buildInputs = [ alsaLib ]; + + meta = with lib; { + description = "Tool for shell commands execution, visualization and alerting"; + homepage = "https://sampler.dev"; + license = licenses.gpl3; + maintainers = with maintainers; [ uvnikita ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 764e6c0048e8..e3edb5399289 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.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "1803bhw20vb6w4s9phab95mgi2n0g30n57mc07h3xg3p114qxwir"; + sha256 = "0mxlhyfqmd4zg0psdmr62rhmvssw8jslm7a1nvh93675ns3vfrs5"; }; nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 1a9e3f4ecc11..9407243c6a21 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "0.7.1"; + version = "0.7.2"; name = "xst-${version}"; in stdenv.mkDerivation { inherit name; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "gnotclub"; repo = "xst"; rev = "v${version}"; - sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; + sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 293f6aaa3c6f..ee42c1389fcd 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -74,15 +74,15 @@ let in rec { application = mkSweetHome3D rec { - version = "6.1.2"; + version = "6.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "14svi112kml175dblzcdjzhlfwbp1cy6rki49mqb3632hwmif6ya"; - rev = "6750"; + sha256 = "0a514a1zmipykvawil46v826ivkw9c00vdkyggyl6m41giay15zf"; + rev = "6822"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix new file mode 100644 index 000000000000..0dc8f3bf38e4 --- /dev/null +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -0,0 +1,57 @@ +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, qtbase +, qtwebengine +, qtdeclarative +, extra-cmake-modules +, cpp-utilities +, qtutilities +, cmake +, kio +, plasma-framework +, qttools +, webviewSupport ? true +, jsSupport ? true +, kioPluginSupport ? true +, plasmoidSupport ? true +, systemdSupport ? true +}: + +mkDerivation rec { + version = "0.9.1"; + pname = "syncthingtray"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = "syncthingtray"; + rev = "v${version}"; + sha256 = "0ijwpwlwwbfh9fdfbwz6dgi6hpmaav2jm56mzxm6as50iwnb59fx"; + }; + + buildInputs = [ qtbase cpp-utilities qtutilities ] + ++ lib.optionals webviewSupport [ qtwebengine ] + ++ lib.optionals jsSupport [ qtdeclarative ] + ++ lib.optionals kioPluginSupport [ kio ] + ++ lib.optionals plasmoidSupport [ extra-cmake-modules plasma-framework ] + ; + + nativeBuildInputs = [ cmake qttools ]; + + cmakeFlags = [ + # See https://github.com/Martchus/syncthingtray/issues/42 + "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" + ] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"] + ++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"] + ++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"] + ; + + meta = with lib; { + homepage = "https://github.com/Martchus/syncthingtray"; + description = "Tray application and Dolphin/Plasma integration for Syncthing"; + license = licenses.gpl2; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 1a1ea3102afd..00b96f459cb7 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.4.3"; - sha256 = "0i12x7qzfmmdvi09k96x53zzzrva2w3zbl2f6dkxb8kk5scqqa4v"; + version = "1.6.0"; + sha256 = "1yq7lbqg759i3hyxcskx3924b7xmw6i4ny6n8yq80k4hikw2k6mf"; in (haskellPackages.mkDerivation { pname = "taskell"; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 80dffe6d93f2..d09c98b67090 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -35,7 +35,7 @@ python2.pkgs.buildPythonApplication rec { ''; homepage = https://gnometerminator.blogspot.no/p/introduction.html; license = licenses.gpl2; - maintainers = with maintainers; [ bjornfor globin ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 65d01a5649d5..095681d136d8 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -16,6 +16,7 @@ , glib , wrapGAppsHook , libunwind +, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils dmd + hicolor-icon-theme # for setup-hook meson ninja pkgconfig diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 12cf96580f74..3db6f6ae565d 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/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 6fbe75aadfc9..d6cbb442b898 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0jj6sjsphyvdl4xy5wl64cl4p5y1vzr721cgapbd89g4y0cslsfy"; + sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 69421e288d34..daae279ccc79 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19"; + sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 02fc2f3a5758..07538f749e8f 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/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index fc5abf109894..433f6c614774 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { desktopName = "XMind"; comment = meta.description; categories = "Office;"; - mimeType = "application/xmind;xscheme-handler/xmind"; + mimeType = "application/xmind;x-scheme-handler/xmind"; }; installPhase = let diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 9afe3cae07bf..6e421be93022 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/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 4922d3c6aed1..18eb2189f2c0 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,23 +4,19 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.14.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "11q4w5ncyyf2vgrb64zlr01n3adyaxja2pcqm5id9if0nvwwn4ga"; + sha256 = "19rv5zmxwr3kmb2m3fas91aq1493cnkhvs88zcflnijr1ra218ks"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libuv libmicrohttpd libuuid openssl ]; postPatch = '' - # Set default donation level to 0%. Can be increased at runtime via --donate-level option. - substituteInPlace src/donate.h \ - --replace "kDefaultDonateLevel = 2;" "kDefaultDonateLevel = ${toString donateLevel};" - # Link dynamically against libuuid instead of statically substituteInPlace CMakeLists.txt --replace uuid.a uuid ''; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 53d427e61c2c..294229d08a93 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }: +{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }: stdenv.mkDerivation rec { name = "yate-${version}"; - version = "6.0.0-1"; + version = "6.1.0-1"; src = fetchurl { url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz"; - sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa"; + sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d"; }; # TODO zaptel ? postgres ? nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ qt4 openssl autoconf automake ]; + buildInputs = [ qt4 openssl ]; # /dev/null is used when linking which is a impure path for the wrapper preConfigure = diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 585b4eef9ea3..fe4ecf225aae 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "A core component for zathura PDF viewer"; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 3059c3f725b1..975c6e4a4680 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -27,6 +27,6 @@ in symlinkJoin { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers;[ smironov ]; + maintainers = with maintainers; [ smironov globin ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index dcf3224e2077..45fb820a076c 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.67.123"; + version = "0.68.131"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "00kpysk84xwmlwziq7pjizmi2ljgiq45l1x743qkfflxlh0pj21m"; + sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l"; }; dontConfigure = true; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { # Fix paths substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser $out/bin/brave + --replace /usr/bin/brave-browser-stable $out/bin/brave substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ --replace /opt/brave.com $out/opt/brave.com substituteInPlace $out/share/menu/brave-browser.menu \ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3e63389be02d..45c125985120 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/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index eca2bc0d99f7..664f9343eabd 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,17 +94,17 @@ let envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; - + meta.platforms = platforms.x86_64; }; flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.223"; + version = "32.0.0.238"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0xm6jcdip4gki267ldw106l5j43im0ji2zjsarvi7n2nvvnwwgnl"; + sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65"; stripRoot = false; }; @@ -135,7 +135,7 @@ let ''; dontStrip = true; - + meta.platforms = platforms.x86_64; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d8d2aff0d097..f8e56937021a 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 b60454c4a42d..4f4741ce0bdf 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/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 133c37d06060..02087ae01ac9 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 18d14d4120aa..cd9d3bd88a09 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 f56154c27643..20509439d2fb 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/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc1678335947..2a4db14b2c6d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,10 +3,9 @@ ## various stuff that can be plugged in , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd -, jrePlugin, icedtea_web +, jrePlugin, adoptopenjdk-icedtea-web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ -, esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , udev @@ -55,13 +54,12 @@ let ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea icedtea_web + ++ lib.optional icedtea adoptopenjdk-icedtea-web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader - ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin ++ extraPlugins ); nativeMessagingHosts = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix deleted file mode 100644 index 48d06d644dda..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, gtk2, openssl, pcsclite, pkgconfig, opensc }: - -stdenv.mkDerivation rec { - version = "3.12.1.1142"; - name = "esteidfirefoxplugin-${version}"; - - src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/e/esteidfirefoxplugin/esteidfirefoxplugin_3.12.1.1142.orig.tar.xz"; - sha256 = "0y7759x1xr00p5r3c5wpllcqqnnxh2zi74cmy4m9m690z3ywn0fx"; - }; - - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 openssl pcsclite opensc ]; - - buildPhase = '' - sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile - make plugin - ''; - - installPhase = '' - plugins=$out/lib/mozilla/plugins - mkdir -p $plugins - cp -a npesteid-firefox-plugin.so $plugins/ - rp=$(patchelf --print-rpath $plugins/npesteid-firefox-plugin.so) - patchelf --set-rpath "$rp:${opensc}/lib:${opensc}/lib/pkcs11" $plugins/npesteid-firefox-plugin.so - ''; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - dontStrip = true; - dontPatchELF = true; - - meta = with stdenv.lib; { - description = "Firefox ID card signing plugin"; - homepage = http://www.id.ee/; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 8aa51366e474..e8ffa7144684 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.223"; + version = "32.0.0.238"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "165zsh4dzzsy38kc8yxp0jdygk4qid5xd642gchlky7z6fwza223" + "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg" else - "1by2zqw9xgvpf1jnbf5qjl3kcjn5wxznl44f47f8h2gkgcnrf749" + "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9" else if arch == "x86_64" then - "07hbg98pgpp81v2sr4vw8siava7wkg1r6hg8i6rg00w9mhvn9vcz" + "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s" else - "1z2nmznmwvg3crdj3gbz2bxvi8dq2jk5yiwk79y90h199nsan1n2"; + "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index c9081ee3d69b..29a01840555d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.223"; + version = "32.0.0.238"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1f3098vfznnx8d7rimgbalr2728jhzwca9val7pdi9b8yf9labwk" + "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" else - "005iyajgp55ww25rcyxg5g0kbzddp6izfly9p4agahmzlzv18y4h"; + "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 1519c382ebb5..9a4d61a50aee 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { - name = "qtchan-${version}"; - version = "0.100"; +mkDerivation rec { + pname = "qtchan"; + version = "1.0.1"; src = fetchFromGitHub { owner = "siavash119"; repo = "qtchan"; rev = "v${version}"; - sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a"; + sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; }; - patches = [ - (fetchpatch { - url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch; - sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z"; - }) - ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qt.qmake qt.wrapQtAppsHook ]; - buildInputs = [ qt.qtbase ]; - + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; qmakeFlags = [ "CONFIG-=app_bundle" ]; installPhase = '' @@ -29,7 +21,7 @@ stdenv.mkDerivation rec { cp qtchan $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "4chan browser in qt5"; homepage = "https://github.com/siavash119/qtchan"; license = licenses.mit; 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 6632b116fc35..1afe4dcea02e 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/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index cc9bc38bc4db..1deaa33ee840 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = https://fanglingsu.github.io/vimb/; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2367c0a98553..246c5e7e60dc 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.7.1628.30-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1hl7aqq3i6mkkg7sdcax26kn08p8mqwlq4xpg4v05ivdvyh5ac9d"; + sha256 = "1lz8adwiwll8g246s5pa0ipfraph51s9f4lcfysdrp1s3s1qhw8x"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index cb7c41d0c8a1..bd8eb5451526 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 bc4db7ef7c12..000000000000 --- 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 fb36d3729c05..b5276818f79f 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/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index d8fa1a04507a..b8b9fa035d18 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, libvirt, pkgconfig, minikube }: +{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-machine-kvm2"; name = "${pname}-${version}"; version = minikube.version; @@ -10,6 +10,8 @@ buildGoPackage rec { src = minikube.src; + modSha256 = minikube.go-modules.outputHash; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvirt ]; @@ -18,7 +20,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2 + mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 29ec50ce3624..b0f679322659 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.13.1"; + version = "1.13.3"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "0g8yfvwh6hjh70a0i4ssbb6hq3i9f75wj8yqy1aaafycq598zbdx"; + sha256 = "0l2gc9p2jz1zyl527rr0r3qklm4j86d4biviq8a30jl9rsx6z4cy"; }; modSha256 = "1q5g9hd0ansdc2acpysf6wi74q50w0psrpyhk4y6mm6kjvhlcn87"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 42c043d0007f..376f8113b23a 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 +}: let - common = { version, sha256, dependencies-sha256, tomcat }: + common = { version, sha256, dependencies-sha256, tomcat, opensslPkg ? openssl }: let # compile the hadoop tarball from sources, it requires some patches binary-distributon = stdenv.mkDerivation rec { @@ -33,7 +35,7 @@ let }; nativeBuildInputs = [ maven cmake pkgconfig ]; - buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ @@ -84,7 +86,7 @@ let mv $n $out/bin.wrapped/ makeWrapper $out/bin.wrapped/$(basename $n) $n \ --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ - --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ --set HADOOP_PREFIX "$out" fi @@ -127,18 +129,21 @@ in { sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_2_8 = common { version = "2.8.4"; sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_2_9 = common { version = "2.9.1"; sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_3_0 = common { version = "3.0.3"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix new file mode 100644 index 000000000000..a69dc8890a7b --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubeless"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "kubeless"; + repo = "kubeless"; + rev = "v${version}"; + sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; + }; + modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd"; + + subPackages = [ "cmd/kubeless" ]; + + buildFlagsArray = '' + -ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://kubeless.io"; + description = "The Kubernetes Native Serverless Framework"; + license = licenses.asl20; + maintainers = with maintainers; [ "00-matt" ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 8c85370728f5..5637e486ef11 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -49,6 +49,7 @@ in buildGoModule rec { ''; postInstall = '' + wrapProgram $out/bin/${pname} --prefix PATH : $out/bin:${stdenv.lib.makeBinPath binPath} mkdir -p $out/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube mkdir -p $out/share/zsh/site-functions/ 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 000000000000..ae407727b9d4 --- /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 000000000000..1c802802c096 --- /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/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index a6749083c245..16056d9185b5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.3.4"; - sha256 = "1kam9mwgqh31f1m8kn86bkdi4ccfj5h38f80g3frrla4p2zw9l55"; + version = "1.3.5"; + sha256 = "0xjxxz3vxq7vk7sv6b5p57z5x92dmrm44v6ksffcg76ngc40nrxk"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.52.2"; - sha256 = "1s127p6rm3kmrxjk9kr02rgjk58rs864c0b46i8lmaj7x5yznaz5"; + version = "1.54.0"; + sha256 = "01pmhwdnhfsk785ja11hxn5l5fmklnkiv12kv2pw2280cdljfcv4"; }; archive = { @@ -39,8 +39,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.21.0"; - sha256 = "18aw0fz3pzd7wci3z19nain499rfr9npb3sm0k34nkajjjryqngc"; + version = "2.23.0"; + sha256 = "0yscy0qmdl07air0b16i6zd0w8y3z20pk5l53pwm78ssdxn3w6qc"; }; azuread = { @@ -53,8 +53,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.32.0"; - sha256 = "01287yknd2bp2yqzyn2221mkv2hz4xd5dghps5pzrkdv0m1w4p35"; + version = "1.32.1"; + sha256 = "0ydzibmvz52i62pk0g96rl7vxhff5izrsgdwk6lgc56nw63w2l8g"; }; azurestack = { @@ -109,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.16.1"; - sha256 = "0lxx7wkvmi6zpql7g33bg12gx67i4xm2v885j70b9vf8brj40h2j"; + version = "1.17.1"; + sha256 = "0kmkk5fhgsvjakqrfs7p92dcljn04asxq15af1r9n5csq54q7na3"; }; cloudscale = { @@ -151,8 +151,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.5.0"; - sha256 = "14kqyp4j4ld8gla8rn3an6wpjh942h5bn39d68nnf4y7nx3vvbfs"; + version = "1.6.0"; + sha256 = "06cxm3qcym8jwp4nl1bzk3p9fbaz26bvddqzn3p8l57c802qqds6"; }; dme = { @@ -179,8 +179,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "2.1.0"; - sha256 = "183pkjf6x8xk84sij2w2v3sms8pjv7hzwricamd2sf3n0fkqvjiq"; + version = "2.1.1"; + sha256 = "0px3xj76ay5ixpmynas49z31xmk4zmpn0917y6a20kr2x2abi9zb"; }; dyn = { @@ -200,8 +200,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.8.1"; - sha256 = "1ghvf7nwj02r31zgnrnmhagqbbq696ll39b2wjzlimb6c3fw7ik0"; + version = "0.9.0"; + sha256 = "0g3rgi6s9hyb6vzl682n8zqz5virdxvxh04v88n9iy5r7hwrxxzg"; }; flexibleengine = { @@ -228,15 +228,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.11.0"; - sha256 = "16577pkp3m5pqqqhvxq1rvx99p1230pmqksm6wplh25ry5yp5v7w"; + version = "2.12.0"; + sha256 = "15fdpmdikm77hlfksdbcblysb82sd51vw4ninx60hzgddqp6ll4m"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.11.0"; - sha256 = "0hj2c17kb6k4zy1630fvmyniln5m1ncpyys4wl8v1j0arb8vg2wz"; + version = "2.12.0"; + sha256 = "11aky7jvm7i39pnj3ypy42d9yk9akqb3wjb03hyllzfddwhvay5q"; }; grafana = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.11.0"; - sha256 = "037hbwp10h57cj74ja6c4wjgfrfggbpd4glbc81xpp22rxij40j9"; + version = "1.12.0"; + sha256 = "1r61s7chq636fcjv67g0vjlc35xx0ycy58hg6b5i5rdc9737v7hp"; }; hedvig = { @@ -263,15 +263,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.10.0"; - sha256 = "09qxpgdljkfbyn1ihki2pp2m9wxmrxvp91d1myinml466jylxjar"; + version = "0.10.2"; + sha256 = "1xp8dx6ncskmfa9bjd54434f4a7pnjz5r3yvnh1hmv3i5ykfxzdn"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "2.1.0"; - sha256 = "17gb8lpcp7fwgv6mv3sw5was571pa0pp00izrrkyhbcddw5p84mc"; + version = "2.1.2"; + sha256 = "0n8id5rw4hzsiic9yv4rzm709npagv9sfp6dd1ax6np5kai78b87"; }; http = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.6.0"; - sha256 = "03f92mq4ydfwnxh0v4sm6brllxw6m7kh8j19md9aq0wxcwr5wp6q"; + version = "1.7.0"; + sha256 = "1yhyyh33hvzs74pryb383p1w0c0d4vn23pnm6snxi1cw49wgiiyf"; }; icinga2 = { @@ -305,15 +305,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.2.0"; - sha256 = "1nldywbwg5lgzhlq8hmisv63riipd0aaa4p5ya6qvx5cnj5yhsx8"; + version = "1.3.0"; + sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; version = "1.8.1"; - sha256 = "1c69p7rqijinzr0lqh4iwa0g89w2hjm2csadbxkfha0a8iqq73r1"; + sha256 = "0jcc3i10x0qz7sj8l5yv98jc2g32a6yhdpc45sq33wmhcvp1fsn4"; }; librato = { @@ -382,22 +382,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.4.0"; - sha256 = "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4"; + version = "1.4.1"; + sha256 = "1v4wwinnb2qc71jgil4607kgdccjivssabqgb5l3yk8pwfidgdnr"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.4.1"; - sha256 = "1zcl7yda0rqj76d9slm92kvj5ry3v5va48l8i5vlxa1znnf8d89d"; + version = "1.5.0"; + sha256 = "1m6f1hsx2gcb5b50sm8cj04hkmn71xlxji8qwlswasz2sg1sllrx"; }; nsxt = { owner = "terraform-providers"; repo = "terraform-provider-nsxt"; - version = "1.1.0"; - sha256 = "0y9n4acbrjf5n2v8j10qfnz8677gil60by5miz3wd2qpxwgmhhm8"; + version = "1.1.1"; + sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29"; }; null = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.35.0-rc1"; - sha256 = "1728zap32iabsa2a6762caf9h7fgspi1z8gnq03269qhy7jsknv8"; + version = "3.37.0-rc1"; + sha256 = "0ahqnh9qzixp434qn2ckj8p32kb9x26l1xz8yr84h6sqfrn58bcv"; }; oneandone = { @@ -431,22 +431,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.6"; - sha256 = "1b11837j0d8s59pjkankbm3p5l87aw1s17mn2q7nvy65kgzalsra"; + version = "1.3.7"; + sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.20.0"; - sha256 = "0hfcypz95aj1wwhybpkc74k8g2iqax724qdm11s2iyjmq5c7iz2z"; + version = "1.21.1"; + sha256 = "0nvhn2bnk11sz4i98yw7rpxi8b3c2y04qq37ybvqx2jyi3n9kj30"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.10.0"; - sha256 = "12c7qjlmvsxd4nv0k2vsvlnl1iq2k0b8xx29q5a6h98dnhrnpfic"; + version = "1.11.0"; + sha256 = "175j2bbw3bdbjq1b7b1kwsr8iay9aafz165d0brfpb8gf096y7xa"; }; opsgenie = { @@ -473,15 +473,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "2.2.1"; - sha256 = "05zhrpynn2yrimlg553f0567b284x51g5yafz29g647vvsqd1rpn"; + version = "2.3.0"; + sha256 = "1v2758wjhrn7rhwdx658w3sf1q5lp4cawl6llbv4p16c5fyzwwc2"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.3.0"; - sha256 = "1l3rk7c31qafadpg2b0mzvfx7lwwk82vcn489fr35rvmv99zfkh8"; + version = "1.3.1"; + sha256 = "1x29ya0xcjj2b3x2q2q7iyqric8vswf18a5bwhwv2017c1g4n299"; }; panos = { @@ -501,8 +501,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-powerdns"; - version = "0.1.0"; - sha256 = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz"; + version = "1.0.0"; + sha256 = "1qh4z69b0sqxwjjgc8xis165gdszav9yc85ba6pgyl3wbymkld30"; }; profitbricks = { @@ -522,15 +522,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.3.0"; - sha256 = "0b62hhb87xqmc1izl5lyk2kvkrkgrjil5z1xwprfdl6yz4fnin0w"; + version = "1.4.0"; + sha256 = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "2.1.2"; - sha256 = "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw"; + version = "2.2.0"; + sha256 = "0vg33jbvyxvg4dwcwjb2p57jjkq7qj50d356r4a1f2ysl2axwwjw"; }; rightscale = { @@ -543,8 +543,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rundeck"; - version = "0.3.0"; - sha256 = "10xhj3xxdhbdxq14linqabn8cm0gnnswfwr0r20s1yp7pn36lgkj"; + version = "0.4.0"; + sha256 = "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr"; }; runscope = { @@ -613,8 +613,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.13.0"; - sha256 = "0mdgpkzv1gfyvpndvv195f6nxmvpv4wvssxlqvmccf8vvmb32nyn"; + version = "1.15.0"; + sha256 = "1ics91fxsl1z1wqd961wdn2s22ck25yphp341qlbs8ln2dcwk8r7"; }; terraform = { @@ -662,15 +662,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "2.1.0"; - sha256 = "1nbiz2mnknaimfvh1zmmsp1crrhcpy4q6maaakqybqzabkn9wibr"; + version = "2.2.0"; + sha256 = "0k9frx29pjrrx67cwzsrnj0x90ff5k99l5yzfgb58sajkz1j8nln"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - version = "2.3.0"; - sha256 = "1x9ydp6kscgj0m7vkf4ly0y80016qcfbshgmlydrvq7dbw44qlr9"; + version = "2.4.0"; + sha256 = "020wmdl5cbma9r7sv3bx6v8b59w5nwkzgwj4xm7a2s6kn8jygr2x"; }; vsphere = { @@ -683,8 +683,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - version = "0.8.2"; - sha256 = "07p88asjcjndpv36dhvfazb440k2f2v4j7rpvqqmfccwyyqkwwjr"; + version = "0.9.0"; + sha256 = "0x3l0pbpdsm43jsx42xzc46r9j40l7szkcf851q16wsxf70lchqr"; }; matchbox = { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 02803daa219e..de1e86fa0736 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.6"; - sha256 = "0vxvciv4amblxx50wivlm60fyj1ardfgdpj3l8cj9fhi79b3khxl"; + version = "0.12.7"; + sha256 = "09zsak1a9z2mk88vb6xs9jaxfpazhs0p7x68mw62c9mm13m8kq02"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index c40750752996..b4707327bc72 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.7"; + version = "0.10.4"; src = fetchFromGitHub { owner = "windmilleng"; repo = pname; rev = "v${version}"; - sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65"; + sha256 = "0nxgmldbcaj91jq47qxpf6jqwvi9bhg243qchdkiliphybvilcrg"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-08-14"); 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/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix new file mode 100644 index 000000000000..21f1e555a291 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook +, pkgconfig +, glib +, ronn +, curl +, id3lib +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "castget"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "mlj"; + repo = pname; + # Upstream uses `_` instead of `.` for the version, let's hope it will + # change in the next release + rev = "rel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1pfrjmsikv35cc0praxgim26zq4r7dfp1pkn6n9fz3fm73gxylyv"; + }; + # Otherwise, the autoreconfHook fails since Makefile.am requires it + preAutoreconf = '' + touch NEWS + touch README + touch ChangeLog + ''; + + buildInputs = [ glib curl id3lib libxml2 ]; + nativeBuildInputs = [ ronn autoreconfHook pkgconfig ]; + + meta = with stdenv.lib; { + description = "A simple, command-line based RSS enclosure downloader"; + longDescription = '' + castget is a simple, command-line based RSS enclosure downloader. It is + primarily intended for automatic, unattended downloading of podcasts. + ''; + homepage = "http://castget.johndal.com/"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index fea062805d0f..959649c4b150 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas - gnome3.gnome-online-accounts + gnome-online-accounts hicolor-icon-theme # for setup hook ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f990f8de5291..f01849919ab0 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.15"; + version = "2.21.16"; src = fetchPypi { inherit pname version; - sha256 = "0p1pa5l9apd40mdlgzp9vfpd8x9laqiah2i8l3q9m6nnibk1ipx8"; + sha256 = "1skb73nsg5gqlqqcs64c9kiidd74p3gm0xx93jaky2gagn0jn7rv"; }; postPatch = '' diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index fdd8e004c8b2..e37dc9e7cac6 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "0qv74marzdv99xc2jbzzcwx3b2hm6byjl734h9x42g4mcg5pq9yf"; + sha256 = "0gjmb8s3d7nj9jp5zkz5q6a59777ay6b1sg4ghl8iw9m8l4h42xa"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index ef4009b0e96c..94d5be030da6 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/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c9dfc79d2672..189092a6d5e0 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/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 2c27853c9442..ea793e3c0aac 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchFromGitHub , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf -}: - +, automake, autoconf }: stdenv.mkDerivation rec { name = "freetalk-${version}"; version = "4.1"; @@ -19,11 +17,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + buildInputs = [ guile glib loudmouth gmp libidn readline libtool - libunwind ncurses curl jansson texinfo - autoconf automake + libunwind ncurses curl jansson ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 1c58ae353bb3..655628308971 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, cmake +{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: stdenv.mkDerivation rec { - name = "quaternion-${version}"; + generic = version: sha256: prefix: library: mkDerivation rec { + pname = "quaternion"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; @@ -13,9 +14,9 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake qttools ]; postInstall = if stdenv.isDarwin then '' mkdir -p $out/Applications @@ -28,7 +29,7 @@ let meta = with lib; { description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = https://matrix.org/docs/projects/client/quaternion.html; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index ffa55a88c8ab..9a0aab6f8ce1 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.1.4"; + version = "1.1.6"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "0vwh3km3h46bgynd10s8ijl3aj5sskzncdj14h3k7h4sibd8r71a"; + sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index edf10ed2cb42..2e9602458e7f 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.0", + "version": "1.3.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index b84807c69a04..b76848c2b810 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -1,7 +1,6 @@ -{fetchurl, linkFarm}: rec { +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ - { name = "_types_node___node_9.6.45.tgz"; path = fetchurl { @@ -10,7 +9,6 @@ sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; }; } - { name = "ajv___ajv_6.10.0.tgz"; path = fetchurl { @@ -19,7 +17,6 @@ sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; }; } - { name = "applescript___applescript_1.0.0.tgz"; path = fetchurl { @@ -28,7 +25,6 @@ sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; }; } - { name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { @@ -37,7 +33,6 @@ sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; }; } - { name = "assert_plus___assert_plus_1.0.0.tgz"; path = fetchurl { @@ -46,7 +41,6 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } - { name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { @@ -55,7 +49,6 @@ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; } - { name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { @@ -64,7 +57,6 @@ sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0"; }; } - { name = "aws_sign2___aws_sign2_0.7.0.tgz"; path = fetchurl { @@ -73,7 +65,6 @@ sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; } - { name = "aws4___aws4_1.8.0.tgz"; path = fetchurl { @@ -82,7 +73,6 @@ sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; }; } - { name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; path = fetchurl { @@ -91,7 +81,6 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } - { name = "bignumber.js___bignumber.js_2.4.0.tgz"; path = fetchurl { @@ -100,7 +89,6 @@ sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; }; } - { name = "bmp_js___bmp_js_0.0.3.tgz"; path = fetchurl { @@ -109,7 +97,6 @@ sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; }; } - { name = "buffer_equal___buffer_equal_0.0.1.tgz"; path = fetchurl { @@ -118,7 +105,6 @@ sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; } - { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -127,7 +113,6 @@ sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; } - { name = "combined_stream___combined_stream_1.0.7.tgz"; path = fetchurl { @@ -136,7 +121,6 @@ sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; }; } - { name = "conf___conf_2.2.0.tgz"; path = fetchurl { @@ -145,7 +129,6 @@ sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; }; } - { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -154,7 +137,6 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } - { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -163,7 +145,6 @@ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } - { name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { @@ -172,7 +153,6 @@ sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; } - { name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { @@ -181,7 +161,6 @@ sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; }; } - { name = "delayed_stream___delayed_stream_1.0.0.tgz"; path = fetchurl { @@ -190,7 +169,6 @@ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; } - { name = "dom_walk___dom_walk_0.1.1.tgz"; path = fetchurl { @@ -199,7 +177,6 @@ sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; } - { name = "dot_prop___dot_prop_4.2.0.tgz"; path = fetchurl { @@ -208,7 +185,6 @@ sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; } - { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { @@ -217,7 +193,6 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } - { name = "electron_store___electron_store_2.0.0.tgz"; path = fetchurl { @@ -226,7 +201,6 @@ sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; }; } - { name = "electron_window_state___electron_window_state_4.1.1.tgz"; path = fetchurl { @@ -235,7 +209,6 @@ sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; }; } - { name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { @@ -244,7 +217,6 @@ sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; } - { name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { @@ -253,7 +225,6 @@ sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; }; } - { name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; path = fetchurl { @@ -262,7 +233,6 @@ sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; }; } - { name = "es6_promise___es6_promise_3.3.1.tgz"; path = fetchurl { @@ -271,7 +241,6 @@ sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; } - { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { @@ -280,7 +249,6 @@ sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; }; } - { name = "extend___extend_3.0.2.tgz"; path = fetchurl { @@ -289,7 +257,6 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } - { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -298,7 +265,6 @@ sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; } - { name = "extsprintf___extsprintf_1.4.0.tgz"; path = fetchurl { @@ -307,7 +273,6 @@ sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; } - { name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; path = fetchurl { @@ -316,7 +281,6 @@ sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; } - { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; path = fetchurl { @@ -325,7 +289,6 @@ sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; } - { name = "file_type___file_type_3.9.0.tgz"; path = fetchurl { @@ -334,7 +297,6 @@ sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; } - { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { @@ -343,7 +305,6 @@ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; }; } - { name = "for_each___for_each_0.3.3.tgz"; path = fetchurl { @@ -352,7 +313,6 @@ sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; }; } - { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { @@ -361,7 +321,6 @@ sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; } - { name = "form_data___form_data_2.3.3.tgz"; path = fetchurl { @@ -370,7 +329,6 @@ sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; }; } - { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -379,7 +337,6 @@ sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; }; } - { name = "getpass___getpass_0.1.7.tgz"; path = fetchurl { @@ -388,7 +345,6 @@ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } - { name = "global___global_4.3.2.tgz"; path = fetchurl { @@ -397,7 +353,6 @@ sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; } - { name = "graceful_fs___graceful_fs_4.1.15.tgz"; path = fetchurl { @@ -406,7 +361,6 @@ sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; }; } - { name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { @@ -415,7 +369,6 @@ sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; } - { name = "har_validator___har_validator_5.1.3.tgz"; path = fetchurl { @@ -424,7 +377,6 @@ sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; }; } - { name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { @@ -433,7 +385,6 @@ sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; } - { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -442,7 +393,6 @@ sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } - { name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { @@ -451,7 +401,6 @@ sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; } - { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -460,7 +409,6 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } - { name = "ip_regex___ip_regex_1.0.3.tgz"; path = fetchurl { @@ -469,7 +417,6 @@ sha1 = "dc589076f659f419c222039a33316f1c7387effd"; }; } - { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { @@ -478,7 +425,6 @@ sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } - { name = "is_date_object___is_date_object_1.0.1.tgz"; path = fetchurl { @@ -487,7 +433,6 @@ sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; } - { name = "is_function___is_function_1.0.1.tgz"; path = fetchurl { @@ -496,7 +441,6 @@ sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; } - { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { @@ -505,7 +449,6 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } - { name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { @@ -514,7 +457,6 @@ sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; } - { name = "is_symbol___is_symbol_1.0.2.tgz"; path = fetchurl { @@ -523,7 +465,6 @@ sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; }; } - { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -532,7 +473,6 @@ sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; } - { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { @@ -541,7 +481,6 @@ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } - { name = "jimp___jimp_0.2.28.tgz"; path = fetchurl { @@ -550,7 +489,6 @@ sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; }; } - { name = "jpeg_js___jpeg_js_0.2.0.tgz"; path = fetchurl { @@ -559,7 +497,6 @@ sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; }; } - { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -568,7 +505,6 @@ sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; } - { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -577,7 +513,6 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } - { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -586,7 +521,6 @@ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; } - { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { @@ -595,7 +529,6 @@ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; } - { name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { @@ -604,7 +537,6 @@ sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; } - { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { @@ -613,7 +545,6 @@ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } - { name = "load_bmfont___load_bmfont_1.4.0.tgz"; path = fetchurl { @@ -622,7 +553,6 @@ sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; }; } - { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -631,7 +561,6 @@ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; } - { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { @@ -640,7 +569,6 @@ sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; }; } - { name = "mime_db___mime_db_1.38.0.tgz"; path = fetchurl { @@ -649,7 +577,6 @@ sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; }; } - { name = "mime_types___mime_types_2.1.22.tgz"; path = fetchurl { @@ -658,7 +585,6 @@ sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; }; } - { name = "mime___mime_1.6.0.tgz"; path = fetchurl { @@ -667,7 +593,6 @@ sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } - { name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { @@ -676,7 +601,6 @@ sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; } - { name = "minimist___minimist_0.0.8.tgz"; path = fetchurl { @@ -685,7 +609,6 @@ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; } - { name = "minimist___minimist_1.2.0.tgz"; path = fetchurl { @@ -694,7 +617,6 @@ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; } - { name = "mkdirp___mkdirp_0.5.1.tgz"; path = fetchurl { @@ -703,7 +625,6 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } - { name = "oauth_sign___oauth_sign_0.9.0.tgz"; path = fetchurl { @@ -712,7 +633,6 @@ sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; }; } - { name = "object_keys___object_keys_1.1.0.tgz"; path = fetchurl { @@ -721,7 +641,6 @@ sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; }; } - { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -730,7 +649,6 @@ sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; }; } - { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { @@ -739,7 +657,6 @@ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; } - { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { @@ -748,7 +665,6 @@ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; } - { name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; path = fetchurl { @@ -757,7 +673,6 @@ sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; }; } - { name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; path = fetchurl { @@ -766,7 +681,6 @@ sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; }; } - { name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; path = fetchurl { @@ -775,7 +689,6 @@ sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389"; }; } - { name = "parse_headers___parse_headers_2.0.2.tgz"; path = fetchurl { @@ -784,7 +697,6 @@ sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; }; } - { name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { @@ -793,7 +705,6 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } - { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -802,7 +713,6 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } - { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { @@ -811,7 +721,6 @@ sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; } - { name = "phin___phin_2.9.3.tgz"; path = fetchurl { @@ -820,7 +729,6 @@ sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; }; } - { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -829,7 +737,6 @@ sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; } - { name = "pixelmatch___pixelmatch_4.0.2.tgz"; path = fetchurl { @@ -838,7 +745,6 @@ sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; } - { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { @@ -847,7 +753,6 @@ sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; } - { name = "png_to_ico___png_to_ico_1.0.7.tgz"; path = fetchurl { @@ -856,7 +761,6 @@ sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; }; } - { name = "pngjs___pngjs_3.4.0.tgz"; path = fetchurl { @@ -865,7 +769,6 @@ sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; }; } - { name = "process___process_0.5.2.tgz"; path = fetchurl { @@ -874,7 +777,6 @@ sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; } - { name = "psl___psl_1.1.31.tgz"; path = fetchurl { @@ -883,7 +785,6 @@ sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; }; } - { name = "punycode___punycode_1.4.1.tgz"; path = fetchurl { @@ -892,7 +793,6 @@ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; } - { name = "punycode___punycode_2.1.1.tgz"; path = fetchurl { @@ -901,7 +801,6 @@ sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; }; } - { name = "qs___qs_6.5.2.tgz"; path = fetchurl { @@ -910,7 +809,6 @@ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } - { name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { @@ -919,7 +817,6 @@ sha1 = "5f68cab307e663f19993527d9b589cace4661194"; }; } - { name = "request___request_2.88.0.tgz"; path = fetchurl { @@ -928,7 +825,6 @@ sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; }; } - { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -937,7 +833,6 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } - { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -946,7 +841,6 @@ sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; }; } - { name = "sax___sax_1.2.4.tgz"; path = fetchurl { @@ -955,7 +849,6 @@ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } - { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { @@ -964,7 +857,6 @@ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; } - { name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { @@ -973,7 +865,6 @@ sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; }; } - { name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; path = fetchurl { @@ -982,7 +873,6 @@ sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; }; } - { name = "stream_to___stream_to_0.2.2.tgz"; path = fetchurl { @@ -991,7 +881,6 @@ sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; }; } - { name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; path = fetchurl { @@ -1000,7 +889,6 @@ sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; }; } - { name = "tinycolor2___tinycolor2_1.4.1.tgz"; path = fetchurl { @@ -1009,7 +897,6 @@ sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; }; } - { name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { @@ -1018,7 +905,6 @@ sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; }; } - { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -1027,7 +913,6 @@ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; } - { name = "tweetnacl___tweetnacl_0.14.5.tgz"; path = fetchurl { @@ -1036,7 +921,6 @@ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } - { name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { @@ -1045,7 +929,6 @@ sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; }; } - { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { @@ -1054,7 +937,6 @@ sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; }; } - { name = "url_regex___url_regex_3.2.0.tgz"; path = fetchurl { @@ -1063,7 +945,6 @@ sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; }; } - { name = "uuid___uuid_3.3.2.tgz"; path = fetchurl { @@ -1072,7 +953,6 @@ sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; }; } - { name = "verror___verror_1.10.0.tgz"; path = fetchurl { @@ -1081,7 +961,6 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } - { name = "winreg___winreg_1.2.4.tgz"; path = fetchurl { @@ -1090,7 +969,6 @@ sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; }; } - { name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; path = fetchurl { @@ -1099,7 +977,6 @@ sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; }; } - { name = "xhr___xhr_2.5.0.tgz"; path = fetchurl { @@ -1108,7 +985,6 @@ sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; }; } - { name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; path = fetchurl { @@ -1117,7 +993,6 @@ sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; }; } - { name = "xml2js___xml2js_0.4.19.tgz"; path = fetchurl { @@ -1126,7 +1001,6 @@ sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; }; } - { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; path = fetchurl { @@ -1135,7 +1009,6 @@ sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; } - { name = "xtend___xtend_4.0.1.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 7400393d92ba..2c4557f2cc08 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,32 +1,26 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }: -# Note for maintainers: -# Versions of `riot-web` and `riot-desktop` should be kept in sync. - -with (import ./yarn2nix.nix { inherit pkgs; }); +# Notes for maintainers: +# * versions of `riot-web` and `riot-desktop` should be kept in sync. +# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` let executableName = "riot-desktop"; - version = "1.3.0"; + version = "1.3.3"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; + sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; }; -in mkYarnPackage rec { +in yarn2nix-moretea.mkYarnPackage rec { name = "riot-desktop-${version}"; inherit version; src = "${riot-web-src}/electron_app"; - # The package manifest should be copied on each update of this package. - # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json packageJSON = ./riot-desktop-package.json; - - # The dependency expression can be regenerated using nixos.yarn2nix with the following command: - # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix yarnNix = ./riot-desktop-yarndeps.nix; nativeBuildInputs = [ makeWrapper ]; @@ -36,7 +30,9 @@ in mkYarnPackage rec { mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" - cp -r '.' "$out/share/riot/electron" + cp -r './deps/riot-web' "$out/share/riot/electron" + rm "$out/share/riot/electron/node_modules" + cp -r './node_modules' "$out/share/riot/electron" # icons for icon in $out/share/riot/electron/build/icons/*.png; do @@ -49,7 +45,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -65,7 +61,7 @@ in mkYarnPackage rec { # * category and StartupWMClass from the build.linux section of # https://github.com/vector-im/riot-web/blob/develop/package.json desktopItem = makeDesktopItem { - inherit name; + name = "riot"; exec = executableName; icon = "riot"; desktopName = "Riot"; @@ -82,7 +78,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron.meta) platforms; + inherit (electron_5.meta) platforms; }; } - diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 9a2e2df80f29..383952f2a893 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.3.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; + sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh new file mode 100755 index 000000000000..b646a9e03adf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the Yarn dependency lock files for the riot-desktop package." + echo "Usage: $0 <git release tag>" + exit 1 +fi + +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1" + +wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json +wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock +yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix +rm riot-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix deleted file mode 100644 index 5dd79fdf1d86..000000000000 --- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix +++ /dev/null @@ -1,320 +0,0 @@ -{ pkgs ? import <nixpkgs> {} -, nodejs ? pkgs.nodejs -, yarn ? pkgs.yarn -}: - -let - inherit (pkgs) stdenv lib fetchurl linkFarm; -in rec { - # Export yarn again to make it easier to find out which yarn was used. - inherit yarn; - - # Re-export pkgs - inherit pkgs; - - unlessNull = item: alt: - if item == null then alt else item; - - reformatPackageName = pname: - let - # regex adapted from `validate-npm-package-name` - # will produce 3 parts e.g. - # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ] - # "somepackage" -> [ null null "somepackage" ] - parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname); - # if there is no organisation we need to filter out null values. - non-null = builtins.filter (x: x != null) parts; - in builtins.concatStringsSep "-" non-null; - - # https://docs.npmjs.com/files/package.json#license - # TODO: support expression syntax (OR, AND, etc) - spdxLicense = licstr: - if licstr == "UNLICENSED" then - lib.licenses.unfree - else - lib.findFirst - (l: l ? spdxId && l.spdxId == licstr) - { shortName = licstr; } - (builtins.attrValues lib.licenses); - - # Generates the yarn.nix from the yarn.lock file - mkYarnNix = yarnLock: - pkgs.runCommand "yarn.nix" {} - "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; - - # Loads the generated offline cache. This will be used by yarn as - # the package source. - importOfflineCache = yarnNix: - let - pkg = import yarnNix { inherit fetchurl linkFarm; }; - in - pkg.offline_cache; - - defaultYarnFlags = [ - "--offline" - "--frozen-lockfile" - "--ignore-engines" - "--ignore-scripts" - ]; - - mkYarnModules = { - name, - pname, - packageJSON, - yarnLock, - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - pkgConfig ? {}, - preBuild ? "", - workspaceDependencies ? [], - }: - let - offlineCache = importOfflineCache yarnNix; - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key} . buildInputs or [] - ) (builtins.attrNames pkgConfig))); - postInstall = (builtins.map (key: - if (pkgConfig.${key} ? postInstall) then - '' - for f in $(find -L -path '*/node_modules/${key}' -type d); do - (cd "$f" && (${pkgConfig.${key}.postInstall})) - done - '' - else - "" - ) (builtins.attrNames pkgConfig)); - workspaceJSON = pkgs.writeText - "${name}-workspace-package.json" - (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat - workspaceDependencyLinks = lib.concatMapStringsSep "\n" - (dep: '' - mkdir -p "deps/${dep.pname}" - ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json" - '') - workspaceDependencies; - in stdenv.mkDerivation { - inherit preBuild name; - phases = ["configurePhase" "buildPhase"]; - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - configurePhase = '' - # Yarn writes cache directories etc to $HOME. - export HOME=$PWD/yarn_home - ''; - - buildPhase = '' - runHook preBuild - - mkdir -p "deps/${pname}" - cp ${packageJSON} "deps/${pname}/package.json" - cp ${workspaceJSON} ./package.json - cp ${yarnLock} ./yarn.lock - chmod +w ./yarn.lock - - yarn config --offline set yarn-offline-mirror ${offlineCache} - - # Do not look up in the registry, but in the offline cache. - # TODO: Ask upstream to fix this mess. - sed -i -E '/resolved /{s|https://registry.yarnpkg.com/||;s|[@/:-]|_|g}' yarn.lock - - ${workspaceDependencyLinks} - yarn install ${lib.escapeShellArgs yarnFlags} - - ${lib.concatStringsSep "\n" postInstall} - - mkdir $out - mv node_modules $out/ - mv deps $out/ - patchShebangs $out - ''; - }; - - # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into - # the shell-hook environment. - linkNodeModulesHook = '' - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Replacing." - rm -rf node_modules - fi - - ln -s "$node_modules" node_modules - ''; - - mkYarnWorkspace = { - src, - packageJSON ? src+"/package.json", - yarnLock ? src+"/yarn.lock", - packageOverrides ? {}, - ... - }@attrs: - let - package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; - globElemToRegex = lib.replaceStrings ["*"] [".*"]; - # PathGlob -> [PathGlobElem] - splitGlob = lib.splitString "/"; - # Path -> [PathGlobElem] -> [Path] - # Note: Only directories are included, everything else is filtered out - expandGlobList = base: globElems: - let - elemRegex = globElemToRegex (lib.head globElems); - rest = lib.tail globElems; - children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base)); - matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children; - in if globElems == [] - then [ base ] - else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren; - # Path -> PathGlob -> [Path] - expandGlob = base: glob: expandGlobList base (splitGlob glob); - packagePaths = lib.concatMap (expandGlob src) packageGlobs; - packages = lib.listToAttrs (map (src: - let - packageJSON = src+"/package.json"; - package = lib.importJSON packageJSON; - allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]); - in rec { - name = reformatPackageName package.name; - value = mkYarnPackage (builtins.removeAttrs attrs ["packageOverrides"] // { - inherit src packageJSON yarnLock; - workspaceDependencies = lib.mapAttrsToList (name: version: packages.${name}) - (lib.filterAttrs (name: version: packages ? ${name}) allDependencies); - } // lib.attrByPath [name] {} packageOverrides); - }) packagePaths); - in packages; - - mkYarnPackage = { - name ? null, - src, - packageJSON ? src + "/package.json", - yarnLock ? src + "/yarn.lock", - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - yarnPreBuild ? "", - pkgConfig ? {}, - extraBuildInputs ? [], - publishBinsFor ? null, - workspaceDependencies ? [], - ... - }@attrs: - let - package = lib.importJSON packageJSON; - pname = package.name; - safeName = reformatPackageName pname; - version = package.version; - baseName = unlessNull name "${safeName}-${version}"; - deps = mkYarnModules { - name = "${safeName}-modules-${version}"; - preBuild = yarnPreBuild; - workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname yarnLock yarnNix yarnFlags pkgConfig; - }; - publishBinsFor_ = unlessNull publishBinsFor [pname]; - linkDirFunction = '' - linkDirToDirLinks() { - target=$1 - if [ ! -f "$target" ]; then - mkdir -p "$target" - elif [ -L "$target" ]; then - local new=$(mktemp -d) - trueSource=$(realpath "$target") - if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then - ln -s $trueSource/* $new/ - fi - rm -r "$target" - mv "$new" "$target" - fi - } - ''; - workspaceDependenciesTransitive = lib.unique ((lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies); - workspaceDependencyCopy = lib.concatMapStringsSep "\n" - (dep: '' - # ensure any existing scope directory is not a symlink - linkDirToDirLinks "$(dirname node_modules/${dep.pname})" - mkdir -p "deps/${dep.pname}" - tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1 - if [ ! -e "deps/${dep.pname}/node_modules" ]; then - ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules" - fi - '') - workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { - inherit src; - - name = baseName; - - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - node_modules = deps + "/node_modules"; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - for localDir in npm-packages-offline-cache node_modules; do - if [[ -d $localDir || -L $localDir ]]; then - echo "$localDir dir present. Removing." - rm -rf $localDir - fi - done - - mkdir -p "deps/${pname}" - shopt -s extglob - cp -r !(deps) "deps/${pname}" - shopt -u extglob - ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules" - - cp -r $node_modules node_modules - chmod -R +w node_modules - - ${linkDirFunction} - linkDirToDirLinks "$(dirname node_modules/${pname})" - ln -s "deps/${pname}" "node_modules/${pname}" - ${workspaceDependencyCopy} - - # Help yarn commands run in other phases find the package - echo "--cwd deps/${pname}" > .yarnrc - runHook postConfigure - ''; - - # Replace this phase on frontend packages where only the generated - # files are an interesting output. - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p $out/{bin,libexec/${pname}} - mv node_modules $out/libexec/${pname}/node_modules - mv deps $out/libexec/${pname}/deps - node ${./nix/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_} - - runHook postInstall - ''; - - doDist = true; - distPhase = attrs.distPhase or '' - # pack command ignores cwd option - rm -f .yarnrc - cd $out/libexec/${pname}/deps/${pname} - mkdir -p $out/tarballs/ - yarn pack --ignore-scripts --filename $out/tarballs/${baseName}.tgz - ''; - - passthru = { - inherit pname package packageJSON deps; - workspaceDependencies = workspaceDependenciesTransitive; - } // (attrs.passthru or {}); - - meta = { - inherit (nodejs.meta) platforms; - description = packageJSON.description or ""; - homepage = packageJSON.homepage or ""; - version = packageJSON.version or ""; - license = if packageJSON ? license then spdxLicense packageJSON.license else ""; - } // (attrs.meta or {}); - }); - - yarn2nix = mkYarnPackage { - src = ./.; - # yarn2nix is the only package that requires the yarnNix option. - # All the other projects can auto-generate that file. - yarnNix = ./yarn.nix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fa72d234ce9b..0b4c3aade87d 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/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index ab84ee6ec0fe..96eef843d5b9 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg -, at-spi2-atk }: +, at-spi2-atk, libuuid, at-spi2-core }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.50.0.38"; + version = "8.51.0.72"; rpath = stdenv.lib.makeLibraryPath [ alsaLib atk at-spi2-atk + at-spi2-core cairo cups curl @@ -23,6 +24,7 @@ let glib glibc libsecret + libuuid gnome2.GConf gdk-pixbuf @@ -58,7 +60,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1g0aacp4qgzp3018w1s685yr3ssqlw0z2x6ifrj01k4ig82jfkn6"; + sha256 = "1rv3jxirlfy0gvphw8cxmwmghbak5m5wj0y3bgamcvma48mzdfk3"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 94c02ab0226a..27b8aaf887a3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -6,7 +6,7 @@ at-spi2-atk, libuuid, nodePackages let - version = "4.0.1"; + version = "4.0.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -51,7 +51,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1g7c8jka750pblsfzjvfyf7sp1m409kybqagml9miif1v71scxv2"; + sha256 = "053j5py16ilpwy868rhh5l2g93xj1fq4fwxrsi2bkfsnmq261hkm"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 21a98676290d..15cec96afc77 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/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix deleted file mode 100644 index 77a8d57f8b6f..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchgit -, qtbase, qtmultimedia, qtquick1, qtquickcontrols -, qtimageformats, qtgraphicaleffects, qtwebkit -, telegram-qml, libqtelegram-aseman-edition -, gst_all_1 -, makeWrapper, qmake }: - -stdenv.mkDerivation rec { - name = "cutegram-${meta.version}"; - - src = fetchgit { - url = "https://github.com/Aseman-Land/Cutegram.git"; - rev = "1dbe2792fb5a1760339379907f906e236c09db84"; - sha256 = "146vd3ri05da2asxjjxibnqmb685lgwl2kaz7mwb7ja7vi4149f0"; - }; - - buildInputs = - [ qtbase qtmultimedia qtquick1 qtquickcontrols - qtimageformats qtgraphicaleffects qtwebkit - telegram-qml libqtelegram-aseman-edition - ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - - - enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper qmake ]; - - fixupPhase = '' - wrapProgram $out/bin/cutegram \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with stdenv.lib; { - version = "2.7.1"; - description = "Telegram client forked from sigram"; - homepage = http://aseman.co/en/products/cutegram/; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} -#TODO: appindicator, for system tray plugin diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix deleted file mode 100644 index 49368da708e9..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake }: - -stdenv.mkDerivation rec { - name = "libqtelegram-aseman-edition-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "libqtelegram-aseman-edition"; - rev = "v${meta.version}-stable"; - sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6"; - }; - - buildInputs = [ qtbase qtmultimedia qtquick1 ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" - substituteInPlace libqtelegram-ae.pro --replace "/\$\$LIB_PATH" "" - ''; - - meta = with stdenv.lib; { - version = "6.1"; - description = "A fork of libqtelegram by Aseman, using qmake"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 13c03b419097..3d88e50221d6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchsvn -, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 +{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -7,15 +7,17 @@ with lib; mkDerivation rec { - name = "telegram-desktop-${version}"; - version = "1.7.14"; + pname = "telegram-desktop"; + version = "1.8.2"; + # Note: Due to our strong dependency on the Arch patches it's probably best + # to also wait for the Arch update (especially if the patches don't apply). # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; + sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j"; fetchSubmodules = true; }; @@ -23,16 +25,21 @@ 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"; }; + # Note: It would be best if someone could get as many patches upstream as + # possible (we currently depend a lot on custom patches...). patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/no-gtk2.patch" # "${archPatches}/Use-system-wide-font.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" - "${archPatches}/issue6219.patch" ]; postPatch = '' @@ -42,12 +49,12 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; - # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; dontWrapQtApps = true; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ]; + buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 @@ -79,8 +86,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 @@ -151,6 +161,10 @@ mkDerivation rec { meta = { description = "Telegram Desktop messaging app"; + longDescription = '' + Desktop client for the Telegram messenger, based on the Telegram API and + the MTProto secure protocol. + ''; license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix deleted file mode 100644 index c0b1de893c73..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchgit, libconfig, libevent, openssl -, readline, zlib, lua5_2, python, pkgconfig, jansson -, runtimeShell -}: - -stdenv.mkDerivation rec { - name = "telegram-cli-2016-03-23"; - - src = fetchgit { - url = "https://github.com/vysheng/tg.git"; - sha256 = "07sss5cnw2ygd7mp8f5532lmj7qm6ywqf4cjaq5g13i8igzqzwzj"; - rev = "6547c0b21b977b327b3c5e8142963f4bc246187a"; - }; - - buildInputs = [ - libconfig libevent openssl readline zlib - lua5_2 python pkgconfig jansson - ]; - installPhase = '' - mkdir -p $out/bin - cp ./bin/telegram-cli $out/bin/telegram-wo-key - cp ./tg-server.pub $out/ - cat > $out/bin/telegram-cli <<EOF - #!${runtimeShell} - $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" - EOF - chmod +x $out/bin/telegram-cli - ''; - - meta = { - description = "Command-line interface for Telegram messenger"; - homepage = https://telegram.org/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix deleted file mode 100644 index 0efa7bee1d0b..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake -, libqtelegram-aseman-edition }: - -stdenv.mkDerivation rec { - name = "telegram-qml-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "TelegramQML"; - rev = "v${meta.version}"; - sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499"; - }; - - propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" - substituteInPlace telegramqml.pro --replace "INSTALL_HEADERS_PREFIX/telegramqml" "INSTALL_HEADERS_PREFIX" - ''; - - qmakeFlags = [ "BUILD_MODE+=lib" ]; - - meta = with stdenv.lib; { - version = "0.9.2"; - description = "Telegram API tools for QtQml and Qml"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 10b7eb7d439f..36bd10781dc5 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -18,13 +18,13 @@ let pname = "wire-desktop"; version = { - "x86_64-linux" = "3.9.2895"; - "x86_64-darwin" = "3.9.2943"; + "x86_64-linux" = "3.10.2904"; + "x86_64-darwin" = "3.10.3133"; }.${system} or throwSystem; sha256 = { - "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; - "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k"; + "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; + "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix new file mode 100644 index 000000000000..5648d027d9e2 --- /dev/null +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -0,0 +1,38 @@ +{ appimageTools, fetchurl, lib }: + +let + pname = "irccloud"; + version = "0.13.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; + sha256 = "0ff69m5jav2c90918avsr5wvik2gds3klij3dzhkb352fgrd1s0l"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ + $out/share/icons/hicolor/512x512/apps/irccloud.png + substituteInPlace $out/share/applications/irccloud.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A desktop client for IRCCloud"; + homepage = "https://www.irccloud.com"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightbulbjim ]; + }; +} diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 347b7b28ca93..5aca2c49d14b 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses glib openssl perl libintl ]; + buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; configureFlags = [ "--with-proxy" "--with-bot" "--with-perl=yes" + "--with-otr=yes" "--enable-true-color" ]; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix deleted file mode 100644 index add4fa632c91..000000000000 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "irssi-otr-${version}"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "cryptodotis"; - repo = "irssi-otr"; - rev = "v${version}"; - sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp"; - }; - - preConfigure = "sh ./bootstrap"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libotr automake autoconf libtool glib irssi ]; - - NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/"; - - meta = { - homepage = https://github.com/cryptodotis/irssi-otr; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 439e0e116141..cd9ecbf43370 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -6,7 +6,7 @@ }; weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { - inherit (luaPackages) cjson; + inherit (luaPackages) cjson luaffi; }; wee-slack = callPackage ./wee-slack { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 233fe418df3a..ea5052f37a3f 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation { mkdir -p $out/{share,lib} cp {matrix.lua,olm.lua} $out/share - cp ${cjson}/lib/lua/5.2/cjson.so $out/lib/cjson.so + cp ${cjson}/lib/lua/${cjson.lua.luaversion}/cjson.so $out/lib/cjson.so cp ${olm}/lib/libolm.so $out/lib/libolm.so - cp ${luaffi}/lib/ffi.so $out/lib/ffi.so + cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index c773aecf2894..e6fa95488e10 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -56,7 +56,7 @@ let init = let init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); - mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); + mkScript = drv: lib.forEach drv.scripts (script: "/script load ${drv}/share/${script}"); scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) [ ] (config.scripts or [])); diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix new file mode 100644 index 000000000000..bfacac2eaf4d --- /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/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index bb62014c77a4..17a3b92e2f97 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -2,7 +2,6 @@ , openldap }: -# NOTE: Please check if any changes here are applicable to ../realpine/ as well stdenv.mkDerivation rec { name = "alpine-${version}"; version = "2.21"; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix new file mode 100644 index 000000000000..7019c309feb9 --- /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/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index e2b56f3b8afd..90c8590d52d1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0jpaxlfxz7mj76z3cyj8sq053p0mkp46kaw05nimzwaq5yx923fv"; + sha256 = "0vhac8yjnhb1gz60jfzg27spyn96c1rr849gc6vjym5xamw7zp0v"; }; nativeBuildInputs = [ gawk mercury pandoc ]; 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 5bb24c9ded7e..000000000000 --- 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/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix deleted file mode 100644 index f53c5d61050a..000000000000 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos -, openldap -}: -# NOTE: Please check if any changes here are applicable to ../alpine/ as well -let - baseName = "re-alpine"; - version = "2.03"; -in -stdenv.mkDerivation { - name = "${baseName}-${version}"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/re-alpine/re-alpine-${version}.tar.bz2"; - sha256 = "11xspzbk9cwmklmcw6rxsan7j71ysd4m9c7qldlc59ck595k5nbh"; - }; - - buildInputs = [ - ncurses tcl openssl pam kerberos openldap - ]; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - "--with-ssl-include-dir=${openssl.dev}/include/openssl" - "--with-tcl-lib=${tcl.libPrefix}" - "--with-passfile=.pine-passfile" - ]; - - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; - - meta = { - description = "Console mail reader"; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = https://sourceforge.net/projects/re-alpine/; - downloadPage = "https://sourceforge.net/projects/re-alpine/files/"; - }; -} diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index d31f98ef4ba6..6dcc35f44d33 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,7 +1,22 @@ -{ stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }: +{ stdenv +, pkgconfig +, python3 +, fetchhg +, gtk3 +, glib +, gdbm +, gtkspell3 +, ofono +, itstool +, libappindicator-gtk3 +, perlPackages +, glibcLocales +, meson +, ninja +}: stdenv.mkDerivation rec { - name = "modem-manager-gui-${version}"; + pname = "modem-manager-gui"; version = "0.0.19.1"; src = fetchhg { @@ -10,14 +25,11 @@ stdenv.mkDerivation rec { sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; }; - LC_ALL = "en_US.utf-8"; - nativeBuildInputs = [ pkgconfig python3 perlPackages.Po4a itstool - glibcLocales meson ninja ]; @@ -27,6 +39,7 @@ stdenv.mkDerivation rec { glib gdbm gtkspell3 + ofono libappindicator-gtk3 ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2cbf83c16aee..b0786d742db7 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.7"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b"; + sha256 = "1hjndcdkin98l6jv39r98zfw33qg0gnvlv8q80qsj5x36a19d4v9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index 185672a21f8c..babb3812bb92 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -12,10 +12,10 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib - ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1 + ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1 ${lib.optionalString (mumble_i686 != null) '' mkdir -p $out/lib32 - ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1 + ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1 ''} install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 44355c2c181d..6d7a8bd6c430 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { cp ndppd.conf-dist $out/etc/ndppd.conf ''; - meta = { + meta = with stdenv.lib; { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; - license = stdenv.lib.licenses.gpl3; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fadenb ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ fadenb globin ]; }; } diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch new file mode 100644 index 000000000000..ab7cb9bffa45 --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -0,0 +1,25 @@ +From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 23 Aug 2019 00:19:20 +0200 +Subject: [PATCH] Explicitly copy dbus files into the store dir + +--- + shell_integration/libcloudproviders/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt +index 1f35335..7f76951 100644 +--- a/shell_integration/libcloudproviders/CMakeLists.txt ++++ b/shell_integration/libcloudproviders/CMakeLists.txt +@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable) + ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable) + + macro(dbus_add_activation_service _sources) +- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) ++ set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") + foreach (_i ${_sources}) + get_filename_component(_service_file ${_i} ABSOLUTE) + string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) +-- +2.19.2 + diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 37eb248fb486..6f7f47bdcfa0 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,46 +1,63 @@ -{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, wrapQtAppsHook, openssl_1_1, pcre, qtwebengine, libsecret +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, inotify-tools , libcloudproviders +, libsecret +, openssl +, pcre +, pkgconfig +, qtbase +, qtkeychain +, qttools +, qtwebengine +, qtwebkit +, sqlite }: -stdenv.mkDerivation rec { - name = "nextcloud-client-${version}"; - version = "2.5.2"; +mkDerivation rec { + pname = "nextcloud-client"; + version = "2.5.3"; - src = fetchgit { - url = "git://github.com/nextcloud/desktop.git"; - rev = "refs/tags/v${version}"; - sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "nextcloud"; + repo = "desktop"; + rev = "v${version}"; + sha256 = "1pzlq507fasf2ljf37gkw00qrig4w2r712rsy05zfwlncgcn7fnw"; }; - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; - - enableParallelBuilding = true; + patches = [ + ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch + ]; - NIX_LDFLAGS = "${openssl_1_1.out}/lib/libssl.so ${openssl_1_1.out}/lib/libcrypto.so"; + nativeBuildInputs = [ + pkgconfig + cmake + ]; - cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" - "-DCMAKE_BUILD_TYPE=Release" - "-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" - "-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" - "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" - "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" + buildInputs = [ + inotify-tools + libcloudproviders + openssl + pcre + qtbase + qtkeychain + qttools + qtwebengine + qtwebkit + sqlite ]; qtWrapperArgs = [ - ''--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}'' + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" ]; - postInstall = '' - sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ - $out/share/applications/nextcloud.desktop - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Nextcloud themed desktop client"; homepage = https://nextcloud.com; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 715d8e13ec30..eaa6b07c8fae 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,20 +1,24 @@ { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib -, libpulseaudio, libopus, libogg }: +, libpulseaudio, libopus, libogg, jansson }: stdenv.mkDerivation rec { - name = "gnunet-0.11.0"; + pname = "gnunet"; + version = "0.11.6"; src = fetchurl { - url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"; + url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; + sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q"; }; + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; buildInputs = [ - adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn - libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses - pkgconfig sqlite zlib libpulseaudio libopus libogg + adns curl gmp gnutls libextractor libgcrypt libgnurl libidn + libmicrohttpd libunistring libxml2 ncurses gettext + sqlite zlib libpulseaudio libopus libogg jansson ]; preConfigure = '' @@ -29,26 +33,18 @@ stdenv.mkDerivation rec { find . \( -iname \*test\*.c -or -name \*.conf \) | \ xargs sed -ie "s|/tmp|$TMPDIR|g" - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - patchShebangs src/gns/nss/install-nss-plugin.sh - sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \ src/regex/Makefile.in \ src/fs/Makefile.in ''; + # unfortunately, there's still a few failures with impure tests doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ + checkPhase = '' + export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; meta = with stdenv.lib; { description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; @@ -69,9 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = https://gnunet.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix new file mode 100644 index 000000000000..80b8251f2a3f --- /dev/null +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "stig"; + # This project has a different concept for pre release / alpha, + # Read the project's README for details: https://github.com/rndusr/stig#stig + version = "0.10.1a"; + + src = fetchFromGitHub { + owner = "rndusr"; + repo = "stig"; + rev = "v${version}"; + sha256 = "076rlial6h1nhwdxf1mx5nf2zld5ci43cadj9wf8xms7zn8s6c8v"; + }; + + # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged + # in nixpkgs) is not uploaded to pypi and 1.0.1 has a problematic `setup.py`. + # As long as we don't have any problems installing it, no special features / specific bugs + # were fixed in 1.0.3 that aren't available in 1.0.2 are used by stig. + # See https://github.com/rndusr/stig/issues/120 + postPatch = '' + substituteInPlace setup.py \ + --replace "urwidtrees>=1.0.3dev0" "urwidtrees" + ''; + + buildInputs = with python3.pkgs; [ + urwid + urwidtrees + aiohttp + async-timeout + pyxdg + blinker + natsort + maxminddb + setproctitle + ]; + + checkInputs = with python3.pkgs; [ + asynctest + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "TUI and CLI for the BitTorrent client Transmission"; + homepage = "https://github.com/rndusr/stig"; + license = licenses.gpl3; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 1f70cb56b54f..bf5f5df934d1 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -58,7 +58,7 @@ let versions = [ "13.8.0" "13.9.0" "13.9.1" ]; in lib.listToAttrs - (lib.flip map versions + (lib.forEach versions (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); in deprecatedVersions // supportedVersions; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 745ad7a9c5d7..cf89666a379e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -62,7 +62,7 @@ let versions = [ ]; in lib.listToAttrs - (lib.flip map versions + (lib.forEach versions (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}"))); in deprecatedVersions // supportedVersions; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix deleted file mode 100644 index 99835627f879..000000000000 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: - -stdenv.mkDerivation rec { - name = "ssvnc-${version}"; - version = "1.0.29"; - - src = fetchurl { - url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz"; - sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d"; - }; - - buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; - - dontUseImakeConfigure = true; - - makeFlags = "PREFIX=$(out)"; - - hardeningDisable = [ "format" ]; - - postInstall = '' - sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl - sed -i -e 's|/usr/bin/perl|${perl}/bin/perl|' $out/lib/ssvnc/util/ss_vncviewer - ''; - - meta = { - description = "VNC viewer that adds encryption security to VNC connections"; - homepage = http://www.karlrunge.com/x11vnc/ssvnc.html; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 949c85bf9427..9227cad52496 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: +{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus +, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc +, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes +, wrapQtAppsHook +}: - -stdenv.mkDerivation rec { +mkDerivation rec { name = "teamviewer-${version}"; - version = "14.4.2669"; + version = "14.5.1691"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za"; + sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc"; }; unpackPhase = '' @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; @@ -41,13 +44,18 @@ stdenv.mkDerivation rec { --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ --replace '/var/run/' '/run/' - wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + + wrapQtApp $out/bin/teamviewer ''; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 543afc696ea0..e93410d2669c 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools -, seafile-shared, ccnet, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +, seafile-shared, ccnet , withShibboleth ? true, qtwebengine }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { version = "6.2.11"; name = "seafile-client-${version}"; @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj"; }; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qttools seafile-shared ] ++ optional withShibboleth qtwebengine; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] ++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; - postInstall = '' - wrapProgram $out/bin/seafile-applet \ - --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]} - ''; + qtWrapperArgs = [ + "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}" + ]; meta = with stdenv.lib; { homepage = https://github.com/haiwen/seafile-client; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 13d536ccf1bb..10c8c4235e54 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,34 +1,23 @@ { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre -, openssl, ncurses, glib, gtk2, atk, pango, flex, bison -, fetchpatch }: +, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip +, pkgconfig }: stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; + sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-8366.patch"; - url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch"; - sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m"; - }) - (fetchpatch { - name = "CVE-2017-6430.patch"; - url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch"; - sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4"; - }) - ]; - + strictDeps = true; + nativeBuildInputs = [ cmake flex bison pkgconfig ]; buildInputs = [ - cmake libpcap libnet zlib curl pcre openssl ncurses - glib gtk2 atk pango flex bison + libpcap libnet zlib curl pcre openssl ncurses + glib gtk3 atk pango geoip ]; preConfigure = '' @@ -37,8 +26,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DBUNDLED_LIBS=Off" + "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 643e421625f2..aa965a0c8683 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - bison cmake extra-cmake-modules flex pkgconfig + bison cmake flex pkgconfig ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 40026275a1e3..8d6d5e2a4f94 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -1,13 +1,13 @@ { appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }: let - pname = "patchwork"; - version = "3.14.1"; + pname = "ssb-patchwork"; + version = "3.16.2"; name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage"; - sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd"; + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; + sha256 = "0hi9ysmwhiiww82a3mqdd2b1anj7qa41b46f6zb3q9d0b8nmvlz4"; }; binary = appimageTools.wrapType2 { @@ -20,8 +20,8 @@ let }; desktopItem = makeDesktopItem { - name = "patchwork"; - exec = "${binary}/bin/patchwork"; + name = "ssb-patchwork"; + exec = "${binary}/bin/ssb-patchwork"; icon = "ssb-patchwork.png"; comment = "Decentralized messaging and sharing app"; desktopName = "Patchwork"; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 13d55bcf476d..ce6765665774 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitHub { - owner = "ncw"; + owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0wxsn3ynkwh2np12sxdmy435nclg2ry7cw26brz11xc0ri4x9azg"; + sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga"; }; - modSha256 = "0bbpny7xcwsvhmdypgbbr0gqc5pa40m71qhbps6k0v09rsgqhpn3"; + modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 696ced2d2465..328561529ce5 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 cc916e069a00..5b847163a2a7 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 4a58a490cc5a..000000000000 --- 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/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 61cc3ea78f05..7b4feed1733a 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.2"; - _build = "450"; + _version = "2.8.4"; + _build = "453"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68"; + sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index fbf6047af605..b3b21174bc3a 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 a82999366627..fe33d72a2167 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-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index adec14748088..b5a721b5679b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; - sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; + name = "cairo-1.16.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; - md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; + md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; - sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; + name = "libcdr-0.1.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; + sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; md5 = ""; - md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; + md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -77,11 +77,11 @@ md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { - name = "libcmis-0.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; - sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; + name = "libcmis-0.5.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; - md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; + md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.63.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.63.0.tar.gz"; - sha256 = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41"; + name = "curl-7.65.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; md5 = ""; - md5name = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41-curl-7.63.0.tar.gz"; + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -119,11 +119,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; - sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + name = "libepoxy-1.5.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; - md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; + md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -140,11 +140,11 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; - sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; + name = "libetonyek-0.1.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; - md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; + md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -196,18 +196,18 @@ md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; - sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; - md5 = "134d8262145fc793c6af494dcace3e71"; - md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; + md5 = ""; + md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; - sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + name = "liberation-fonts-ttf-2.00.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + md5 = ""; + md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -231,6 +231,13 @@ 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"; + md5 = ""; + md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + } + { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; @@ -343,11 +350,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; - sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + name = "hunspell-1.7.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; - md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; + md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-61_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; - sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; + name = "icu4c-63_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; + sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; md5 = ""; - md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; + md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; } { - name = "icu4c-61_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; - sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; + name = "icu4c-63_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; + sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; md5 = ""; - md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; + md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,18 +455,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; - sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; + name = "libjpeg-turbo-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; - md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; + md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2018-04-23.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; - sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; + name = "language-subtag-registry-2019-04-03.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; + sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; md5 = ""; - md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; + md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -483,11 +490,11 @@ md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { - name = "libatomic_ops-7_2d.zip"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; - sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + name = "libatomic_ops-7.6.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; - md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; + md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -518,11 +525,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; - sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + name = "libnumbertext-1.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; + sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; md5 = ""; - md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; } { name = "ltm-1.0.zip"; @@ -532,11 +539,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.25.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; - sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; + name = "xmlsec1-1.2.27.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; + sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; md5 = ""; - md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; + md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; } { name = "libxml2-2.9.9.tar.gz"; @@ -574,18 +581,18 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; - sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; + name = "mdds-1.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; + sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; md5 = ""; - md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; + md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; } { - name = "mDNSResponder-576.30.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; - sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; + name = "mDNSResponder-878.200.35.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; - md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; + md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; @@ -602,13 +609,6 @@ md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } { - name = "mysql-connector-c++-1.1.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - } - { name = "mythes-1.2.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; @@ -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"; @@ -637,11 +637,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; md5 = ""; - md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -658,18 +658,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2p.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; - sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; + name = "openssl-1.0.2r.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; + sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; md5 = ""; - md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; + md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; } { - name = "liborcus-0.13.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; - sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; + name = "liborcus-0.14.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; + sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; md5 = ""; - md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; + md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3426.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; - sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; + name = "pdfium-3550.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; + sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; md5 = ""; - md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; + md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -700,39 +700,39 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.34.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; - sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; + name = "libpng-1.6.37.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; - md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; + md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.73.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; - sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; + name = "poppler-0.74.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; + sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; md5 = ""; - md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; + md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; } { - name = "postgresql-9.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; - sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + name = "postgresql-9.2.24.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + md5 = ""; + md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"; - sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"; + name = "Python-3.5.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; + sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; md5 = ""; - md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz"; + md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; } { - name = "libqxp-0.0.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; - sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + name = "libqxp-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; - md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; + md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -812,25 +812,25 @@ md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; - sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; + name = "libwpd-0.10.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; - md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; + md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; - sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; + name = "libwpg-0.3.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; - md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; + md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; - sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; + name = "libwps-0.4.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; + sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; md5 = ""; - md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; + md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bfb74d1bb507..4df8ce1059b4 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/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 8049a664e138..07f30a5525d5 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,8 +2,8 @@ rec { major = "6"; - minor = "1"; - patch = "5"; + minor = "2"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"; + sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index efcc4407842b..969325b00006 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -2,9 +2,9 @@ , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "15fdni68b3kyl6115v0d24cl0dp1hdjhkx571w086lrpz0fk9mfi"; + sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0bfjg14bnqlqwjcc3lkax0nfrhpm6nrqn7ycrmf4r3dzn10lgr64"; + sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; }; }; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; patches = [ ./xdg-open-brief.patch @@ -133,6 +133,9 @@ in stdenv.mkDerivation rec { # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # this I actually hate, this should be a data consistency test! @@ -141,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 @@ -152,6 +157,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -159,6 +165,77 @@ in stdenv.mkDerivation rec { sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" '' # This to avoid using /lib:/usr/lib at linking + '' @@ -183,7 +260,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do + for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a done @@ -235,6 +312,7 @@ in stdenv.mkDerivation rec { # We do tarball prefetching ourselves "--disable-fetch-external" + "--enable-build-opensymbol" # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though @@ -269,24 +347,25 @@ in stdenv.mkDerivation rec { make slowcheck ''; + nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ]; + buildInputs = with xorg; - [ ant ArchiveZip autoconf automake bison boost cairo clucene_core + [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib - neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler + gst_all_1.gst-plugins-base glib mysql.connector-c + neon nspr nss openldap openssl ORBit2 pam perl poppler python3 sablotron sane-backends unzip vigra which zip zlib - mdds bluez5 libcmis libwps libabw libzmf libtool + mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index a7887357cd30..afe8ba2f9178 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: +{ stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let version = "1.44.55"; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "mytetra-${version}"; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 02fbf92acbbb..ab32ebc67a7f 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets }: +{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv /* for isLinux */ }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qownnotes"; - version = "19.7.3"; + version = "19.8.6"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "1d4an3yzr77c6pz5cv1vbsrl2v5r62qdckk3l5y5dcv7jikb1l8l"; + sha256 = "a242dd15dc484baad39e737fe1af8529411f49a0d74994e6c78cf6bad4b733b6"; }; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets - ] ++ stdenv.lib.optional stdenv.isLinux qtwayland; + ] ++ lib.optional stdenv.isLinux qtwayland; - meta = with stdenv.lib; { + meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration"; homepage = https://www.qownnotes.org/; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eb2bebb39934..2cd441794a46 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/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index b02bf5058740..fbb8436f44c0 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme, makeDesktopItem }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme }: let description = "A note-taking application that knows programmers and Markdown better"; -in stdenv.mkDerivation rec { - version = "2.6"; +in mkDerivation rec { + version = "2.7.2"; pname = "vnote"; src = fetchFromGitHub { @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { repo = "vnote"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "10lnzzwz7fjj55kbn3j6gdl9yi6a85mdjis586p3zcc4830mlv91"; + sha256 = "0mk1ingcyznpwq4bfkxa8nx9yx5y3kgsmr4qffriq7bh1cx9dwjy"; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine hicolor-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { inherit description; homepage = "https://tamlok.github.io/vnote"; license = licenses.mit; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3d4f98ddd44f..f4c5e604ec49 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; - version = "5.0.71"; + version = "5.0.73"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "070b1ak870jv8h702a9g930p01jsmly93c44igw48ylbgqjyhlwq"; + sha256 = "0m2i3l0gy22h6c7rk39cd17vyksyz5l5py2fn9pza8lcbypkwf3l"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index fd8c542fb42e..bc297b791f62 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.08"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0idv6yr5l5z1icziv1shpjqxhjlxmb6qkpwlmcxws15gkqs9rhc9"; + sha256 = "0jbk03w0wfvd9lxh1wdazim9gwxm1lkhc5xzi3h8ag7h9zx58jq0"; }; 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 2b4a679accab..5bb561f14260 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 7e132efefbb1..747015d80eeb 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/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix new file mode 100644 index 000000000000..63e36fc9143c --- /dev/null +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -0,0 +1,74 @@ +{ +boost, +cm256cc, +cmake, +codec2, +fetchFromGitHub, +fftwFloat, +glew, +lib, +libav, +libiio, +libopus, +libpulseaudio, +libusb, +limesuite, +mkDerivation, +ocl-icd, +opencv3, +pkgconfig, +qtbase, +qtmultimedia, +qtwebsockets, +serialdv +}: + +let + + codec2' = codec2.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "drowe67"; + repo = "codec2"; + rev = "567346818c0d4d697773cf66d925fdb031e15668"; + sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa"; + }; + }); + +in mkDerivation rec { + pname = "sdrangel"; + version = "4.11.7"; + + src = fetchFromGitHub { + owner = "f4exb"; + repo = "sdrangel"; + rev = "v${version}"; + sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx"; + fetchSubmodules = false; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio + qtbase qtwebsockets qtmultimedia + fftwFloat + codec2' cm256cc serialdv + ]; + cmakeFlags = [ + "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" + "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" + "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so" + ]; + + LD_LIBRARY_PATH = "${ocl-icd}/lib"; + + meta = with lib; { + description = "Software defined radio (SDR) software"; + longDescription = '' + SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. + ''; + homepage = "https://github.com/f4exb/sdrangel"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ alkeryn ]; + }; +} diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 6e287b571d75..36d3f14818f0 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, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "wsjtx-${version}"; - version = "2.0.1"; + pname = "wsjtx"; + 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 wrapQtAppsHook ]; buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; @@ -29,16 +29,16 @@ 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. ''; - homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html; + homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html"; # 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 e92b420e58a4..fd7c40fdc13d 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 70c72779c52a..e6a5ab741d94 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.4"; + version = "2.20.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1z2zpwqhk8i7l9awajdrzxwij0vcmkwq7rajzjil7n65apj2hz9i"; + sha256 = "107zlvp74ahpn652nfkipp80bbzf3fp812pi1ma42njk4wchah10"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix new file mode 100644 index 000000000000..4adce4461ede --- /dev/null +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -0,0 +1,38 @@ +{ stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: + +stdenv.mkDerivation rec { + pname = "sortmerna"; + version = "3.0.3"; + + src = fetchFromGitHub { + repo = pname; + owner = "biocore"; + rev = "v${version}"; + sha256 = "0zx5fbzyr8wdr0zwphp8hhcn1xz43s5lg2ag4py5sv0pv5l1jh76"; + }; + + patches = [ + (fetchpatch { + name = "CMakeInstallPrefix.patch"; + url = "https://github.com/biocore/sortmerna/commit/4d36d620a3207e26cf3f588d4ec39889ea21eb79.patch"; + sha256 = "0hc3jwdr6ylbyigg52q8islqc0mb1k8rrjadvjfqaxnili099apd"; + }) + ]; + + nativeBuildInputs = [ cmake rapidjson pkgconfig ]; + buildInputs = [ zlib rocksdb rapidjson ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DROCKSDB_HOME=${rocksdb}" + "-DRAPIDJSON_HOME=${rapidjson}" + ]; + + meta = with stdenv.lib; { + description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; + license = licenses.lgpl3; + platforms = platforms.x86_64; + homepage = https://bioinfo.lifl.fr/RNA/sortmerna/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 274afd5fc3d8..46a1d96d8d0f 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/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 4b580a6cf52e..6dec5b3b11f1 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack +{ stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps +, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook }: -let - version = "9.0"; - fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; +stdenv.mkDerivation rec { + pname = "octopus"; + version = "9.1"; -in stdenv.mkDerivation { - name = "octopus-${version}"; - - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm"; + src = fetchFromGitLab { + owner = "octopus-code"; + repo = "octopus"; + rev = version; + sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h"; }; - nativeBuildInputs = [ perl procps fftw.dev ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; + nativeBuildInputs = [ perl procps autoreconfHook ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" "--with-blas=-lopenblas" "--with-lapack=-lopenblas" - "--with-fftw-prefix=${fftwAll}" + "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index c91443bf64a5..ae9afd95518b 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: -stdenv.mkDerivation rec { - name = "pulseview-0.4.1"; +mkDerivation rec { + pname = "pulseview"; + version = "0.4.1"; src = fetchurl { - url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz"; + url = "https://sigrok.org/download/source/pulseview/${pname}-${version}.tar.gz"; sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; }; @@ -15,16 +16,15 @@ stdenv.mkDerivation rec { buildInputs = [ glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm - pcre librevisa python3 qtbase qtsvg + pcre librevisa python3 + qtbase qtsvg ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 081dc788163b..0ea659d1927f 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }: stdenv.mkDerivation rec { - version = "2.2.0"; - name = "stp-${version}"; + pname = "stp"; + version = "2.3.3"; src = fetchFromGitHub { owner = "stp"; repo = "stp"; - rev = "stp-${version}"; - sha256 = "1jh23wjm62nnqfx447g2y53bbangq04hjrvqc35v9xxpcjgj3i49"; + rev = version; + sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ]; @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { ) ''; - # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`: - # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory - enableParallelBuilding = false; + # seems to build fine now, may revert if concurrency does become an issue + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Simple Theorem Prover"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 8ba77159693e..58674a4cacf2 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,15 +26,12 @@ 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"; homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0be..7d39aae6e3ce 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/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 08ab243fb96a..42963fe5f9c6 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib }: stdenv.mkDerivation rec { - version = "4.2.2"; - name = "vampire-${version}"; + pname = "vampire"; + version = "4.4"; src = fetchFromGitHub { owner = "vprover"; repo = "vampire"; rev = version; - sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y"; - #fetchSubmodules = true; - #leaveDotGit = true; + sha256 = "0v2fdfnk7l5xr5c4y54r25g1nbp4vi85zv29nbklh3r7aws3w9q1"; }; - nativeBuildInputs = [ git ]; buildInputs = [ z3 zlib ]; makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 24cddfb9a1c2..348c1e750867 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 000000000000..311421f2ef54 --- /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 000000000000..24d5f99ec32a --- /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 fbdbac003dcd..1d96c0039ad1 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/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix new file mode 100644 index 000000000000..24a86a8f37a4 --- /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 000000000000..e687281ad1a7 --- /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/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 04a2cde9ba99..57d6c852be8d 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 diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 3e3c32b2c8da..0cd5b5d976a1 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -3,7 +3,7 @@ , sage-with-env , makeWrapper , files ? null # "null" means run all tests -, longTests ? false # run tests marked as "long time" (roughly doubles runtime) +, longTests ? true # run tests marked as "long time" (roughly doubles runtime) # Run as many tests as possible in approximately n seconds. This will give each # file to test a "time budget" and stop tests if it is exceeded. 300 is the # upstream default value. @@ -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/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 7db2e6a12c20..1f644ad0f20f 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 , cmake, makeWrapper, libjpeg, python }: -let version = "5.1.0"; in +let version = "5.2.1"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; + sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; }; buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 64b88dcc3d4f..d43a05f1c616 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 7cb3e8881caf..1d61c612563f 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/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 69f355c7b843..ecbf0c703f19 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, qmake +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 , alsaLib, libsndfile, flite, openssl, udev, SDL2 }: -stdenv.mkDerivation rec { - name = "apmplanner2-${version}"; - # TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release +mkDerivation rec { + pname = "apmplanner2"; version = "2.0.27-rc1"; + src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; @@ -14,11 +14,19 @@ stdenv.mkDerivation rec { sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; }; - qtInputs = [ + patches = [ + # can be dropped after 2.0.27-rc1 + (fetchpatch { + url = "https://github.com/ArduPilot/apm_planner/commit/299ff23b5e9910de04edfc06b6893bb06b47a57b.patch"; + sha256 = "16rc81iwqp2i46g6bm9lbvcjfsk83999r9h8w1pz0mys7rsilvqy"; + }) + ]; + + buildInputs = [ + alsaLib libsndfile flite openssl udev SDL2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 ]; - buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 ] ++ qtInputs; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "apm_planner.pro" ]; @@ -29,7 +37,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/apmplanner2.desktop \ --replace /usr $out ''; - + enableParallelBuilding = true; meta = { @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { Includes support for the APM and PX4 based controllers. ''; homepage = http://ardupilot.org/planner2/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.wucke13 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ wucke13 ]; }; } diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix new file mode 100644 index 000000000000..68b91dafb736 --- /dev/null +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -0,0 +1,43 @@ +{ stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: + +stdenv.mkDerivation rec { + pname = "sumorobot-manager"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "robokoding"; + repo = pname; + rev = "v${version}"; + sha256 = "03zhb54c259a66hsahmv2ajbzwcjnfjj050wbjhw51zqzxinlgqr"; + }; + + buildInputs = [ python3 ]; + pythonPath = [ + pyqt5 pyserial + ]; + + nativeBuildInputs = [ wrapPython qt5.wrapQtAppsHook ]; + + buildPhase = "true"; + + installPhase = '' + mkdir -p $out/opt/sumorobot-manager + cp -r main.py lib res $out/opt/sumorobot-manager + chmod -R 644 $out/opt/sumorobot-manager/lib/* + mkdir $out/bin + makeQtWrapper $out/opt/sumorobot-manager/main.py $out/bin/sumorobot-manager \ + --run "cd $out/opt/sumorobot-manager" + ''; + + preFixup = '' + patchShebangs $out/opt/sumorobot-manager/main.py + wrapPythonProgramsIn "$out/opt" "$pythonPath" + ''; + + meta = with stdenv.lib; { + description = "Desktop App for managing SumoRobots"; + homepage = "https://www.robokoding.com/kits/sumorobot/sumomanager/"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix new file mode 100644 index 000000000000..3dc7792de2ae --- /dev/null +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -0,0 +1,66 @@ +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: + +stdenv.mkDerivation rec { + pname = "bcompare"; + version = "4.2.10.23938"; + + src = fetchurl { + url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; + sha256 = "1825s1lbaj20d712czmaaqg7mkwfb650r53af2y30j29p6yd4wal"; + }; + + unpackPhase = '' + ar x $src + tar xfz data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/share + cp -R usr/share $out/ + cp -R usr/lib $out/ + cp -R usr/bin $out/ + + # Remove library that refuses to be autoPatchelf'ed + rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so + + substituteInPlace $out/bin/bcompare \ + --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ + --replace "/bin/bash" "${runtimeShell}" + + # Create symlink bzip2 library + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0 + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + stdenv.cc.cc.lib + gtk2 + gnome2.pango + cairo + kio + kservice + ki18n + kcoreaddons + gdk-pixbuf + qt4 + bzip2 + ]; + + dontBuild = true; + dontConfigure = true; + + meta = with stdenv.lib; { + description = "GUI application that allows to quickly and easily compare files and folders"; + longDescription = '' + Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders. + By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. + You can then merge the changes, synchronize your files, and generate reports for your records. + ''; + homepage = "https://www.scootersoftware.com"; + license = licenses.unfree; + maintainers = [ maintainers.ktor ]; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 569606d2fdb6..5bcc3f991a1c 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.20170611"; + version = "1.20181219"; pname = "blackbox"; name = "${pname}-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "stackexchange"; repo = pname; rev = "v${version}"; - sha256 = "1jnzhlj54c0szw9l9wib07i2375pbm402bx9wagspcmwc0qw43p6"; + sha256 = "1lpwwwc3rf992vdf3iy1ds07n1xkmad065im2bqzc6kdsbkn7rjx"; }; installPhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5068647e8798..e64254ed29f1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -121,6 +121,8 @@ let git-stree = callPackage ./git-stree { }; + git-subrepo = callPackage ./git-subrepo { }; + git-sync = callPackage ./git-sync { }; git-test = callPackage ./git-test { }; @@ -145,7 +147,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/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 1af2170e1699..599c6bb4308e 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 7385905cc9d9..90b8b54434bd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, openssl +, openssl_1_0_2 , zlib , libssh , cmake @@ -35,7 +35,7 @@ buildRustPackage rec { ]; buildInputs = [ - openssl + openssl_1_0_2 libssh zlib ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix new file mode 100644 index 000000000000..24a1e1ac937e --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, git, makeWrapper, which }: + +stdenv.mkDerivation rec { + pname = "git-subrepo"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "ingydotnet"; + repo = "git-subrepo"; + rev = version; + sha256 = "05m2dm9gq2nggwnxxdyq2kjj584sn2lxk66pr1qhjxnk81awj9l7"; + }; + + nativeBuildInputs = [ + makeWrapper + which + ]; + + buildInputs = [ + git + ]; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "INSTALL_LIB=${placeholder ''out''}/bin" + "INSTALL_MAN=${placeholder ''out''}/share/man/man1" + ]; + + patches = [ + # Allow zsh completion to work even though we aren't installing from a git + # clone. Also submitted upstream as + # https://github.com/ingydotnet/git-subrepo/pull/420 + ./zsh-completion.patch + ]; + + postInstall = '' + ZSH_COMP_DIR="$out/share/zsh/vendor-completions" + mkdir -p "$ZSH_COMP_DIR" + cp share/zsh-completion/_git-subrepo "$ZSH_COMP_DIR/" + + BASH_COMP_DIR="$out/share/bash-completion/completions" + mkdir -p "$BASH_COMP_DIR" + cp share/completion.bash "$BASH_COMP_DIR/git-subrepo" + ''; + + postFixup = '' + wrapProgram $out/bin/git-subrepo \ + --prefix PATH : "${git}/bin" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ingydotnet/git-subrepo; + description = "Git submodule alternative"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.ryantrinkle ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch b/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch new file mode 100644 index 000000000000..dcba5ba6eea1 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/zsh-completion.patch @@ -0,0 +1,32 @@ +diff --git a/pkg/bin/generate-completion.pl b/pkg/bin/generate-completion.pl +index 85ae3b8..d3e423c 100644 +--- a/pkg/bin/generate-completion.pl ++++ b/pkg/bin/generate-completion.pl +@@ -82,11 +82,6 @@ sub generate_zsh { + + # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl. + +-if [[ -z $GIT_SUBREPO_ROOT ]]; then +- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?' +- return 3 +-fi +- + _git-subrepo() { + typeset -A opt_args + local curcontext="$curcontext" state line context +diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo +index fc82be2..a8069d9 100644 +--- a/share/zsh-completion/_git-subrepo ++++ b/share/zsh-completion/_git-subrepo +@@ -3,11 +3,6 @@ + + # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl. + +-if [[ -z $GIT_SUBREPO_ROOT ]]; then +- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?' +- return 3 +-fi +- + _git-subrepo() { + typeset -A opt_args + local curcontext="$curcontext" state line context diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4c78963d7fa4..83e65bc17171 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -318,6 +318,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens ]; + maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8733863196d3..f1950923415f 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = https://hub.github.com/; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny globin ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 06c8bb8cb2dd..74fad30b8a9a 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase }: -stdenv.mkDerivation rec { - name = "qgit-2.8"; +mkDerivation rec { + pname = "qgit"; + version = "2.9"; src = fetchFromGitHub { owner = "tibirna"; repo = "qgit"; - rev = name; - sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f"; + rev = "${pname}-${version}"; + sha256 = "0n4dq9gffm9yd7n5p5qcdfgrmg2kwnfd51hfx10adgj9ibxlnc3z"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2; homepage = https://github.com/tibirna/qgit; description = "Graphical front-end to Git"; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index e9862cb48975..52f5551e204f 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://jonas.github.io/tig/; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; license = licenses.gpl2; platforms = platforms.unix; }; 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 c183bbde7e6b..0da0cfa02b63 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 378a272dbf63..00f344597bb4 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.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1z7rkhxkymv7rgc7blh9ps5sqrgl4sryf0rqcp16nh9n5snfm1rm"; + sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a"; # 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 ffca24ab27d1..f766ddbd42c9 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,9 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , 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.4"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; + sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr"; }; libPath = makeLibraryPath [ @@ -50,11 +51,12 @@ stdenv.mkDerivation rec { libXfixes libXrender gtk3 - gnome2.GConf libgnome-keyring openssl at-spi2-atk libuuid + e2fsprogs + krb5 ]; desktopItem = makeDesktopItem { @@ -104,6 +106,6 @@ stdenv.mkDerivation rec { description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ xnwdd ]; + maintainers = with maintainers; [ xnwdd evanjs ]; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 840b90b40885..d20236e9f5bf 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 a386d3e63221..20f0937274ed 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 1ad7f4c777d4..1a6eb99b678d 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 852b3f332a34..0a86273f7cb1 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 a946c7fa7ca5..184c6dc7f730 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 2d38c340d278..5522185783d3 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 9c9ea4934b8e..fd1af22dd78e 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 c9a95fb7a36a..8bffc2a973d9 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 4cebf73f17a2..60939ae918c8 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 9559f4da985d..8da7a3262c12 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 816f16cba872..62ee2990dfa6 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 cc0f04a45531..0a6d7fe1370b 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 b93f6d75e890..8050743ab258 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/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7f72e24aa537..ee0ab3756663 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null -, ApplicationServices }: +, ApplicationServices +, mercurialSrc ? fetchurl rec { + meta.name = "mercurial-${meta.version}"; + meta.version = "4.9.1"; + url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; + } +}: let - # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.9.1"; - name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; + in python2Packages.buildPythonApplication { - inherit name; - format = "other"; - src = fetchurl { - url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - }; + inherit (mercurialSrc.meta) name version; + src = mercurialSrc; + + format = "other"; inherit python; # pass it so that the same version can be used in hg2git @@ -55,7 +58,7 @@ in python2Packages.buildPythonApplication { ''; meta = { - inherit version; + inherit (mercurialSrc.meta) version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = https://www.mercurial-scm.org; downloadPage = https://www.mercurial-scm.org/release/; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 18fb672226f2..1a6eda6a04e9 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 5c9b5a83c186..343d88554d63 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 000000000000..e554afe4a92e --- /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 000000000000..ca054c5cfde9 --- /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 000000000000..00a3cf271113 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -0,0 +1,39 @@ +{ python37, openssl +, 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 { }; + }; + }; +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 000000000000..3a8d1c82b341 --- /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 000000000000..c77fc9022771 --- /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 000000000000..996663761a7d --- /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 000000000000..938176484686 --- /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 000000000000..ac36a219a912 --- /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 000000000000..a0198cb52cf5 --- /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 000000000000..af3685c472cf --- /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 000000000000..47153d9f204e --- /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 000000000000..ef6ed3a744b6 --- /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 000000000000..6b67478aa674 --- /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 000000000000..fdc0639c4c6e --- /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 000000000000..43b494bf9d21 --- /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 81949f951069..dffe3fadd74b 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 7bd1e9586c92..a6cdf2e4373e 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,13 +1,30 @@ -{lib, fetchurl, mercurial, python2Packages}: +{ lib, fetchurl, python2Packages +, mercurial +}@args: +let + tortoisehgSrc = fetchurl rec { + meta.name = "tortoisehg-${meta.version}"; + meta.version = "5.0.2"; + url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz"; + sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz"; + }; -python2Packages.buildPythonApplication rec { - name = "tortoisehg-${version}"; - version = "5.0.2"; + mercurial = + if args.mercurial.meta.version == tortoisehgSrc.meta.version + then args.mercurial + else args.mercurial.override { + mercurialSrc = fetchurl rec { + meta.name = "mercurial-${meta.version}"; + meta.version = tortoisehgSrc.meta.version; + url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; + sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19"; + }; + }; - src = fetchurl { - url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz"; - }; +in python2Packages.buildPythonApplication rec { + + inherit (tortoisehgSrc.meta) name version; + src = tortoisehgSrc; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; @@ -28,6 +45,8 @@ python2Packages.buildPythonApplication rec { $out/bin/thg version ''; + passthru.mercurial = mercurial; + meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = https://tortoisehg.bitbucket.io/; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8e87a0589c59..4cbd506c177d 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/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix new file mode 100644 index 000000000000..d1a9b64d711b --- /dev/null +++ b/pkgs/applications/video/celluloid/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, python3 +, gettext +, pkgconfig +, desktop-file-utils +, wrapGAppsHook +, appstream-glib +, epoxy +, glib +, gtk3 +, mpv +}: + +stdenv.mkDerivation rec { + pname = "celluloid"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "celluloid-player"; + repo = "celluloid"; + rev = "v${version}"; + sha256 = "0pnxjv6n2q6igxdr8wzbahcj7vccw4nfjdk8fjdnaivf2lyrpv2d"; + }; + + nativeBuildInputs = [ + meson + ninja + python3 + appstream-glib + gettext + pkgconfig + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + epoxy + glib + gtk3 + mpv + ]; + + postPatch = '' + patchShebangs meson-post-install.py src/generate-authors.py + sed -i '/gtk-update-icon-cache/s/^/#/' meson-post-install.py + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Simple GTK+ frontend for the mpv video player"; + longDescription = '' + GNOME MPV interacts with mpv via the client API exported by libmpv, + allowing access to mpv's powerful playback capabilities through an + easy-to-use user interface. + ''; + homepage = "https://github.com/celluloid-player/celluloid"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 9b29e18d0bc4..989000297a33 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeDesktopItem, ffmpeg -, qmake, qttools +, qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "clipgrab-${version}"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf"; + sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 76db1cd9e649..24aeedd6760f 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.1"; + version = "3.1.2"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "1rz69vrfqz9sma9cm1mnvkd11zq3is53lc3m3hcphr02vs69s53m"; + sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix deleted file mode 100644 index a04eebfcc407..000000000000 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, python3 -, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook -, appstream-glib, epoxy, glib, gtk3, mpv -}: - -stdenv.mkDerivation rec { - pname = "gnome-mpv"; - version = "0.16"; - - src = fetchFromGitHub { - owner = "celluloid-player"; - repo = "celluloid"; - rev = "v${version}"; - sha256 = "1fj5mr1dwd07jpnigk7z85xdm6yaf7spbvf60aj3mz12m05b1b2w"; - }; - - nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; - buildInputs = [ epoxy glib gtk3 mpv ]; - - patches = [ - # fix appstream validation in sandbox - # https://github.com/celluloid-player/celluloid/pull/437 - (fetchpatch { - url = https://github.com/celluloid-player/celluloid/commit/5a0b2e892bb715278d309c859a7e521d64433d85.patch; - sha256 = "0naci8lr6128yilal39h46yvq9x3la7g7fhvr5xlwyh30iqrbm3i"; - }) - ]; - - postPatch = '' - patchShebangs meson_post_install.py - patchShebangs src/generate_authors.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Simple GTK+ frontend for the mpv video player"; - longDescription = '' - GNOME MPV interacts with mpv via the client API exported by libmpv, - allowing access to mpv's powerful playback capabilities through an - easy-to-use user interface. - ''; - homepage = "https://github.com/celluloid-player/celluloid"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index e5844eb827df..73bcdadbc594 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders , pkgconfig, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook @@ -42,21 +42,36 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; -# TODO for Kodi 18.0 -# - check if dbus support PR has been merged and add dbus as a buildInput - let - kodiReleaseDate = "20190129"; - kodiVersion = "18.1"; + kodiReleaseDate = "20190627"; + kodiVersion = "18.3"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"; + sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld"; + }; + + cmakeProto = fetchurl { + url = "https://raw.githubusercontent.com/pramsey/libght/ca9b1121c352ea10170636e170040e1af015bad1/cmake/modules/CheckPrototypeExists.cmake"; + sha256 = "1zai82gm5x55n3xvdv7mns3ja6a2k81x9zz0nk42j6s2yb0fkjxh"; }; + cmakeProtoPatch = '' + # get rid of windows headers as they will otherwise be found first + rm -rf msvc + + cp ${cmakeProto} cmake/${cmakeProto.name} + # we need to enable support for C++ for check_prototype_exists to do its thing + substituteInPlace CMakeLists.txt --replace 'LANGUAGES C' 'LANGUAGES C CXX' + if [ -f cmake/CheckHeadersSTDC.cmake ]; then + sed -i cmake/CheckHeadersSTDC.cmake \ + -e '7iinclude(CheckPrototypeExists)' + fi + ''; + kodiDependency = { name, version, rev, sha256, ... } @attrs: let attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"]; @@ -83,16 +98,25 @@ let nativeBuildInputs = [ cmake nasm pkgconfig ]; }; - # we should be able to build these externally and have kodi reference them as buildInputs. - # Doesn't work ATM though so we just use them for the src - + # We can build these externally but FindLibDvd.cmake forces us to build it + # them, so we currently just use them for the src. libdvdcss = kodiDependency rec { name = "libdvdcss"; version = "1.4.2"; rev = "${version}-${rel}-Beta-5"; sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; - buildInputs = [ libdvdread ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ linuxHeaders ]; + nativeBuildInputs = [ cmake pkgconfig ]; + postPatch = '' + rm -rf msvc + + substituteInPlace config.h.cm \ + --replace '#cmakedefine O_BINARY "''${O_BINARY}"' '#define O_BINARY 0' + ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=1" + "-DHAVE_LINUX_DVD_STRUCT=1" + ]; }; libdvdnav = kodiDependency rec { @@ -100,8 +124,12 @@ let version = "6.0.0"; rev = "${version}-${rel}-Alpha-3"; sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; - buildInputs = [ libdvdread ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libdvdcss libdvdread ]; + nativeBuildInputs = [ cmake pkgconfig ]; + postPatch = cmakeProtoPatch; + postInstall = '' + mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so + ''; }; libdvdread = kodiDependency rec { @@ -109,7 +137,10 @@ let version = "6.0.0"; rev = "${version}-${rel}-Alpha-3"; sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libdvdcss ]; + nativeBuildInputs = [ cmake pkgconfig ]; + configureFlags = [ "--with-libdvdcss" ]; + postPatch = cmakeProtoPatch; }; in stdenv.mkDerivation rec { @@ -160,7 +191,7 @@ in stdenv.mkDerivation rec { makeWrapper which pkgconfig gnumake - autoconf automake libtool # still needed for some components. Check if that is the case with 18.0 + autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 ] ++ lib.optional useWayland [ wayland-protocols ]; cmakeFlags = [ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c13bf3480d25..42b40ade271f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -4,21 +4,22 @@ , withGUI ? true , qtbase ? null , qtmultimedia ? null + , wrapQtAppsHook ? null }: -assert withGUI -> qtbase != null && qtmultimedia != null; +assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null; with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "35.0.0"; + version = "36.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "163msz6l1d5vwirr1c6cm820kwxcjinwh91svf8ddg5181nwhmrx"; + sha256 = "114j9n2m6dkh7vqzyhcsjzzffadr0lzyjmh31cbl4mvvkg9j5z6r"; }; nativeBuildInputs = [ @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { expat file xdg_utils boost libebml zlib fmt libmatroska libogg libvorbis flac cmark ] ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [ qtbase qtmultimedia ]; + ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; @@ -49,6 +50,11 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + dontWrapQtApps = true; + postFixup = optionalString withGUI '' + wrapQtApp $out/bin/mkvtoolnix-gui + ''; + meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; homepage = http://www.bunkus.org/videotools/mkvtoolnix/; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dcfeae52aae4..6c21a6b2012b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -218,7 +218,7 @@ in stdenv.mkDerivation rec { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = https://mpv.io; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ]; + maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ]; platforms = platforms.darwin ++ platforms.linux; longDescription = '' diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 1b80e379008c..2f0b54edc8fb 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -7,13 +7,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; mkDerivation rec { name = "shotcut-${version}"; - version = "19.07.15"; + version = "19.08.16"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0drl0x8x45kysalzx1pbg0gkvlxaykg9zka1fdkrl4iqfs4s7vv2"; + sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 00a0942ccf6f..495fc6f67452 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 41f82a8bdd5c..59e541892eef 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/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 8979e9790b4e..dda70d797e5e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.7.1"; + version = "3.0.8"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86"; + sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index c858f4c4d6d3..ecf6f1c54218 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: +{ stdenv, lib, edk2, utillinux, nasm, iasl +, csmSupport ? false, seabios ? null +, secureBoot ? false +}: + +assert csmSupport -> seabios != null; let @@ -12,60 +17,25 @@ let throw "Unsupported architecture"; version = (builtins.parseDrvName edk2.name).version; - - src = edk2.src; in -stdenv.mkDerivation (edk2.setup projectDscPath { +edk2.mkDerivation projectDscPath { name = "OVMF-${version}"; - inherit src; - outputs = [ "out" "fd" ]; - # TODO: properly include openssl for secureBoot - buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; - - hardeningDisable = [ "stackprotector" "pic" "fortify" ]; + buildInputs = [ utillinux nasm iasl ]; - unpackPhase = '' - # $fd is overwritten during the build - export OUTPUT_FD=$fd + hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; - for file in \ - "${src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg}; - do - ln -sv "$file" . - done + buildFlags = + lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]; - ${if stdenv.isAarch64 then '' - ln -sv ${src}/ArmPkg . - ln -sv ${src}/ArmPlatformPkg . - ln -sv ${src}/ArmVirtPkg . - ln -sv ${src}/EmbeddedPkg . - ln -sv ${src}/OvmfPkg . - '' else if seabios != null then '' - cp -r ${src}/OvmfPkg . - chmod +w OvmfPkg/Csm/Csm16 - cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin - '' else '' - ln -sv ${src}/OvmfPkg . - ''} - - ${lib.optionalString secureBoot '' - ln -sv ${src}/SecurityPkg . - ln -sv ${src}/CryptoPkg . - ''} + postPatch = lib.optionalString csmSupport '' + cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; - buildPhase = if stdenv.isAarch64 then '' - build -n $NIX_BUILD_CORES - '' else if seabios == null then '' - build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} - '' else '' - build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} - ''; - postFixup = if stdenv.isAarch64 then '' mkdir -vp $fd/FV mkdir -vp $fd/AAVMF @@ -77,8 +47,8 @@ stdenv.mkDerivation (edk2.setup projectDscPath { dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 '' else '' - mkdir -vp $OUTPUT_FD/FV - mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV + mkdir -vp $fd/FV + mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV ''; dontPatchELF = true; @@ -89,4 +59,4 @@ stdenv.mkDerivation (edk2.setup projectDscPath { license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; -}) +} diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index eb143412bd40..0b523d7b88d7 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 afb2088c6a6e..58f4dd48cc8b 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 8d264f3062cd..f7ea6df8493b 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/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 8ec9ec6c8b49..e146086b5549 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -31,6 +31,11 @@ buildGoPackage rec { nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ]; propagatedBuildInputs = [ coreutils squashfsTools ]; + prePatch = '' + substituteInPlace internal/pkg/build/copy/copy.go \ + --replace /bin/cp ${coreutils}/bin/cp + ''; + postConfigure = '' cd go/src/github.com/sylabs/singularity diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b6a6ebde5409..42860966fe11 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -77,6 +77,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2; # exclude Darwin since libvirt-glib currently doesn't build there platforms = platforms.linux; - maintainers = with maintainers; [ qknight offline fpletz ]; + maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 9c307d8e9ba4..eb5d53c2b89f 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen +, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl , gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl , libapparmor, gst_all_1 , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null +, xenSupport ? false, xen ? null }: assert spiceSupport -> @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info libvirt yajl gsettings-desktop-schemas libvirt-glib libcap_ng numactl libapparmor - ] ++ optionals stdenv.isx86_64 [ + ] ++ optionals xenSupport [ xen ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 2a59cd1f0615..8ad8edde8cc8 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -43,6 +43,11 @@ let sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }; + # Ported from + #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d"; + #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2"; + qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib @@ -50,11 +55,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.8.3"; + version = "4.8.5"; src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "0vhkpyy5x7kc36hnav95fn194ngsmc3m2xcc78vccs00gdf6m8q9"; + sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz"; }; # Sources needed to build tools and firmwares. @@ -67,6 +72,7 @@ callPackage (import ./generic.nix (rec { }; patches = [ qemuMemfdBuildFix + qemuGlusterfs6Fix ]; buildInputs = qemuDeps; meta.description = "Xen's fork of upstream Qemu"; @@ -155,13 +161,8 @@ callPackage (import ./generic.nix (rec { ++ optional (withInternalOVMF) "--enable-ovmf"; patches = with xsa; flatten [ - # XSA_231 to XSA-251 are fixed in 4.8.3 (verified with git log) - XSA_252_49 # 253: 4.8 not affected # 254: no patch supplied by xen project (Meltdown/Spectre) - XSA_255_49_1 - XSA_255_49_2 - XSA_256_48 xenlockprofpatch xenpmdpatch ]; @@ -176,10 +177,8 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; - passthru = { - qemu-system-i386 = if withInternalQemu + passthru.qemu-system-i386 = if withInternalQemu then "lib/xen/bin/qemu-system-i386" else throw "this xen has no qemu builtin"; - }; })) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 8dc2dffc6b6b..8093d4752a0b 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -121,8 +121,8 @@ stdenv.mkDerivation (rec { patches = [ ./0000-fix-ipxe-src.patch ./0000-fix-install-python.patch - ./acpica-utils-20180427.patch] - ++ (config.patches or []); + ] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch + ++ (config.patches or []); postPatch = '' ### Hacks diff --git a/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff b/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff new file mode 100644 index 000000000000..7ec6ad3aba66 --- /dev/null +++ b/pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff @@ -0,0 +1,95 @@ +diff --git a/block/gluster.c b/block/gluster.c +index 01b479fbb9..29552e1186 100644 +--- a/block/gluster.c ++++ b/block/gluster.c +@@ -15,6 +15,10 @@ + #include "qemu/uri.h" + #include "qemu/error-report.h" + ++#ifdef CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT ++# define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL) ++#endif ++ + #define GLUSTER_OPT_FILENAME "filename" + #define GLUSTER_OPT_VOLUME "volume" + #define GLUSTER_OPT_PATH "path" +@@ -613,7 +617,11 @@ static void qemu_gluster_complete_aio(void *opaque) + /* + * AIO callback routine called from GlusterFS thread. + */ +-static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg) ++static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, ++#ifdef CONFIG_GLUSTERFS_IOCB_HAS_STAT ++ struct glfs_stat *pre, struct glfs_stat *post, ++#endif ++ void *arg) + { + GlusterAIOCB *acb = (GlusterAIOCB *)arg; + +diff --git a/configure b/configure +index 4b808f9d17..89fb27fd0d 100755 +--- a/configure ++++ b/configure +@@ -301,6 +301,8 @@ glusterfs="" + glusterfs_xlator_opt="no" + glusterfs_discard="no" + glusterfs_zerofill="no" ++glusterfs_ftruncate_has_stat="no" ++glusterfs_iocb_has_stat="no" + archipelago="no" + gtk="" + gtkabi="" +@@ -3444,6 +3446,38 @@ if test "$glusterfs" != "no" ; then + if $pkg_config --atleast-version=6 glusterfs-api; then + glusterfs_zerofill="yes" + fi ++ cat > $TMPC << EOF ++#include <glusterfs/api/glfs.h> ++ ++int ++main(void) ++{ ++ /* new glfs_ftruncate() passes two additional args */ ++ return glfs_ftruncate(NULL, 0, NULL, NULL); ++} ++EOF ++ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then ++ glusterfs_ftruncate_has_stat="yes" ++ fi ++ cat > $TMPC << EOF ++#include <glusterfs/api/glfs.h> ++ ++/* new glfs_io_cbk() passes two additional glfs_stat structs */ ++static void ++glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, struct glfs_stat *poststat, void *data) ++{} ++ ++int ++main(void) ++{ ++ glfs_io_cbk iocb = &glusterfs_iocb; ++ iocb(NULL, 0 , NULL, NULL, NULL); ++ return 0; ++} ++EOF ++ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then ++ glusterfs_iocb_has_stat="yes" ++ fi + else + if test "$glusterfs" = "yes" ; then + feature_not_found "GlusterFS backend support" \ +@@ -5415,6 +5449,14 @@ if test "$archipelago" = "yes" ; then + echo "ARCHIPELAGO_LIBS=$archipelago_libs" >> $config_host_mak + fi + ++if test "$glusterfs_ftruncate_has_stat" = "yes" ; then ++ echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak ++fi ++ ++if test "$glusterfs_iocb_has_stat" = "yes" ; then ++ echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak ++fi ++ + if test "$libssh2" = "yes" ; then + echo "CONFIG_LIBSSH2=m" >> $config_host_mak + echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 8fd85aaeb862..b81f66254377 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/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 843c331f91cd..0941329bdbe5 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -5,15 +5,13 @@ , libXinerama, libXext, xwininfo, libxdg_basedir }: stdenv.mkDerivation rec { pname = "compton"; - version = "7"; - - COMPTON_VERSION = "v${version}"; + version = "7.2"; src = fetchFromGitHub { owner = "yshui"; repo = "compton"; - rev = COMPTON_VERSION; - sha256 = "0f23dv2p1snlpzc91v38q6896ncz4zqzmh2d97yf66j78g21awas"; + rev = "v${version}"; + sha256 = "1vwa5f0nifc1913diqd6cp5k1dlfyc2ijxbcdj1s37ywpx6c63c3"; fetchSubmodules = true; }; @@ -42,11 +40,6 @@ stdenv.mkDerivation rec { "-Dbuild_docs=true" ]; - preBuild = '' - git() { echo "$COMPTON_VERSION"; } - export -f git - ''; - installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3e9618f6e5df..d72e56d2489a 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://i3wm.org"; - maintainers = with maintainers; [ modulistic fpletz ]; + maintainers = with maintainers; [ modulistic fpletz globin ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index f2dc023c81d6..4d4ab6d96cc5 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.16.1"; + version = "4.17"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "1jvyd8p8dfsidfy2yy7adydynzvaf72lx67x71r13hrk8w77hp0k"; + sha256 = "1vd2xv91xrcr07s2dywq9rvidqqmbs41hlvhcvr1927gz200vgjg"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index de8cca56f85e..60edf05892de 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = https://github.com/greshake/i3status-rust; license = licenses.gpl3; - maintainers = [ maintainers.backuitist ]; + maintainers = with maintainers; [ backuitist globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 12427b912654..215a576a578c 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sway"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"; + sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd"; }; patches = [ @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" ''; - postPatch = '' - sed -i "s/version: '1.0'/version: '${version}'/" meson.build - ''; - meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 2e58928e34c8..817184d6cb00 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "1cz4vkm7fqd51ly9qjkf5q76kdqdzfhaajgvrs4anz5dyzrdpw68"; + sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 32cec42160f8..d4318b715ba3 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -71,6 +71,15 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $(find $bazelOut/external -type d -name .svn) rm -rf $(find $bazelOut/external -type d -name .hg) + # Removing top-level symlinks along with their markers. + # This is needed because they sometimes point to temporary paths (?). + # For example, in Tensorflow-gpu build: + # platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms + find $bazelOut/external -maxdepth 1 -type l | while read symlink; do + name="$(basename "$symlink")" + rm "$symlink" "$bazelOut/external/@$name.marker" + done + # Patching symlinks to remove build directory reference find $bazelOut/external -type l | while read symlink; do new_target="$(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,")" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ae3d93ff3db3..83e21c8945dc 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 d09b775d42c8..1ca1e45f2fbb 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -169,6 +169,20 @@ rec { http://backpan.perl.org/ # for old releases ]; + # CentOS. + centos = [ + http://mirror.centos.org/centos/ + # For old releases + http://vault.centos.org/ + https://archive.kernel.org/centos-vault/ + http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/ + http://mirrors.aliyun.com/centos-vault/ + https://mirror.chpc.utah.edu/pub/vault.centos.org/ + https://mirror.its.sfu.ca/mirror/CentOS-vault/ + https://mirror.math.princeton.edu/pub/centos-vault/ + https://mirrors.tripadvisor.com/centos-vault/ + ]; + # Debian. debian = [ http://httpredir.debian.org/debian/ @@ -385,7 +399,7 @@ rec { # Steam Runtime mirrors steamrt = [ http://repo.steampowered.com/steamrt/ - https://abbradar.net/steamrt/ + https://public.abbradar.moe/steamrt/ ]; # Python PyPI mirrors diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6afe93c7e4c1..09802d56d34c 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/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh new file mode 100644 index 000000000000..4bf7c0ff1af4 --- /dev/null +++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh @@ -0,0 +1,88 @@ +# This setup hook modifies a Perl script so that any "-I" flags in its shebang +# line are rewritten into a "use lib ..." statement on the next line. This gets +# around a limitation in Darwin, which will not properly handle a script whose +# shebang line exceeds 511 characters. +# +# Each occurrence of "-I /path/to/lib1" or "-I/path/to/lib2" is removed from +# the shebang line, along with the single space that preceded it. These library +# paths are placed into a new line of the form +# +# use lib "/path/to/lib1", "/path/to/lib2"; +# +# immediately following the shebang line. If a library appeared in the original +# list more than once, only its first occurrence will appear in the output +# list. In other words, the libraries are deduplicated, but the ordering of the +# first appearance of each one is preserved. +# +# Any flags other than "-I" in the shebang line are left as-is, and the +# interpreter is also left alone (although the script will abort if the +# interpreter does not seem to be either "perl" or else "env" with "perl" as +# its argument). Each line after the shebang line is left unchanged. Each file +# is modified in place. +# +# Usage: +# shortenPerlShebang SCRIPT... + +shortenPerlShebang() { + while [ $# -gt 0 ]; do + _shortenPerlShebang "$1" + shift + done +} + +_shortenPerlShebang() { + local program="$1" + + echo "shortenPerlShebang: rewriting shebang line in $program" + + if ! isScript "$program"; then + die "shortenPerlShebang: refusing to modify $program because it is not a script" + fi + + local temp="$(mktemp)" + + gawk ' + (NR == 1) { + if (!($0 ~ /\/(perl|env +perl)\>/)) { + print "shortenPerlShebang: script does not seem to be a Perl script" > "/dev/stderr" + exit 1 + } + idx = 0 + while (match($0, / -I ?([^ ]+)/, pieces)) { + matches[idx] = pieces[1] + idx++ + $0 = gensub(/ -I ?[^ ]+/, "", 1, $0) + } + print $0 + if (idx > 0) { + prefix = "use lib " + for (idx in matches) { + path = matches[idx] + if (!(path in seen)) { + printf "%s\"%s\"", prefix, path + seen[path] = 1 + prefix = ", " + } + } + print ";" + } + } + (NR > 1 ) { + print + } + ' "$program" > "$temp" || die + # Preserve the mode of the original file + cp --preserve=mode --attributes-only "$program" "$temp" + mv "$temp" "$program" + + # Measure the new shebang line length and make sure it's okay. We subtract + # one to account for the trailing newline that "head" included in its + # output. + local new_length=$(( $(head -n 1 "$program" | wc -c) - 1 )) + + # Darwin is okay when the shebang line contains 511 characters, but not + # when it contains 512 characters. + if [ $new_length -ge 512 ]; then + die "shortenPerlShebang: shebang line is $new_length characters--still too long for Darwin!" + fi +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5d04302591ee..a59da3a8745b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -774,9 +774,7 @@ rec { in rec { name = "centos-${version}-i386"; fullName = "CentOS ${version} (i386)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/i386"; - urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/i386"; + urlPrefix = "mirror://centos/${version}/os/i386"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; @@ -790,9 +788,7 @@ rec { in rec { name = "centos-${version}-x86_64"; fullName = "CentOS ${version} (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; - urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/x86_64"; + urlPrefix = "mirror://centos/${version}/os/x86_64"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; @@ -807,9 +803,7 @@ rec { in rec { name = "centos-${version}-x86_64"; fullName = "CentOS ${version} (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; - urlPrefix = "http://mirror.centos.org/centos-7/${version}/os/x86_64"; + urlPrefix = "mirror://centos/${version}/os/x86_64"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 451e3feecb6f..422258f84d11 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -39,7 +39,7 @@ in { sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; }; v5 = font-awesome { - version = "5.10.1"; - sha256 = "1ckr7n0hlhvyl8nkhyjr7k6r07czpcfp0s2mnb48mvfgxd3j992p"; + version = "5.10.2"; + sha256 = "0bg28zn2lhrcyj7mbavphkvw3hrbnjsnn84305ax93nj3qd0d4hx"; }; } diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix new file mode 100644 index 000000000000..c8cf655a18cf --- /dev/null +++ b/pkgs/data/fonts/gelasio/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub }: + +let + version = "unstable-2018-08-12"; +in fetchFromGitHub { + name = "gelasio-${version}"; + owner = "SorkinType"; + repo = "Gelasio"; + rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; + sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype/ + ''; + + meta = with lib; { + description = "a font which is metric-compatible with Microsoft's Georgia"; + longDescription = '' + Gelasio is an original typeface which is metrics compatible with Microsoft's + Georgia in its Regular, Bold, Italic and Bold Italic weights. Interpolated + Medium, medium Italic, SemiBold and SemiBold Italic have now been added as well. + ''; + homepage = "https://github.com/SorkinType/Gelasio"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ colemickens ]; + }; +} + diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix new file mode 100644 index 000000000000..f54838d5a646 --- /dev/null +++ b/pkgs/data/fonts/joypixels/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +let + fontconfig = fetchurl { + name = "75-joypixels.conf"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3"; + sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6"; + }; +in stdenv.mkDerivation rec { + pname = "emojione"; + version = "5.0.2"; + + src = fetchurl { + url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; + sha256 = "0javgnfsh2nfddr5flf4yzi81ar8wx2z8w1q7h4fvdng5fsrgici"; + }; + + dontUnpack = true; + + installPhase = '' + install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf + install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf + ''; + + meta = with stdenv.lib; { + description = "Emoji as a Service (formerly EmojiOne)"; + homepage = https://www.joypixels.com/; + license = licenses.unfree; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index d495efc79eca..b3c6d585b8bb 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 ee2c2406bc6f..21d31914479f 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/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index fb659e1c22e5..3f9cff62ee4f 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20190615"; + version = "20190802"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "1999q6jw4ib8xrw3ydmprnq0mbmzqj8l92rx4rrh22lw9kdvig8w"; + sha256 = "1i6nh1vy2cjqh4fw1mzq5v4ah613ghf018g8w0npxhj9qi3pyjm5"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eeee8d56664c..87c4afb986be 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 163f230e077a..3124b57ac2b2 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/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 39cdd29c94be..b41c4a4c5aa9 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20190726"; + version = "20190805"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr"; + sha256 = "1la80kmh58nrra8aa4grv31gc7xbqbybl8q1m4yv0byb11slg93x"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 8a8e88ff6f96..3a2dcea4b3a5 100644 --- a/pkgs/misc/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,25 +1,23 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-obsidian2-${version}"; - version = "2.8"; + pname = "theme-obsidian2"; + version = "2.9"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq"; + sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = '' - sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme - ''; - installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a Obsidian-2 $out/share/themes + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 2351c4935729..cf2eb5447f74 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1xb28s67lnsphj97r15jxlfgydyrxdby1d2z5y3g9wniw6z19i9n"; + sha256 = "0a2wczxxfd2nfr7biawbs3rwy2sivcl2sv43y2638gmfp0w6zh9r"; }; preferLocalBuild = true; diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index a8b5e08abd65..8d0fed6b3d85 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,7 +1,9 @@ { callPackage, pkgs }: rec { #### CORE EFL - efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; + efl = callPackage ./efl.nix { + openjpeg = pkgs.openjpeg_1; + }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 95e6d0f12b03..16828f08bc27 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -37,7 +37,9 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; + gnome_vfs = callPackage ./platform/gnome-vfs { + openssl = pkgs.openssl_1_0_2; + }; libgnome = callPackage ./platform/libgnome { }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index c95d135e9e73..ac1e9ee85c01 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,39 +1,80 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gnome3 +, glib +, gtk3 +, pango +, wrapGAppsHook +, python3 +, gobject-introspection +, gjs +, libunistring +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +}: stdenv.mkDerivation rec { - name = "gnome-characters-${version}"; + pname = "gnome-characters"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; + + + buildInputs = [ + adwaita-icon-theme + gjs + glib + gnome-desktop # for typelib + gsettings-desktop-schemas + gtk3 + libunistring + pango + ]; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postFixup = '' + for file in $out/share/org.gnome.Characters/org.gnome.Characters \ + $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + + wrapProgram $file "''${gappsWrapperArgs[@]}" + done + ''; + passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-characters"; - attrPath = "gnome3.gnome-characters"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; - buildInputs = [ - glib gtk3 gjs pango gsettings-desktop-schemas - adwaita-icon-theme libunistring - # typelib - gnome-desktop - ]; - - mesonFlags = [ - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; description = "Simple utility application to find and insert unusual characters"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 2941d629f8f7..4a34f12912f7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig , wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server +, glib, gtk3, evolution-data-server, gnome-online-accounts , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas }: +, gnome3, libxml2, gsettings-desktop-schemas, tracker }: let version = "3.32.2"; @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libuuid webkitgtk gnome3.tracker - gnome3.gnome-online-accounts zeitgeist + glib gtk3 libuuid webkitgtk tracker + gnome-online-accounts zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix deleted file mode 100644 index e5bd4d8b950f..000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, gettext, fetchurl, libxml2, libgdata -, pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins -, grilo, gnome-online-accounts -, desktop-file-utils, wrapGAppsHook -, gnome3, gdk-pixbuf, gexiv2, geocode-glib -, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }: - -let - pname = "gnome-photos"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj"; - }; - - # doCheck = true; - - nativeBuildInputs = [ - pkgconfig gettext itstool meson ninja libxml2 - desktop-file-utils wrapGAppsHook python3 - ]; - buildInputs = [ - gtk3 glib gegl babl libgdata libdazzle - gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - gfbgraph grilo-plugins grilo - gnome-online-accounts tracker - gexiv2 geocode-glib dleyna-renderer - tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema - dbus - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Access, organize and share your photos"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} 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 5c2eae883cfc..078145e1231f 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 8b64b3df8015..c499bac4552c 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-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index b79651ea4bc7..bcc8871bcf14 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2, hicolor-icon-theme }: let pname = "gnome-color-manager"; @@ -11,7 +11,12 @@ in stdenv.mkDerivation rec { sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool desktop-file-utils + # setup-hook + hicolor-icon-theme + ]; + buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e947f8625c61..04730f2370f5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,15 +1,69 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook -, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio -, gdk-pixbuf, librsvg, libgudev, libsecret, gnome-color-manager -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, libkrb5, networkmanagerapplet, networkmanager, glibc -, libwacom, samba, shared-mime-info, tzdata, libgnomekbd -, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session -, fontconfig, sound-theme-freedesktop, grilo, python3 -, gtk3, glib, glib-networking, gsettings-desktop-schemas -, gnome-desktop, gnome-settings-daemon, gnome-online-accounts -, vino, gnome-bluetooth, tracker, adwaita-icon-theme -, udisks2, gsound, libhandy, cups, mutter }: +{ fetchurl +, stdenv +, substituteAll +, accountsservice +, adwaita-icon-theme +, cheese +, clutter +, clutter-gtk +, colord +, colord-gtk +, cups +, docbook_xsl +, fontconfig +, gdk-pixbuf +, gettext +, glib +, glib-networking +, glibc +, gnome-bluetooth +, gnome-color-manager +, gnome-desktop +, gnome-online-accounts +, gnome-session +, gnome-settings-daemon +, gnome3 +, grilo +, grilo-plugins +, gsettings-desktop-schemas +, gsound +, gtk3 +, ibus +, libcanberra-gtk3 +, libgnomekbd +, libgtop +, libgudev +, libhandy +, libkrb5 +, libpulseaudio +, libpwquality +, librsvg +, libsecret +, libsoup +, libwacom +, libxml2 +, libxslt +, meson +, modemmanager +, mutter +, networkmanager +, networkmanagerapplet +, ninja +, pkgconfig +, polkit +, python3 +, samba +, shared-mime-info +, sound-theme-freedesktop +, tracker +, tzdata +, udisks2 +, upower +, vino +, gnome-user-share +, gnome-remote-desktop +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gnome-control-center"; @@ -21,20 +75,63 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl - shared-mime-info python3 + docbook_xsl + gettext + libxslt + meson + ninja + pkgconfig + python3 + shared-mime-info + wrapGAppsHook ]; buildInputs = [ - ibus gtk3 glib glib-networking upower gsettings-desktop-schemas - libxml2 gnome-desktop gnome-settings-daemon polkit libgtop - gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk - accountsservice libkrb5 networkmanagerapplet libwacom samba - grilo libpwquality vino libcanberra-gtk3 libgudev libsecret - gdk-pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese - networkmanager modemmanager gnome-bluetooth tracker - udisks2 gsound libhandy + accountsservice + adwaita-icon-theme + cheese + clutter + clutter-gtk + colord + colord-gtk + fontconfig + gdk-pixbuf + glib + glib-networking + gnome-bluetooth + gnome-desktop + gnome-online-accounts + gnome-remote-desktop # optional, sharing panel + gnome-settings-daemon + gnome-user-share # optional, sharing panel + grilo + grilo-plugins # for setting wallpaper from Flickr + gsettings-desktop-schemas + gsound + gtk3 + ibus + libcanberra-gtk3 + libgtop + libgudev + libhandy + libkrb5 + libpulseaudio + libpwquality + librsvg + libsecret + libsoup + libwacom + libxml2 + modemmanager mutter # schemas for the keybindings + networkmanager + networkmanagerapplet + polkit + samba + tracker + udisks2 + upower + vino ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index e301305d405d..6d4875979007 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/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 854ce9364468..14551fb7d0c3 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -7,13 +7,13 @@ let pname = "nautilus"; - version = "3.32.1"; + version = "3.32.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s"; + sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index b3f06c2dcc1c..444c144cfab8 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,29 +1,85 @@ -{ stdenv, fetchurl, lib, wrapGAppsHook -, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null -, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext -, networkmanager }: - -with lib; +{ stdenv +, fetchFromGitLab +, wrapGAppsHook +, pkgconfig +, gnome3 +, gtk3 +, glib +, intltool +, libXtst +, libnotify +, libsoup +, libsecret +, gnutls +, libgcrypt +, avahi +, zlib +, libjpeg +, libXdamage +, libXfixes +, libXext +, networkmanager +, gnome-common +, libtool +, automake +, autoconf +, telepathySupport ? false +, dbus-glib ? null +, telepathy-glib ? null +}: stdenv.mkDerivation rec { - name = "vino-${version}"; - version = "3.22.0"; + pname = "vino"; + version = "unstable-2019-07-08"; - src = fetchurl { - url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "vino"; + rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21"; + sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3"; }; doCheck = true; - nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ + autoconf + automake + gnome-common + intltool + libtool + pkgconfig + wrapGAppsHook + ]; buildInputs = [ - gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup - libsecret gnutls libgcrypt avahi zlib libjpeg - libXdamage libXfixes libXext networkmanager - ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; + avahi + glib + gnome3.adwaita-icon-theme + gnutls + gtk3 + libXdamage + libXext + libXfixes + libXtst + libgcrypt + libjpeg + libnotify + libsecret + libsoup + networkmanager + zlib + ] + ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ] + ; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + postInstall = stdenv.lib.optionalString (!telepathySupport) '' + rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service + ''; passthru = { updateScript = gnome3.updateScript { @@ -35,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Vino; description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman domenkozar ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 87b7be5bdd2f..1f16ff9d0b52 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -21,36 +21,6 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ]; - corePackages = with gnome3; [ - pkgs.desktop-file-utils - pkgs.shared-mime-info # for update-mime-database - pkgs.glib # for gsettings - pkgs.gtk3.out # for gtk-update-icon-cache - glib-networking gvfs dconf gnome-backgrounds gnome-control-center - pkgs.gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-extra adwaita-icon-theme gnome-shell-extensions - pkgs.hicolor-icon-theme - ]; - - optionalPackages = with gnome3; [ baobab eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-monitor simple-scan - gnome-terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweaks gnome-photos - nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs - gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool - gnome-getting-started-docs gnome-packagekit gnome-software - gnome-power-manager gnome-todo pkgs.gnome-usage - ]; - - gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku atomix aisleriot five-or-more - four-in-a-row gnome-chess gnome-klotski gnome-mahjongg - gnome-mines gnome-nibbles gnome-robots gnome-tetravex - hitori gnome-taquin - ]; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; @@ -113,8 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; - gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; @@ -141,10 +109,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-user-share = callPackage ./core/gnome-user-share { }; - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; @@ -196,10 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; { totem = callPackage ./core/totem { }; - tracker = callPackage ./core/tracker { }; - - tracker-miners = callPackage ./core/tracker-miners { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; @@ -251,10 +211,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-notes = callPackage ./apps/gnome-notes { }; - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_4; - }; - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; @@ -351,8 +307,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-autoar = callPackage ./misc/gnome-autoar { }; - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; } // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases @@ -392,10 +346,18 @@ lib.makeScope pkgs.newScope (self: with self; { easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 + inherit (pkgs) gnome-video-effects; # added 2019-08-19 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + defaultIconTheme = adwaita-icon-theme; gtk = gtk3; gtkmm = gtkmm3; rest = librest; pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 + + # added 2019-08-25 + corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`"; + optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`"; + gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`"; }) diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index cbac95c8f41e..3bea240ecb97 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; - version = "3.31.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18"; + sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 72cce760b03e..657bf4a76391 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.31.92"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m2w3zz6v1bsd1fn78ab79d72ywd9vq60rziazsblxsi4qy9dva5"; + sha256 = "15s20db2fq4cy031sw20pmf53hxiak44fgyjy5njqnp2h2sg3806"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index d9f3e5fc5ff8..f0da625316fa 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "tali-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v"; + sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 54d45eedc3d9..8babe77e4121 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07y5ii5bn7fgdpr88307fwxiafm5fwdxmzwhi6h1y4z880nnzp7f"; + sha256 = "0sg53zq81v28hdqiy5d048skwfgsa8ck0z7ywsagdh7iaqin68gq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix deleted file mode 100644 index b65e9c1021e7..000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: -let - pname = "gnome-video-effects"; - version = "0.4.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index f5331751c709..e639996f7c6a 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "compton-conf"; version = "0.14.1"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI configuration tool for compton X composite manager"; homepage = https://github.com/lxqt/compton-conf; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 3ce1ea068a71..c214f0b3dcd4 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -1,10 +1,10 @@ { - stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, + lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, pcre, libexif, xorg, libfm, menu-cache, qtx11extras, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "libfm-qt"; version = "0.14.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { menu-cache ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = https://github.com/lxqt/libfm-qt; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 193358605995..d94b1ac0d030 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "liblxqt"; version = "0.14.1"; @@ -27,18 +27,11 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver ]; - cmakeFlags = [ - "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" - ]; - postPatch = '' - sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Core utility library for all LXQt components"; homepage = https://github.com/lxqt/liblxqt; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index d351f3e0d6e1..799e4286803b 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "libqtxdg"; version = "3.3.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt implementation of freedesktop.org xdg specs"; homepage = https://github.com/lxqt/libqtxdg; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 74fa1b03fa6b..dc2ce54d6ae6 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "libsysstat"; version = "0.4.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library used to query system info and statistics"; homepage = https://github.com/lxqt/libsysstat; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index affa0cc8c9d6..33e6a1f99e5c 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lximage-qt"; version = "0.14.1"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libexif ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The image viewer and screenshot tool for lxqt"; homepage = https://github.com/lxqt/lximage-qt; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 7778eb92263c..595141daffc7 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-about"; version = "0.14.1"; @@ -25,12 +25,7 @@ stdenv.mkDerivation rec { libqtxdg ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = https://github.com/lxqt/lxqt-about; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 5ea6b0d08824..a49bb120791a 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-admin"; version = "0.14.1"; @@ -29,14 +29,9 @@ stdenv.mkDerivation rec { postPatch = '' sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \ -i lxqt-admin-user/CMakeLists.txt - - for f in lxqt-admin-{user,time}/CMakeLists.txt; do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LXQt system administration tool"; homepage = https://github.com/lxqt/lxqt-admin; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 75ec5aa06edc..da90826116f2 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +mkDerivation rec { pname = "lxqt-archiver"; version = "0.0.96"; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Archive tool for the LXQt desktop environment"; homepage = https://github.com/lxqt/lxqt-archiver/; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake b/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake new file mode 100644 index 000000000000..fd7ef927f8b3 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake @@ -0,0 +1,7 @@ +add_definitions("-DLXQT_RELATIVE_SHARE_DIR=\"${LXQT_RELATIVE_SHARE_DIR}\"") +add_definitions("-DLXQT_SHARE_DIR=\"${LXQT_SHARE_DIR}\"") +add_definitions("-DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=\"${LXQT_RELATIVE_TRANSLATIONS_DIR}\"") +add_definitions("-DLXQT_SHARE_TRANSLATIONS_DIR=\"${LXQT_TRANSLATIONS_DIR}\"") +add_definitions("-DLXQT_GRAPHICS_DIR=\"${LXQT_GRAPHICS_DIR}\"") +add_definitions("-DLXQT_ETC_XDG_DIR=\"${LXQT_ETC_XDG_DIR}\"") +add_definitions("-DLXQT_DATA_DIR=\"${LXQT_DATA_DIR}\"") diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f55fa579ff45..626c99fcf9c9 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-build-tools"; version = "0.6.0"; @@ -11,13 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig setupHook ]; buildInputs = [ qtbase glib pcre ]; - preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; + setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + # We're dependent on this macro doing add_definitions in most places + # But we have the setup-hook to set the values. + postInstall = '' + rm $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake + cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake + ''; + + meta = with lib; { description = "Various packaging tools and scripts for LXQt applications"; homepage = https://github.com/lxqt/lxqt-build-tools; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh new file mode 100644 index 000000000000..e40765116e9c --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh @@ -0,0 +1,15 @@ +LXQtCMakePostHook() { + cmakeFlagsArray+=( + -DLXQT_LIBRARY_NAME=lxqt + -DLXQT_SHARE_DIR=$out/share/lxqt + -DLXQT_TRANSLATIONS_DIR=$out/share/lxqt/translations + -DLXQT_GRAPHICS_DIR=$out/share/lxqt/graphics + -DLXQT_ETC_XDG_DIR=$out/etc/xdg + -DLXQT_DATA_DIR=$out/share + -DLXQT_RELATIVE_SHARE_DIR=lxqt + -DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=lxqt/translations + ) + +} + +postHooks+=(LXQtCMakePostHook) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index e7ba00bc8a89..d775a93fff4c 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-config"; version = "0.14.1"; @@ -38,27 +38,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - - for f in \ - lxqt-config-file-associations/CMakeLists.txt \ - lxqt-config-brightness/CMakeLists.txt \ - lxqt-config-appearance/CMakeLists.txt \ - lxqt-config-locale/CMakeLists.txt \ - lxqt-config-monitor/CMakeLists.txt \ - lxqt-config-input/CMakeLists.txt \ - liblxqt-config-cursor/CMakeLists.txt \ - src/CMakeLists.txt - do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done - sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools to configure LXQt and the underlying operating system"; homepage = https://github.com/lxqt/lxqt-config; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 0502426e82df..d836ddeea38f 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-globalkeys"; version = "0.14.1"; @@ -26,17 +26,7 @@ stdenv.mkDerivation rec { libqtxdg ]; - postPatch = '' - for dir in autostart xdg; do - substituteInPlace $dir/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - done - - substituteInPlace config/CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Daemon used to register global keyboard shortcuts"; homepage = https://github.com/lxqt/lxqt-globalkeys; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 7eed84b33908..81a6a423a210 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-notificationd"; version = "0.14.1"; @@ -16,16 +16,6 @@ stdenv.mkDerivation rec { lxqt-build-tools ]; - postPatch = '' - substituteInPlace autostart/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - - for f in {config,src}/CMakeLists.txt; do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done - ''; - buildInputs = [ qtbase qttools @@ -36,7 +26,7 @@ stdenv.mkDerivation rec { qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The LXQt notification daemon"; homepage = https://github.com/lxqt/lxqt-notificationd; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 7ba2f00b5c58..83048ed7d578 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-openssh-askpass"; version = "0.14.1"; @@ -26,12 +26,7 @@ stdenv.mkDerivation rec { libqtxdg ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "GUI to query passwords on behalf of SSH agents"; homepage = https://github.com/lxqt/lxqt-openssh-askpass; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 4363c9f83920..4558d36e554e 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, + lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, @@ -7,7 +7,7 @@ lxmenu-data, pcre, libXdamage }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-panel"; version = "0.14.1"; @@ -49,21 +49,7 @@ stdenv.mkDerivation rec { libXdamage ]; - postPatch = '' - for dir in autostart menu; do - substituteInPlace $dir/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - done - substituteInPlace panel/CMakeLists.txt \ - --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" - - for f in cmake/BuildPlugin.cmake panel/CMakeLists.txt; do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "The LXQt desktop panel"; homepage = https://github.com/lxqt/lxqt-panel; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 792a323e6820..d501d83947ec 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -1,10 +1,10 @@ { - stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, + lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, libqtxdg, pcre }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-policykit"; version = "0.14.1"; @@ -33,15 +33,7 @@ stdenv.mkDerivation rec { pcre ]; - postPatch = '' - substituteInPlace autostart/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxqt/lxqt-policykit; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 6bdf5ce2c0c6..9f8c66d826c5 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-powermanagement"; version = "0.14.1"; @@ -28,17 +28,7 @@ stdenv.mkDerivation rec { libqtxdg ]; - postPatch = '' - substituteInPlace autostart/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - - for f in {config,src}/CMakeLists.txt; do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Power management module for LXQt"; homepage = https://github.com/lxqt/lxqt-powermanagement; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 82f393cf8d52..604fc570e1fb 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -1,10 +1,10 @@ { - stdenv, fetchFromGitHub, + lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-qtplugin"; version = "0.14.0"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LXQt Qt platform integration plugin"; homepage = https://github.com/lxqt/lxqt-qtplugin; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 54236bfbb7ef..d737bd91c916 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, menu-cache, muparser, pcre }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-runner"; version = "0.14.1"; @@ -32,15 +32,7 @@ stdenv.mkDerivation rec { pcre ]; - postPatch = '' - substituteInPlace autostart/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxqt/lxqt-runner; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 40ef5697a547..fbf2c7ddde7c 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-session"; version = "0.14.1"; @@ -30,19 +30,7 @@ stdenv.mkDerivation rec { xdg-user-dirs ]; - postPatch = '' - for dir in autostart config; do - substituteInPlace $dir/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - done - - for f in lxqt-{config-session,leave,session}/CMakeLists.txt; do - substituteInPlace $f \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - done - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxqt/lxqt-session; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 6deef1bf56ba..91159398b8fc 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-sudo"; version = "0.14.1"; @@ -27,12 +27,7 @@ stdenv.mkDerivation rec { sudo ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "GUI frontend for sudo/su"; homepage = https://github.com/lxqt/lxqt-sudo; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 02591b9eb86e..9d8da87fd5d4 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lxqt-themes"; version = "0.14.0"; @@ -16,14 +16,7 @@ stdenv.mkDerivation rec { lxqt-build-tools ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" - substituteInPlace themes/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Themes, graphics and icons for LXQt"; homepage = https://github.com/lxqt/lxqt-themes; license = licenses.lgpl21; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 2360d1970c99..a5be8f419677 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "obconf-qt"; version = "0.14.1"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = https://github.com/lxqt/obconf-qt; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 00359e2ffede..7b7d7290320b 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pavucontrol-qt"; version = "0.14.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pcre ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = https://github.com/lxqt/pavucontrol-qt; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 320d451f087e..168b7f35ad27 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, qtx11extras, libfm-qt, menu-cache, lxmenu-data }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pcmanfm-qt"; version = "0.14.1"; @@ -28,14 +28,7 @@ stdenv.mkDerivation rec { lxmenu-data ]; - postPatch = '' - for dir in autostart config; do - substituteInPlace $dir/CMakeLists.txt \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" - done - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxqt/pcmanfm-qt; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index f5bdcf064fd8..c1b29b161254 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qlipper"; version = "5.1.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform clipboard history applet"; homepage = https://github.com/pvanek/qlipper; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index c17ef21c6768..942c9257c25d 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, lxqt-build-tools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qps"; version = "1.10.20"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtx11extras qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Qt process manager"; homepage = https://github.com/lxqt/qps; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 748d33aa2ce0..10f525eb9e6c 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, +{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, qtbase, qttools, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qterminal"; version = "0.14.1"; @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { qtermwidget ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight Qt-based terminal emulator"; homepage = https://github.com/lxqt/qterminal; license = licenses.gpl2; platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ romildo globin ]; }; } diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index e47d8e050828..e61360f6a3b4 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtermwidget"; version = "0.14.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake lxqt-build-tools ]; - buildInputs = [ qtbase qttools]; + buildInputs = [ qtbase qttools ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A terminal emulator widget for Qt 5"; homepage = https://github.com/lxqt/qtermwidget; license = licenses.gpl2; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 14fa977e023d..bac68f7166c5 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "screengrab"; version = "1.101"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Crossplatform tool for fast making screenshots"; homepage = https://github.com/lxqt/screengrab; license = licenses.gpl2; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dbcb992c425c..b273bbece969 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -44,7 +44,7 @@ runCommand "elementary-gsettings-desktop-schemas" {} cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' + picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' ${extraGSettingsOverrides} diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index d3e46cf23654..82fe5b65356c 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -83,6 +83,8 @@ makeScope newScope (self: with self; { xfce4-terminal = callPackage ./xfce4-terminal { }; + xfdashboard = callPackage ./xfdashboard { }; + xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; xfce4-whiskermenu-plugin = callPackage ./xfce4-whiskermenu-plugin { }; diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix index 933fa595aada..b0dcec78765d 100644 --- a/pkgs/desktops/xfce4-14/exo/default.nix +++ b/pkgs/desktops/xfce4-14/exo/default.nix @@ -1,26 +1,18 @@ -{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "exo"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "0.12.8"; - sha256 = "0s91fv4yzafmdi25c63yin15sa25cfcyarpvavr4q3mmmiamzpi0"; + sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5"; - nativeBuildInputs = [ libxslt perlPackages.URI ]; - buildInputs = [ gtk3 libxfce4ui libxfce4util ]; + nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; + buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; - postPatch = '' - substituteInPlace exo-helper/Makefile.am \ - --replace 'exo_helper_2_CFLAGS =' \ - 'exo_helper_2_CFLAGS = $(GIO_UNIX_CFLAGS)' - - substituteInPlace docs/reference/Makefile.am \ - --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xsl}/share/xml/docbook-xsl - ''; + # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = { description = "Application library for Xfce"; diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix index a63ddeb52ea9..d4e7e2ffc809 100644 --- a/pkgs/desktops/xfce4-14/garcon/default.nix +++ b/pkgs/desktops/xfce4-14/garcon/default.nix @@ -3,10 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "garcon"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "0.6.4"; - sha256 = "0d2fir4vbfdmng9k70nf5zv3fjwgr6g0czrp458x6qswih2gv2ik"; + sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv"; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix index 46b659b11d03..6939e8859ac9 100644 --- a/pkgs/desktops/xfce4-14/gigolo/default.nix +++ b/pkgs/desktops/xfce4-14/gigolo/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, exo, gtk3 }: +{ mkXfceDerivation, exo, gtk3, gvfs, glib }: mkXfceDerivation rec { category = "apps"; pname = "gigolo"; - version = "0.4.91"; + version = "0.5.0"; - sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7"; + sha256 = "1lqsxb0d5i8p9vbzx8s4p3rga7va5h1q146xgmsa41j5v40wrlw6"; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 ]; + buildInputs = [ gtk3 glib gvfs ]; } diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix index 77083fabbd35..2ea6d195d6fd 100644 --- a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix @@ -1,17 +1,21 @@ { lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM -, libstartup_notification ? null, libxfce4util, xfconf }: +, libstartup_notification, libxfce4util, xfconf }: mkXfceDerivation rec { category = "xfce"; pname = "libxfce4ui"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.1"; - sha256 = "0kvqzf91ygxxkcy4drjminby4c3c42c54a3if8jwx0zmgbml7l8q"; + sha256 = "0fnncf30s51qhgixn57z4d021pjjhzgsg2x69w4dy68vff2347qy"; - buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ gtk2 gtk3 libstartup_notification xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; + configureFlags = [ + "--with-vendor-info='NixOS'" + ]; + meta = with lib; { description = "Widgets library for Xfce"; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix index e6cafcac8bbf..99fe59583aa4 100644 --- a/pkgs/desktops/xfce4-14/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix @@ -3,12 +3,11 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4util"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "0s1fh798v86ifg46qn3zaykpwidn23vpqbkxq1fcbxpxb6rpxxwk"; + sha256 = "0vq16bzmnykiikg4dhiaj0qbyj76nkdd54j6k6n568h3dc9ix6q4"; - buildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ gobject-introspection ]; meta = with lib; { description = "Extension library for Xfce"; diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix index da7179c46462..cf4b5eb3cdc6 100644 --- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }: +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }: { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: @@ -15,7 +15,7 @@ let template = rec { name = "${pname}-${version}"; - nativeBuildInputs = [ pkgconfig xfce4-dev-tools ]; + nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix index b5fd3a19d060..ca80fd8bf53e 100644 --- a/pkgs/desktops/xfce4-14/mousepad/default.nix +++ b/pkgs/desktops/xfce4-14/mousepad/default.nix @@ -1,12 +1,15 @@ -{ mkXfceDerivation, exo, wrapGAppsHook, dbus-glib, gtk3, gtksourceview3 }: +{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "mousepad"; - version = "0.4.1"; + version = "0.4.2"; - sha256 = "0pr1w9n0qq2raxhy78982i9g17x0ya02q7vdrn0wb2bpk74hlki5"; + sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; - nativeBuildInputs = [ exo wrapGAppsHook ]; - buildInputs = [ dbus-glib gtk3 gtksourceview3 ]; + nativeBuildInputs = [ exo ]; + buildInputs = [ glib gtk3 gtksourceview3 xfconf ]; + + # See https://github.com/NixOS/nixpkgs/issues/36468 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; } diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix index 3c8395a49088..8c453aa96a25 100644 --- a/pkgs/desktops/xfce4-14/orage/default.nix +++ b/pkgs/desktops/xfce4-14/orage/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: +, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix index f3a4561826e8..578be8329b0c 100644 --- a/pkgs/desktops/xfce4-14/parole/default.nix +++ b/pkgs/desktops/xfce4-14/parole/default.nix @@ -1,24 +1,22 @@ -{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib -, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good -, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util -, taglib ? null, xfconf }: +{ mkXfceDerivation, dbus, dbus-glib +, gst-plugins-bad, gst-plugins-base, gst-plugins-good +, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util +, taglib, xfconf }: # Doesn't seem to find H.264 codec even though built with gst-plugins-bad. mkXfceDerivation rec { category = "apps"; pname = "parole"; - version = "1.0.2"; + version = "1.0.4"; - sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl"; + sha256 = "18j4bmny37crryh4pvxcjjvj99mln6ljq2vy69awxhvrjx9ljv13"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS ''; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ dbus dbus-glib diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix index b2da81399301..1c09d3a0c008 100644 --- a/pkgs/desktops/xfce4-14/ristretto/default.nix +++ b/pkgs/desktops/xfce4-14/ristretto/default.nix @@ -1,18 +1,13 @@ -{ mkXfceDerivation, automakeAddFlags, exo, dbus-glib, gtk2, libexif +{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "ristretto"; - version = "0.8.4"; + version = "0.10.0"; - postPatch = '' - automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS - automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS - ''; + sha256 = "07h7wbq3xh2ac6q4kp2ai1incfn0zfxxngap7hzqx47a5xw2mrm8"; - nativeBuildInputs = [ automakeAddFlags exo ]; - buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; - - sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf"; + nativeBuildInputs = [ exo ]; + buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; } diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix index db7324140c5b..1fa714c7ff1b 100644 --- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix +++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix @@ -3,10 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar-volman"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "0.9.5"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "0jl863z6rxz50vqa31s58dfn429yn5x8scg492bvgl4cnmni6a30"; + sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0"; } diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix index 27fe256490a1..ed0be4420232 100644 --- a/pkgs/desktops/xfce4-14/thunar/default.nix +++ b/pkgs/desktops/xfce4-14/thunar/default.nix @@ -1,21 +1,14 @@ -{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev ? null -, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: +{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev +, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }: mkXfceDerivation rec { category = "xfce"; pname = "thunar"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "1.8.9"; - sha256 = "0b17yf8ss8s8xyr65v4zrq15ayr5nskqpxy4wxah33n7lz09dh8r"; + sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w"; - postPatch = '' - substituteInPlace docs/Makefile.am \ - --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xsl}/share/xml/docbook-xsl - ''; - - nativeBuildInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt docbook_xsl gobject-introspection ]; buildInputs = [ exo @@ -27,5 +20,6 @@ mkXfceDerivation rec { libxfce4ui libxfce4util xfconf + gvfs ]; } diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix index 81cc0922ff35..81b008083366 100644 --- a/pkgs/desktops/xfce4-14/tumbler/default.nix +++ b/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -1,15 +1,30 @@ -{ mkXfceDerivation, gdk-pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null -, poppler ? null }: +{ mkXfceDerivation +, ffmpegthumbnailer +, gdk-pixbuf +, glib +, freetype +, libgsf +, poppler +, libjpeg +, gst_all_1 +}: # TODO: add libopenraw mkXfceDerivation rec { category = "xfce"; pname = "tumbler"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "0.2.7"; - sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i"; + sha256 = "14ql3fcxyz81qr9s0vcwh6j2ks5fl8jf9scwnkilv5jy0ii9l0ry"; - buildInputs = [ gdk-pixbuf ffmpegthumbnailer libgsf poppler ]; + buildInputs = [ + ffmpegthumbnailer + freetype + gdk-pixbuf + glib + gst_all_1.gst-plugins-base + libgsf + poppler # technically the glib binding + ]; } diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix index b8a61f6cf90c..97d086366565 100644 --- a/pkgs/desktops/xfce4-14/xfburn/default.nix +++ b/pkgs/desktops/xfce4-14/xfburn/default.nix @@ -5,14 +5,8 @@ mkXfceDerivation rec { pname = "xfburn"; version = "0.5.5"; - postPatch = '' - substituteInPlace docs/Makefile.am \ - --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xsl}/share/xml/docbook-xsl - ''; - sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; - nativeBuildInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ]; } diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix index 22a6b6fedd29..312e64cdbbe9 100644 --- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix @@ -3,10 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "0vr5lx4fv0kldqvqfnsjp6ss7ciz0b2yjq4fhmrhk8czkf8p7va8"; + sha256 = "04h7jxfm3wkxnxfy8149dckay7i160vvk4p9lnq6xny22r4x20h8"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix index 49133b0ba2d9..b18f3fd45d62 100644 --- a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix @@ -4,10 +4,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "11g5byxjihgkn0wi7gp8627d04wr59k117lpv53vdbsvv2qgksmg"; + sha256 = "10hcj88784faqrk08xb538355cla26vdk9ckx158hqdqv38sb42f"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix index 98ed6882a024..a99c3ecb9844 100644 --- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, dbus-glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: mkXfceDerivation rec { @@ -8,5 +8,5 @@ mkXfceDerivation rec { sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; - buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix index 4f1de32abdf2..27acb3bee587 100644 --- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix @@ -1,15 +1,14 @@ -{ mkXfceDerivation, makeWrapper, tzdata, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }: +{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: mkXfceDerivation rec { category = "xfce"; pname = "xfce4-panel"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "1p0bkbxjh14kgny2lpcjg2q8pm55l8i7qsr5bsvdppw3ab46kz34"; + sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + nativeBuildInputs = [ gobject-introspection ]; + buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; patches = [ ../../xfce/core/xfce4-panel-datadir.patch ]; patchFlags = "-p1"; @@ -19,18 +18,11 @@ mkXfceDerivation rec { substituteInPlace $f --replace gettext ${gettext}/bin/gettext done substituteInPlace plugins/clock/clock.c \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ - --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" "" + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; configureFlags = [ "--enable-gtk3" ]; - postInstall = '' - wrapProgram "$out/bin/xfce4-panel" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" - ''; - meta = { description = "Xfce's panel"; }; diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix index a855f2c977e9..115668334c3c 100644 --- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix @@ -4,10 +4,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "1.6.5"; - sha256 = "1x1ssji4v9qp64si38paz15bgsgs1w3hkx080qznnmcxqlg7zpj9"; + sha256 = "0zazm2cgkz5xj7rvy9gbh4kaay2anfcmawg4gj38pnq3a8zcwwd5"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix index 95af146903b1..0f74a78e8f2c 100644 --- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }: +{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }: mkXfceDerivation rec { category = "apps"; @@ -7,6 +7,5 @@ mkXfceDerivation rec { sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; - nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; } diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix index a39a70b09a81..070f40b52d5c 100644 --- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix @@ -1,26 +1,18 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, dbus-glib, dbus, iceauth, gtk3, libwnck3, xorg }: +{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }: mkXfceDerivation rec { category = "xfce"; pname = "xfce4-session"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "1asfy11rp6zmn70a3w5dqssxpxywhpm9ns7zyiaz6pnpcq075dr0"; + sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104"; - buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; + buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; - configureFlags = [ "--with-xsession-prefix=$(out)" ]; + configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus.dev}/include/dbus-1.0" - "-I${dbus.lib}/lib/dbus-1.0/include" - ]; - - postPatch = '' - substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 - substituteInPlace scripts/xflock4 --replace PATH=/bin:/usr/bin "PATH=\$PATH:$out/bin:${xorg.xset}/bin" - ''; + # See https://github.com/NixOS/nixpkgs/issues/36468 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = { description = "Session manager for Xfce"; diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix index a939f5e213cb..21aaef5fd081 100644 --- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix @@ -1,35 +1,32 @@ -{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3 -, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null -, upower ? null, xfconf, xf86inputlibinput ? null }: +{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3, glib +, libnotify, libxfce4ui, libxfce4util, libxklavier +, upower, xfconf, xf86inputlibinput }: mkXfceDerivation rec { category = "xfce"; pname = "xfce4-settings"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "0agi5flbzbc9q29yh7wbk3giif74finf4shq3q7v2h91w5kvyc9j"; + sha256 = "13gmxd4sfgd6wky7s03bar58w9vl4i6jv2wncd6iajww791y5akn"; postPatch = '' - automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS for f in $(find . -name \*.c); do substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>' done ''; - nativeBuildInputs = [ automakeAddFlags ]; - buildInputs = [ exo garcon + glib gtk3 libnotify libxfce4ui libxfce4util libxklavier upower - xfconf xf86inputlibinput + xfconf ]; configureFlags = [ diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix index 6bc88ee76611..e62332343ba7 100644 --- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix @@ -1,14 +1,13 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte }: +{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }: mkXfceDerivation rec { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.7.4"; + version = "0.8.8"; - sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y"; + sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; - buildInputs = [ gtk3 libxfce4ui vte ]; - nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 libxfce4ui vte xfconf ]; meta = { description = "A modern terminal emulator"; diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix index 626451c70d63..b1405910021a 100644 --- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gtk3, libnotify ? null, libpulseaudio, keybinder3, xfconf }: +{ lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }: mkXfceDerivation rec { category = "apps"; diff --git a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix index 41cd491a7dc2..f943f2ab333a 100644 --- a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix @@ -1,15 +1,15 @@ -{ mkXfceDerivation, dbus-glib, gtk3, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.3.2"; + version = "2.3.3"; rev = "v${version}"; - sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs"; + sha256 = "0agh0a5srsy6vi6r50ak9rb42r7vcnfv6nfvg4qbqi77yc44yqdb"; nativeBuildInputs = [ cmake ]; - buildInputs = [ dbus-glib exo garcon gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; postInstall = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix index 8a37aefab415..8e56e0f8b37d 100644 --- a/pkgs/desktops/xfce4-14/xfconf/default.nix +++ b/pkgs/desktops/xfce4-14/xfconf/default.nix @@ -3,10 +3,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfconf"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.1"; - sha256 = "056r2dkkw8hahqin1p5k8rz0r9r0z8piniy855nd1ns0mx2sh47k"; + sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs"; buildInputs = [ libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-14/xfdashboard/default.nix b/pkgs/desktops/xfce4-14/xfdashboard/default.nix new file mode 100644 index 000000000000..a17c29f6723e --- /dev/null +++ b/pkgs/desktops/xfce4-14/xfdashboard/default.nix @@ -0,0 +1,44 @@ +{ mkXfceDerivation +, clutter +, libXcomposite +, libXinerama +, libXdamage +, libX11 +, libwnck3 +, libxfce4ui +, libxfce4util +, garcon +, xfconf +, gtk3 +, glib +, dbus-glib +}: + +mkXfceDerivation { + category = "apps"; + pname = "xfdashboard"; + version = "0.7.5"; + rev = "0.7.5"; + + sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i"; + + buildInputs = [ + clutter + dbus-glib + garcon + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXinerama + libwnck3 + libxfce4ui + libxfce4util + xfconf + ]; + + meta = { + description = "Gnome shell like dashboard"; + }; +} diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix index 6b99b1b6a350..c4b7d738b329 100644 --- a/pkgs/desktops/xfce4-14/xfdesktop/default.nix +++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix @@ -1,14 +1,11 @@ -{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: +{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }: mkXfceDerivation rec { category = "xfce"; pname = "xfdesktop"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.1"; - sha256 = "14sfcxbwxhhwn9nmiap46nz6idvw5hwr8wyjqrhq4h79x78g18k4"; - - nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" + sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g"; buildInputs = [ exo @@ -17,6 +14,9 @@ mkXfceDerivation rec { libxfce4util libwnck3 xfconf + libnotify + garcon + thunar ]; meta = { diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix index 34b5bdae45a0..b84487c09ae0 100644 --- a/pkgs/desktops/xfce4-14/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix @@ -5,10 +5,9 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfwm4"; - version = "4.14pre2"; - rev = "xfce-4.14pre2"; + version = "4.14.0"; - sha256 = "00nysv5qrv5n4xzyqv4jnsmgljwr2wyynis1gpdbm2kvl5ndxrrd"; + sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix new file mode 100644 index 000000000000..a3c34bd7e8e6 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: + +stdenv.mkDerivation rec { + pname = "adoptopenjdk-icedtea-web"; + + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "AdoptOpenJDK"; + repo = "IcedTea-Web"; + rev = "${pname}-${version}"; + sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; + + preConfigure = '' + 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 = '' + A Free Software web browser plugin running applets written in the Java + programming language and an implementation of Java Web Start, originally + based on the NetX project. + ''; + homepage = https://github.com/adoptopenjdk/icedtea-web; + maintainers = with stdenv.lib.maintainers; [ wizeman ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch new file mode 100644 index 000000000000..85cad6cf4678 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-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/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 1b53a142d12a..52323b3de765 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 = "88"; + defaultVersion = "89"; # Map from git revs to SHA256 hashes sha256s = { - "version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi"; + "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 a3b32ceee0cf..74f711811907 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 2d3324ceaca4..a8e3ee5976e8 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 2447aeb0ceae..f5ebaaf638e3 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/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 33957b5a8dcf..69e11a48918c 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./configure \ + --replace '|8.9.0' '|8.9.0|8.9.1' \ --replace '{toolprefix}gcc' '{toolprefix}cc' ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 2e823fe1f0f8..db57bc3e9df7 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -199,5 +199,12 @@ in rec { binary = binaryCrystal_0_29; }; - crystal = crystal_0_29; + crystal_0_30 = generic { + version = "0.30.1"; + sha256 = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs"; + doCheck = false; # 6 checks are failing now + binary = binaryCrystal_0_29; + }; + + crystal = crystal_0_30; } diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index 6c1fa37e81a4..984ab39c91ad 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/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 809fc6a4cf1a..2a90902df1e7 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libuuid, python2, iasl }: +{ stdenv, fetchgit, fetchpatch, libuuid, python3, iasl, bc }: let - pythonEnv = python2.withPackages(ps: [ps.tkinter]); + pythonEnv = python3.withPackages (ps: [ps.tkinter]); targetArch = if stdenv.isi686 then "IA32" @@ -13,80 +13,67 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2017-12-05"; - - src = fetchFromGitHub { - owner = "tianocore"; - repo = "edk2"; - rev = "f71a70e7a4c93a6143d7bad8ab0220a947679697"; - sha256 = "0k48xfwxcgcim1bhkggc19hilvsxsf5axvvcpmld0ng1fcfg0cr6"; + pname = "edk2"; + version = "201905"; + + # submodules + src = fetchgit { + url = "https://github.com/tianocore/edk2"; + rev = "edk2-stable${edk2.version}"; + sha256 = "0fk40h4nj4qg8shg0yd1zj4iyspslms5fx95ysi04akv90k5sqkn"; }; - patches = [ - (fetchpatch { - name = "short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch"; - url = "https://github.com/tianocore/edk2/commit/9e2a8e928995c3b1bb664b73fd59785055c6b5f6.diff"; - sha256 = "0x24npijhgpjpsn3n74wayf8qcbaj97vi4z2iyf4almavqq8qaz4"; - }) - ]; - buildInputs = [ libuuid pythonEnv ]; - makeFlags = "-C BaseTools"; + makeFlags = [ "-C BaseTools" ]; hardeningDisable = [ "format" "fortify" ]; installPhase = '' mkdir -vp $out mv -v BaseTools $out - mv -v EdkCompatibilityPkg $out mv -v edksetup.sh $out ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel EFI development kit"; homepage = https://sourceforge.net/projects/edk2/; - license = stdenv.lib.licenses.bsd2; - branch = "UDK2017"; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + license = licenses.bsd2; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; passthru = { - setup = projectDscPath: attrs: { - buildInputs = [ pythonEnv ] ++ - stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs; + mkDerivation = projectDscPath: attrs: stdenv.mkDerivation ({ + inherit (edk2) src; - configurePhase = '' - mkdir -v Conf + buildInputs = [ bc pythonEnv ] ++ attrs.buildInputs or []; - cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt - sed -i Conf/target.txt \ - -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \ - -e 's|MYTOOLS|GCC49|' \ - -e 's|IA32|${targetArch}|' \ - -e 's|DEBUG|RELEASE|'\ - - cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt - sed -i Conf/tools_def.txt \ - -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ - -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ - -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' + prePatch = '' + rm -rf BaseTools + ln -sv ${edk2}/BaseTools BaseTools + ''; + configurePhase = '' + runHook preConfigure export WORKSPACE="$PWD" - export EFI_SOURCE="$PWD/EdkCompatibilityPkg" - ln -sv ${edk2}/BaseTools BaseTools - ln -sv ${edk2}/EdkCompatibilityPkg EdkCompatibilityPkg . ${edk2}/edksetup.sh BaseTools + runHook postConfigure ''; - buildPhase = " - build - "; + buildPhase = '' + runHook preBuild + build -a ${targetArch} -b RELEASE -t GCC5 -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags + runHook postBuild + ''; - installPhase = "mv -v Build/*/* $out"; - } // (removeAttrs attrs [ "buildInputs" ] ); + installPhase = '' + runHook preInstall + mv -v Build/*/* $out + runHook postInstall + ''; + } // removeAttrs attrs [ "buildInputs" ]); }; }; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index aaae9fa4ba9c..3660e42e363b 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 c26ac151af49..44d784133f5f 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.16"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "19x5244bcg97mnx871daksj98fg4zxc8jmihl0napcd77xmiga8s"; + sha256 = "1jaqm7w458ny37fsw3fln17kw31rcsk8kyadci45qcbw6jspmn7k"; }; installPhase = '' diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix new file mode 100644 index 000000000000..c599c9f8baf5 --- /dev/null +++ b/pkgs/development/compilers/flux/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "flux"; + version = "2013-09-20"; + + src = fetchFromGitHub { + owner = "deniskropp"; + repo = pname; + rev = "e45758aa9384b9740ff021ea952399fd113eb0e9"; + sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + meta = with lib; { + description = "An interface description language used by DirectFB"; + homepage = "https://github.com/deniskropp/flux"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index e0094c73098f..468fd49ba44e 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -1,14 +1,14 @@ # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: +{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "4.1.7"; + version = "4.1.34"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; + sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { automake which mono + msbuild dotnetbuildhelpers dotnetPackages.FsCheck262 dotnetPackages.FSharpCompilerTools - dotnetPackages.FSharpCore + dotnetPackages.FSharpCore302 + dotnetPackages.FSharpCore3125 + dotnetPackages.FSharpCore4001 + dotnetPackages.FSharpCore4117 dotnetPackages.FSharpData225 - dotnetPackages.FsLexYacc704 + dotnetPackages.FsLexYacc706 dotnetPackages.MicrosoftDiaSymReader dotnetPackages.MicrosoftDiaSymReaderPortablePdb dotnetPackages.NUnit350 @@ -31,6 +35,14 @@ stdenv.mkDerivation rec { dotnetPackages.SystemValueTuple ]; + # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches + # https://github.com/mono/mono/issues/7805 + patches = [ + ./fsharp-IsPathRooted-type-inference.patch + ./fsharp-string-switchName.patch + ./fsharp-path-overloads.patch + ]; + configurePhase = '' substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" ./autogen.sh --prefix $out @@ -47,24 +59,30 @@ stdenv.mkDerivation rec { mkdir packages ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 - ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4 - ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27 + ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2 + ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5 + ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17 ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 - ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4 + ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6 ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 - ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0 + ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1 ''; - # Make sure the executables use the right mono binary, - # and set up some symlinks for backwards compatibility. + # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key + # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path + # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied. + preInstall = '' + find Release/ -name FSharp.Core.dll -exec chmod u+w {} \; + ''; + + # Set up some symlinks for backwards compatibility. postInstall = '' - substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " ln -s $out/bin/fsharpc $out/bin/fsc ln -s $out/bin/fsharpi $out/bin/fsi for dll in "$out/lib/mono/fsharp"/FSharp*.dll @@ -73,6 +91,26 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = '' + echo 'printf "int = %i" (6 * 7);;' > script.fsx + $out/bin/fsi --exec script.fsx | grep "int = 42" + $out/bin/fsharpi --exec script.fsx | grep "int = 42" + $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42" + + cat > answer.fs <<EOF +open System + +[<EntryPoint>] +let main argv = + printfn "int = %i" (6 * 7) + 0 +EOF + + $out/bin/fsc answer.fs + ${mono}/bin/mono answer.exe | grep "int = 42" + ''; + # To fix this error when running: # The file "/nix/store/path/whatever.exe" is an not a valid CIL image dontStrip = true; diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch new file mode 100644 index 000000000000..06dd3e82adc9 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch @@ -0,0 +1,21 @@ +commit c37fce5b3019c7a150203fc3a484885591b194de +Author: Alexis Christoforides <alexis@thenull.net> +Date: Sun Dec 2 00:10:24 2018 -0500 + + Help Path.IsPathRooted method overload selection. + + .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload. + +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..699c7bb93 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -92,7 +92,7 @@ module Scripting = + + module Process = + +- let processExePath baseDir exe = ++ let processExePath baseDir (exe:string) = + if Path.IsPathRooted(exe) then exe + else + match Path.GetDirectoryName(exe) with diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch new file mode 100644 index 000000000000..f791317d0802 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch @@ -0,0 +1,22 @@ +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..ae8a6d3cc 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -59,12 +59,12 @@ module Scripting = + + let (++) a b = Path.Combine(a,b) + +- let getBasename a = Path.GetFileNameWithoutExtension a +- let getFullPath a = Path.GetFullPath a +- let getFilename a = Path.GetFileName a +- let getDirectoryName a = Path.GetDirectoryName a ++ let getBasename (path: string) = Path.GetFileNameWithoutExtension path ++ let getFullPath (path: string) = Path.GetFullPath path ++ let getFilename (path: string) = Path.GetFileName path ++ let getDirectoryName (path: string) = Path.GetDirectoryName path + +- let copyFile source dir = ++ let copyFile (source: string) dir = + let dest = + if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore + let result = Path.Combine(dir, Path.GetFileName source) diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch new file mode 100644 index 000000000000..4b36eaabcafc --- /dev/null +++ b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch @@ -0,0 +1,13 @@ +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..5a7be7d2b 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -36,7 +36,7 @@ module Scripting = + #if INTERACTIVE + let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray + +- let getCmdLineArgOptional switchName = ++ let getCmdLineArgOptional (switchName: string) = + argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead + + let getCmdLineArg switchName defaultValue = diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 5788f0df1da9..d855b83f0afc 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/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 0d75de7557be..506cfee7f498 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "9.1.0"; +let version = "9.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -131,7 +131,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr"; + sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"; }; inherit patches; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 6e60ea6fea49..a9618a7e0667 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.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 81d1a6f9b8a5..95bbab3cb3e1 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.1"; 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/${version}/ghc-${version}-src.tar.xz"; + sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 56a386d8b97d..a87876390537 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.11.12"; + version = "1.11.13"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "09k9zmq7hhgg0bf1y7rwa0kn7q1vkkr94cmg2iv9lq3najh5nykd"; + sha256 = "0xj0pbviikdf8g0sfz5hwxf7hwz8b8g5akqnrvyclhgnsdghjcjh"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 098870c98084..dae4c173223c 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.7"; + version = "1.12.9"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"; + sha256 = "1z32imbwmpkzgyh5c3vi7rbvzbq94xjk5qi2xm9sccj7kknmc3mb"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix new file mode 100644 index 000000000000..84cb38aa8d11 --- /dev/null +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -0,0 +1,133 @@ +{ stdenv, requireFile, perl, unzip, glibc, zlib, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: + +let + graalvm8-ee = stdenv.mkDerivation rec { + pname = "graalvm8-ee"; + version = "19.2.0"; + srcs = [ + (requireFile { + name = "graalvm-ee-linux-amd64-${version}.tar.gz"; + sha256 = "1j56lyids48zyjhxk8xl4niy8hk6qzi1aj7c55yfh62id8v6cpbw"; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "native-image-installable-svm-svmee-linux-amd64-${version}.jar"; + sha256 = "07c25l27msxccqrbz4bknz0sxsl0z2k8990cdfkbrgxvhxspfnnm"; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "python-installable-svm-svmee-linux-amd64-${version}.jar"; + sha256 = "1c7kpz56w9p418li97ymixdwywscr85vhn7jkzxq71bj7ia7pxwz"; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "ruby-installable-svm-svmee-linux-amd64-${version}.jar"; + sha256 = "13jfm5qpxqxz7f5n9yyvqrv1vwigifrjwk3hssp23maski2ssys1"; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + ]; + nativeBuildInputs = [ unzip perl ]; + unpackPhase = '' + unpack_jar() { + jar=$1 + unzip $jar -d $out + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + system "ln -s $2 $ENV{out}/$1"; + }' $out/META-INF/symlinks + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' $out/META-INF/permissions + rm -rf $out/META-INF + } + + mkdir -p $out + arr=($srcs) + tar xf ''${arr[0]} -C $out --strip-components=1 + unpack_jar ''${arr[1]} + unpack_jar ''${arr[2]} + unpack_jar ''${arr[3]} + ''; + + installPhase = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + done + ''; + + dontStrip = true; + + preFixup = '' + # 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; fi + EOF + ''; + + postFixup = '' + rpath="$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:${ + stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender + glib zlib alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + + for f in $(find $out -type f -perm -0100); do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true + patchelf --set-rpath "$rpath" "$f" || true + done + + for f in $(find $out -type f -perm -0100); do + if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi + done + ''; + + propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + + doInstallCheck = true; + installCheckPhase = '' + echo ${stdenv.lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image --no-server HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + + # Ahead-Of-Time compilation with --static + $out/bin/native-image --no-server --static HelloWorld + ./helloworld + ./helloworld | fgrep 'Hello World' + ''; + + passthru.home = graalvm8-ee; + + meta = with stdenv.lib; { + homepage = https://www.graalvm.org/; + description = "High-Performance Polyglot VM"; + license = licenses.unfree; + maintainers = with maintainers; [ volth hlolli ]; + platforms = [ "x86_64-linux" ]; + }; + }; +in + graalvm8-ee diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix deleted file mode 100644 index 9390cbde6377..000000000000 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }: - -stdenv.mkDerivation rec { - name = "icedtea-web-${version}"; - - version = "1.7.1"; - - src = fetchurl { - url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; - }; - - nativeBuildInputs = [ pkgconfig bc perl ]; - buildInputs = [ gtk2 xulrunner zip npapi_sdk ]; - - preConfigure = '' - #patchShebangs javac.in - configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") - ''; - - configureFlags = [ - "--with-jdk-home=${jdk.home}" - "--disable-docs" - ]; - - mozillaPlugin = "/lib"; - - meta = { - description = "Java web browser plugin and an implementation of Java Web Start"; - longDescription = '' - A Free Software web browser plugin running applets written in the Java - programming language and an implementation of Java Web Start, originally - based on the NetX project. - ''; - homepage = http://icedtea.classpath.org/wiki/IcedTea-Web; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index a679eda33066..3cd9daee1416 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,8 +1,8 @@ import ./shared.nix { majorVersion = "1"; minorVersion = "0"; - maintenanceVersion = "3"; - src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l"; + maintenanceVersion = "4"; + src_sha256 = "1dfx68wbrrzpbh74rla7i2g3r5z6wa1pxq3ahyfm5m27vfyjbkhg"; libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; diff --git a/pkgs/development/compilers/julia/1.1.nix b/pkgs/development/compilers/julia/1.1.nix index a868f949d27c..5be34b4c4b4c 100644 --- a/pkgs/development/compilers/julia/1.1.nix +++ b/pkgs/development/compilers/julia/1.1.nix @@ -1,8 +1,8 @@ import ./shared.nix { majorVersion = "1"; minorVersion = "1"; - maintenanceVersion = "0"; - src_sha256 = "08fyck4qcdv9nnrdqh1wb7lb8pkkikh67xx5lc872sjl9w3p0sak"; + maintenanceVersion = "1"; + src_sha256 = "1yqjd0n42xf9hzxpvc9vysyjj98p42by216jkdqakdy7dkjcmnhq"; libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; 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 000000000000..a4a0f21b0fcd --- /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 266a877f7620..6911089250e8 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -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 25db273d7e3a..5959b99316d9 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -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/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 648320028536..75edd1fff54d 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { name = "libunwind-${version}"; @@ -19,4 +19,6 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix new file mode 100644 index 000000000000..ec91d7e979c1 --- /dev/null +++ b/pkgs/development/compilers/mono/6.nix @@ -0,0 +1,9 @@ +{ callPackage, Foundation, libobjc }: + +callPackage ./generic.nix (rec { + inherit Foundation libobjc; + version = "6.0.0.313"; + srcArchiveSuffix = "tar.xz"; + sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9"; + enableParallelBuilding = true; +}) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 43ef5d4b62d1..6b5c15642a5c 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +, enableParallelBuilding ? true +, srcArchiveSuffix ? "tar.bz2" +}: let llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { name = "mono-${version}"; - src = fetchurl { inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${name}.${srcArchiveSuffix}"; }; buildInputs = diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 89726f20c6b8..b22072651a46 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp perl ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; src = fetchurl { url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://mosml.org/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ vaibhavsagar ]; }; } diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351c..c1e01ef77828 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -2,54 +2,44 @@ , boost, python3, eigen , icestorm, trellis -# TODO(thoughtpolice) Currently the GUI build seems broken at runtime on my -# laptop (and over a remote X server on my server...), so mark it broken for -# now, with intent to fix later. -, enableGui ? false -, qtbase, wrapQtAppsHook +, enableGui ? true +, wrapQtAppsHook +, qtbase }: let boostPython = boost.override { python = python3; enablePython = true; }; - - # This is a massive hack. For now, Trellis doesn't really support - # installation through an already-built package; you have to build it once to - # get the tools, then reuse the build directory to build nextpnr -- the - # 'install' phase doesn't install everything it needs. This will be fixed in - # the future but for now we can do this horrific thing. - trellisRoot = trellis.overrideAttrs (_: { - installPhase = '' - mkdir -p $out - cp *.so .. - cd ../../.. && cp -R trellis database $out/ - ''; - }); in -stdenv.mkDerivation rec { - name = "nextpnr-${version}"; - version = "2019.04.19"; +with stdenv; mkDerivation rec { + pname = "nextpnr"; + version = "2019.08.21"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b"; - sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a"; + rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4"; + sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"; }; nativeBuildInputs = [ cmake ] - ++ (stdenv.lib.optional enableGui wrapQtAppsHook); + ++ (lib.optional enableGui wrapQtAppsHook); buildInputs = [ boostPython python3 eigen ] - ++ (stdenv.lib.optional enableGui qtbase); + ++ (lib.optional enableGui qtbase); enableParallelBuilding = true; cmakeFlags = [ "-DARCH=generic;ice40;ecp5" "-DICEBOX_ROOT=${icestorm}/share/icebox" - "-DTRELLIS_ROOT=${trellisRoot}/trellis" + "-DTRELLIS_ROOT=${trellis}/share/trellis" + "-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DUSE_OPENMP=ON" - ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + # warning: high RAM usage + "-DSERIALIZE_CHIPDB=OFF" + # use PyPy for icestorm if enabled + "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" + ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. @@ -58,13 +48,18 @@ stdenv.mkDerivation rec { --replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}' ''; - meta = with stdenv.lib; { + + postFixup = lib.optionalString enableGui '' + wrapQtApp $out/bin/nextpnr-generic + wrapQtApp $out/bin/nextpnr-ice40 + wrapQtApp $out/bin/nextpnr-ecp5 + ''; + + meta = with lib; { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; - - broken = enableGui; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice emily ]; }; } diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 4f9b8ebd294c..11c22e636ef1 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/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index ccd149bbb404..80ea9eb4c0b8 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -1,33 +1,31 @@ -{ stdenv, fetchFromGitHub, coreutils, which }: +{ stdenv, fetchFromGitLab, coreutils, which }: stdenv.mkDerivation rec { - name = "owl-lisp-${version}"; - version = "0.1.16"; + pname = "owl-lisp"; + version = "0.1.19"; - src = fetchFromGitHub { - owner = "aoh"; - repo = "owl-lisp"; + src = fetchFromGitLab { + owner = "owl-lisp"; + repo = "owl"; rev = "v${version}"; - sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj"; + sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx"; }; nativeBuildInputs = [ which ]; prePatch = '' - substituteInPlace Makefile --replace /usr $out - - for f in tests/run tests/exec.sh ; do - substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo - done + substituteInPlace Makefile \ + --replace /usr $out ''; # tests are run as part of the compilation process doCheck = false; meta = with stdenv.lib; { - description = "A functional lisp"; - homepage = https://github.com/aoh/owl-lisp; + description = "A functional Scheme for world domination"; + homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e16e2c514a85..85641c351d49 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 821a9b8125cd..2aab6a99a1cf 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 d7315b73c9b5..8926fced482d 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 9f576042787a..e000edad49b6 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 000000000000..2b8fcbe0ba4b --- /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 0e3de0c4ab98..a39cd785cf7c 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -59,11 +59,14 @@ pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; }; pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages_5.stdenv; }; }); + rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; cargo = self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; inherit CoreFoundation Security; }; + clippy = self.callPackage ./clippy.nix { inherit Security; }; + rls = self.callPackage ./rls { inherit CoreFoundation Security; }; }); }; } diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 454c5da71438..470611242e07 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "rls"; - # with rust 1.x you can only build rls version 1.x.y - version = "1.36.0"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = pname; - rev = version; - sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn"; - }; + inherit (rustPlatform.rust.rustc) src version; + + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; - cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin"; + cargoVendorDir = "vendor"; + preBuild = '' + pushd src/tools/rls + # client tests are flaky + rm tests/client.rs + ''; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; @@ -27,10 +27,8 @@ rustPlatform.buildRustPackage rec { ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; - preCheck = '' - # client tests are flaky - rm tests/client.rs - ''; + + preInstall = "popd"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 66da4d33251a..d77769583902 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/tools/rust/rustfmt/default.nix b/pkgs/development/compilers/rust/rustfmt.nix index b98ab0dc74d7..537bdaf445cd 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.2.2"; + inherit (rustPlatform.rust.rustc) version src; - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "rustfmt"; - rev = "v${version}"; - sha256 = "1k9p6sp8q87flx9vzg46880ir7likvbydai3g6q76278h86rn0v8"; - }; + # the rust source tarball already has all the dependencies vendored, no need to fetch them again + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/rustfmt"; + preInstall = "popd"; - cargoSha256 = "08x6vy5v2vgrk3gsw3qcvv52a7hifsgcsnsg1phlk1ikaff21y4z"; + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler RUSTC_BOOTSTRAP = 1; @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { description = "A tool for formatting Rust code according to style guidelines"; homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin basvandijk ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix new file mode 100644 index 000000000000..4b1358b72472 --- /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 ce863ef9c915..0e4207dccac6 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 7f4c895d85a0..75717b5ba096 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/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 941f92fd322e..f34283938326 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchzip, boost, cmake, ncurses, python2 -, z3Support ? true, z3 ? null +, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null +, cln ? null, gmp ? null }: -assert z3Support -> z3 != null; -assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; +assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; +assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; @@ -16,12 +17,12 @@ in stdenv.mkDerivation rec { name = "solc-${version}"; - version = "0.5.10"; + version = "0.5.11"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1ns562h8blvv32lz462rf5835fs2hgn698mvi6ss5y7ar6k5y5xw"; + sha256 = "0679s5pqbfy7fgpb4f3ppgj8iafxb64g046v8vhp29mf3dsdcnyl"; }; patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; @@ -37,10 +38,14 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" + ] ++ stdenv.lib.optionals (!cvc4Support) [ + "-DUSE_CVC4=OFF" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ]; + buildInputs = [ boost ] + ++ stdenv.lib.optionals z3Support [ z3 ] + ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; checkInputs = [ ncurses python2 ]; # Test fails on darwin for unclear reason diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 94d0a4327d9d..f21b2ae3cb80 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -33,7 +33,7 @@ }: let - v_base = "5.0.1"; + v_base = "5.0.2"; version = "${v_base}-RELEASE"; version_friendly = "${v_base}"; @@ -51,7 +51,7 @@ let # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 clang = fetch { repo = "swift-clang"; - sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k"; + sha256 = "046p7f4044ls8hhgklsz32md5jvxkaaim1d75n0fmnwap6di3n1q"; }; llvm = fetch { repo = "swift-llvm"; @@ -83,16 +83,16 @@ let }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq"; + sha256 = "1wys4xh7f6c7yjf210x41n2krmyi2qj1wpxbv0p48d230va1azj1"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32"; + sha256 = "0chnb0d4xjyn9wnc8bgimd5ji5igfyq891flgnqpfwr4y26496c1"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6"; + sha256 = "0fsq1y8dz4ssn90akvzj36cqyblalb09bjzy4ikqn67mb5x99wpb"; }; }; @@ -248,9 +248,6 @@ stdenv.mkDerivation rec { PREFIX=''${out/#\/} substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" - substituteInPlace swiftpm/Utilities/bootstrap \ - --replace \"usr\" \"$PREFIX\" \ - --replace usr/lib "$PREFIX/lib" ''; buildPhase = builder; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix new file mode 100644 index 000000000000..3bdf234f9159 --- /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/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index cbccca34b413..ad01fb4be290 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, glfw, freetype, curl }: +{ stdenv, fetchFromGitHub, glfw, freetype, openssl }: stdenv.mkDerivation rec { pname = "vlang"; - version = "0.1.16"; + version = "0.1.18"; src = fetchFromGitHub { owner = "vlang"; repo = "v"; rev = "${version}"; - sha256 = "08zgwy9ac3wa5ixy8rdw6izpn1n1c3ydb9rl8z8graw0bgv719ma"; + sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15"; }; # V compiler source translated to C for bootstrap. @@ -16,18 +16,17 @@ stdenv.mkDerivation rec { owner = "vlang"; repo = "vc"; rev = "${version}"; - sha256 = "0k6c7v3r3cirypsqbaq10qlgg41v19rsnc1ygam4il2p8rsmfwz3"; + sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj"; }; enableParallelBuilding = true; - buildInputs = [ glfw freetype curl ]; + buildInputs = [ glfw freetype openssl ]; buildPhase = '' runHook preBuild - cc -std=gnu11 -w -o v $vc/v.c -lm + cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS ./v -prod -o v compiler - # -fPIC -pie required for examples/hot_code_reloading - make CFLAGS+="-fPIC -pie" thirdparty + make thirdparty runHook postBuild ''; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index afb1bcd5a0b0..467d4e3b49eb 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.21"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e"; - sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0"; + rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4"; + sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw"; 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,16 +34,20 @@ 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" ]; patchPhase = '' substituteInPlace ../yosys-abc/Makefile \ - --replace 'CC := gcc' "" + --replace 'CC := gcc' "" \ + --replace 'CXX := g++' "" substituteInPlace ./Makefile \ --replace 'CXX = clang' "" \ - --replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \ + --replace 'LD = clang++' 'LD = $(CXX)' \ + --replace 'CXX = gcc' "" \ + --replace 'LD = gcc' 'LD = $(CXX)' \ + --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' ''; @@ -71,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 0b97358d8639..73a0a07f704c 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 e4a548ae376b..be885d990ece 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 6ac2ccf45c18..d920baa0dafb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -72,7 +72,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1pz12l0awshdq5xyac5awjd902sy9l65z6ihya4pzapik4gqfdcd"; + sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -149,11 +149,16 @@ self: super: { else super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = if pkgs.stdenv.isDarwin + hakyll = appendPatch + (if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else super.hakyll; + else super.hakyll) + (pkgs.fetchpatch { + url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch; + sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ="; + }); double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion @@ -167,9 +172,6 @@ self: super: { 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; @@ -217,15 +219,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; @@ -709,15 +715,9 @@ self: super: { ''; }); - # A simple MonadFail patch would do too, but not doing the tests is easier - megaparsec_6_5_0 = dontCheck super.megaparsec_6_5_0; - # The standard libraries are compiled separately idris = generateOptparseApplicativeCompletion "idris" ( - doJailbreak (dontCheck (super.idris.override { - # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 - megaparsec = self.megaparsec_6_5_0; - })) + doJailbreak (dontCheck super.idris) ); # https://github.com/bos/math-functions/issues/25 @@ -857,7 +857,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 @@ -1035,8 +1035,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; @@ -1094,10 +1092,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: { @@ -1106,11 +1100,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; @@ -1120,14 +1109,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 @@ -1203,10 +1184,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 @@ -1244,29 +1221,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; @@ -1275,10 +1243,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 @@ -1308,10 +1276,16 @@ 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; + + # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 + graphviz = dontCheck super.graphviz; - # Needs deque >= 0.3, but latest version on stackage is 2.7 - butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; + # https://github.com/elliottt/hsopenid/issues/15 + openid = markBroken super.openid; } // 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 de01fe4cd120..76aabb915618 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-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index dc3071e5fab3..417fc0b3a441 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,30 +41,9 @@ self: super: { unix = null; xhtml = null; - # Use the current git version of cabal-install. - cabal-install = overrideCabal (super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal-git; })) (drv: { - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386"; - sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i"; - }; - version = "20190510-git"; - editedCabalFile = null; - postUnpack = "sourceRoot+=/cabal-install"; - jailbreak = true; - }); - Cabal-git = overrideCabal super.Cabal_2_4_1_0 (drv: { - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386"; - sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i"; - }; - version = "20190510-git"; - editedCabalFile = null; - postUnpack = "sourceRoot+=/Cabal"; - }); + # Use the cabal-install 3.0.0.0 beta release. + cabal-install = self.cabal-install-3; + Cabal_3_0_0_0 = null; # Our compiler has this already. # Ignore overly restrictive upper version bounds. async = doJailbreak super.async; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6eeade90a074..b279652a5d5f 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.2 - 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 + - backprop ==0.2.6.3 + - 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.100 - 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.7 + - 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 - - enumset ==0.0.4.1 + - enummapset ==0.6.0.2 + - enumset ==0.0.5 - 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.1.0 - 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.1.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-backprop ==0.1.2.5 + - hmatrix ==0.20.0.0 + - hmatrix-backprop ==0.1.3.0 - 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 + - hmatrix-vector-sized ==0.1.2.0 + - hmm-lapack ==0.4 - hmpfr ==0.4.4 - - hoauth2 ==1.8.7 + - hoauth2 ==1.8.9 - 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.4.1 + - 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,19 +1207,21 @@ 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 + - lenz ==0.3.1.0 - leveldb-haskell ==0.6.5 - libffi ==0.1 - 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 ==1.0.12.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 @@ -1698,7 +1742,7 @@ default-package-overrides: - reflection ==2.1.4 - RefSerialize ==0.4.0 - regex ==1.0.2.0 - - regex-applicative ==0.3.3 + - regex-applicative ==0.3.3.1 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 - regex-compat ==0.95.1 @@ -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.4.1 + - salak-toml ==0.3.4.1 + - salak-yaml ==0.3.4.1 - 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.14 + - 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.28 - 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 @@ -2321,22 +2428,21 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.14 + - yesod-core ==1.6.15 - 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 - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.6.1 + - yesod-test ==1.6.6.2 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 @@ -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 @@ -2396,7 +2503,6 @@ extra-packages: - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 - - megaparsec < 7.0 # required for idris <= 1.3.1: https://github.com/idris-lang/Idris-dev/pull/4610 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2415,6 +2521,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 +2771,6 @@ broken-packages: - acme-stringly-typed - acme-zalgo - acme-zero - - acousticbrainz-client - ActionKid - activehs - activehs-base @@ -2708,6 +2814,7 @@ broken-packages: - aeson-t - aeson-tiled - aeson-typescript + - affection - affine-invariant-ensemble-mcmc - afv - ag-pictgen @@ -2742,6 +2849,7 @@ broken-packages: - AlgorithmW - align-text - AlignmentAlgorithms + - Allure - alms - alpha - alphachar @@ -2758,6 +2866,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 +3032,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 +3089,7 @@ broken-packages: - ApproxFun-hs - arb-fft - arbb-vm + - arbor-monad-logger - arbor-monad-metric - arbor-monad-metric-datadog - arbor-postgres @@ -2853,6 +3113,7 @@ broken-packages: - arpack - array-forth - array-primops + - arraylist - ArrayRef - arrow-improve - arrow-list @@ -2862,6 +3123,7 @@ broken-packages: - ArrowVHDL - artery - artifact + - asap - ascii-flatten - ascii-string - ascii-vector-avc @@ -2896,7 +3158,6 @@ broken-packages: - atomic-primops-vector - atomo - ats-format - - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2904,11 +3165,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 +3204,7 @@ broken-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams + - aws-easy - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder @@ -2949,12 +3213,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 +3234,7 @@ broken-packages: - babylon - backblaze-b2-hs - backdropper + - backprop - backstop - backtracking-exceptions - backward-state @@ -2986,6 +3253,7 @@ broken-packages: - Bang - bank-holiday-usa - banwords + - barbly - barchart - barcodes-code128 - barecheck @@ -2997,7 +3265,6 @@ broken-packages: - base-feature-macros - base-generics - base-io-access - - base64-bytestring-type - base64-conduit - baserock-schema - BASIC @@ -3039,7 +3306,6 @@ broken-packages: - bidirectionalization-combined - bidispec - bidispec-extras - - bifunctor - BiGUL - billboard-parser - billeksah-forms @@ -3051,7 +3317,6 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree - - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3097,9 +3362,7 @@ broken-packages: - Biobase - BiobaseBlast - BiobaseDotP - - BiobaseENA - BiobaseEnsembl - - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3108,9 +3371,7 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner - - BiobaseTypes - BiobaseVienna - - BiobaseXNA - biocore - biofasta - biofastq @@ -3123,8 +3384,8 @@ broken-packages: - birch-beer - bird - BirdPP + - bisc - bisect-binary - - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3138,11 +3399,13 @@ broken-packages: - bitstream - BitStringRandomMonad - bittorrent - - bitvec + - bitwise - bizzlelude - bizzlelude-js - bkr - bla + - blacktip + - blake2 - blakesum - blakesum-demo - blas @@ -3184,7 +3447,6 @@ broken-packages: - blunt - BNFC-meta - bno055-haskell - - board-games - bogre-banana - bolt - boltzmann-brain @@ -3194,10 +3456,11 @@ broken-packages: - bookkeeper - bookkeeper-permissions - Bookshelf + - boolean-normal-forms - boolexpr - boombox - boomslang - - boots + - boots-app - borel - boring-window-switcher - bot @@ -3243,13 +3506,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 +3550,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3298,10 +3564,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 +3586,9 @@ broken-packages: - cabin - cabocha - cached + - cachix + - cachix-api + - cacophony - caffegraph - cairo-core - cake @@ -3335,7 +3606,6 @@ broken-packages: - call-haskell-from-anything - camfort - campfire - - canon - canonical-filepath - canonical-json - canteven-http @@ -3343,10 +3613,10 @@ broken-packages: - canteven-log - canteven-parsedate - cantor + - cantor-pairing - cao - cap - Capabilities - - capataz - capnp - capped-list - capri @@ -3371,18 +3641,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 +3679,7 @@ broken-packages: - cereal-ieee754 - cereal-io-streams - cereal-plus + - cereal-streams - certificate - cf - cfipu @@ -3427,8 +3700,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - checked - Checked + - checked - checkmate - chell - chell-hunit @@ -3436,6 +3709,7 @@ broken-packages: - chessIO - chevalier-common - chiasma + - chiphunk - chitauri - Chitra - choose @@ -3531,6 +3805,8 @@ broken-packages: - clustering - clustertools - clutterhs + - cmark-highlight + - cmark-patterns - cmark-sections - cmath - cmathml3 @@ -3567,6 +3843,7 @@ broken-packages: - collada-types - collapse-duplication - collapse-util + - collection-json - collections - collections-api - collections-base-instances @@ -3626,12 +3903,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 +3922,7 @@ broken-packages: - conduit-throttle - conduit-tokenize-attoparsec - conf + - confcrypt - conffmt - confide - config-parser @@ -3666,9 +3945,7 @@ broken-packages: - constrained-category - constrained-dynamic - constrained-monads - - constraint - constraint-manip - - constraint-reflection - ConstraintKinds - constraints-emerge - constructive-algebra @@ -3703,8 +3980,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 +4012,6 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit - - cpkg - cplusplus-th - cprng-aes-effect - cpuperf @@ -3782,8 +4062,10 @@ broken-packages: - crypto-simple - cryptocompare - cryptoconditions + - cryptol - cryptsy-api - crystalfontz + - csa - cse-ghc-plugin - csg - CSPM-cspm @@ -3806,7 +4088,6 @@ broken-packages: - curry-frontend - CurryDB - cursedcsv - - cursor-gen - curve25519 - curves - custom-prelude @@ -3817,8 +4098,8 @@ broken-packages: - dag - DAG-Tournament - Dangerous - - dao - Dao + - dao - dapi - darcs-benchmark - darcs-beta @@ -3852,6 +4133,7 @@ broken-packages: - data-fin - data-fin-simple - data-flagset + - data-interval - data-ivar - data-kiln - data-layer @@ -3872,14 +4154,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 +4171,7 @@ broken-packages: - datadog-tracing - datafix - dataflow + - DataIndex - datalog - datasets - DataTreeView @@ -3974,8 +4256,10 @@ broken-packages: - deptrack-core - deptrack-devops - deptrack-dot + - dequeue - derangement - derivation-trees + - derive - derive-enumerable - derive-gadt - derive-IG @@ -3996,6 +4280,7 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-json - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4031,8 +4316,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 +4341,7 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway + - discord-haskell - discord-hs - discord-rest - discord-types @@ -4096,6 +4384,7 @@ broken-packages: - djembe - djinn-th - dl-fedora + - dmcc - dmenu - dmenu-pkill - dmenu-pmount @@ -4108,13 +4397,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 +4412,11 @@ broken-packages: - domain-auth - domplate - dot-linker + - dot2graphml - dotenv - dotfs - doublify-toolkit + - dovin - download-media-content - dozenal - dozens @@ -4181,7 +4472,6 @@ broken-packages: - dwarfadt - dyckword - dynamic-cabal - - dynamic-graph - dynamic-object - dynamic-plot - dynamic-pp @@ -4200,6 +4490,7 @@ broken-packages: - easyplot - ebeats - ebnf-bff + - ec2-unikernel - ecma262 - ecu - eddie @@ -4226,15 +4517,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 +4546,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 +4560,6 @@ broken-packages: - enumfun - EnumMap - enummapmap - - enummapset - enummapset-th - env-parser - envstatus @@ -4320,6 +4611,7 @@ broken-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - eths-rlp + - euler-tour-tree - euphoria - eurofxref - Euterpea @@ -4333,6 +4625,8 @@ broken-packages: - eventlog2html - EventSocket - eventsource-geteventstore-store + - eventsource-store-specs + - eventsource-stub-store - eventstore - every-bit-counts - exact-cover @@ -4362,21 +4656,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 +4696,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 +4720,7 @@ broken-packages: - fdo-trash - feature-flipper - feature-flipper-postgres + - fedora-haskell-tools - fedora-img-dl - fedora-packages - feed-cli @@ -4439,7 +4743,6 @@ broken-packages: - ffmpeg-tutorials - ffunctor - fgl-extras-decompositions - - fib - fibon - ficketed - fields @@ -4454,14 +4757,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 +4780,8 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory - - fishfood - fit + - fits-parse - fitsio - fix-parser-simple - fix-symbols-gitit @@ -4486,6 +4790,7 @@ broken-packages: - fixed-point-vector-space - fixed-precision - fixed-storable-array + - fixed-timestep - fixed-vector-binary - fixed-vector-cborg - fixed-vector-cereal @@ -4526,7 +4831,6 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw - - fmt-for-rio - fn-extra - foldl-incremental - foldl-statistics @@ -4559,6 +4863,7 @@ broken-packages: - forth-hll - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - fortran-src + - fortytwo - foscam-directory - foscam-filename - foscam-sort @@ -4570,6 +4875,7 @@ broken-packages: - Fractaler - fractals - frag + - Frames - Frames-beam - Frames-dsv - Frames-map-reduce @@ -4605,6 +4911,7 @@ broken-packages: - fresh - friday-devil - friday-scale-dct + - front - frown - frp-arduino - frpnow @@ -4617,8 +4924,11 @@ broken-packages: - fsmActions - fsutils - fswait + - ft-generator - ftdi - FTGL-bytestring + - ftp-client + - ftp-client-conduit - ftp-conduit - FTPLine - ftshell @@ -4633,15 +4943,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 +5033,7 @@ broken-packages: - GeocoderOpenCage - geodetic - geodetic-types + - geojson - geojson-types - geolite-csv - geom2d @@ -4732,7 +5044,6 @@ broken-packages: - getflag - GGg - ggtsTC - - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-tree @@ -4740,7 +5051,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 +5084,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 +5112,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity - - git-vogue - gitdo - - github - github-backup - github-data - github-tools @@ -4834,6 +5126,7 @@ broken-packages: - gitlib-s3 - gitlib-utils - gitson + - givegif - glade - gladexml-accessor - glapp @@ -4880,9 +5173,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 +5199,7 @@ broken-packages: - GotoT-transformers - gotta-go-fast - gpah + - GPipe - GPipe-Collada - GPipe-Examples - GPipe-GLFW @@ -4912,6 +5208,8 @@ broken-packages: - gps2htmlReport - GPX - gpx-conduit + - grab + - grab-form - graceful - graflog - Grafos @@ -4946,7 +5244,9 @@ broken-packages: - graphics-formats-collada - graphicsFormats - graphicstools - - graphql-w-persistent + - graphite + - graphql + - graphql-api - graphtype - graql - grasp @@ -4968,6 +5268,7 @@ broken-packages: - group-with - growler - GrowlNotify + - grpc-api-etcd - grpc-etcd-client - gruff - gruff-examples @@ -4979,8 +5280,6 @@ broken-packages: - GTALib - gtfs - gtk-serialized-event - - gtk-sni-tray - - gtk-strut - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5053,7 +5352,9 @@ broken-packages: - hahp - haiji - hail + - hailgun - hailgun-send + - hailgun-simple - hairy - hakaru - hakismet @@ -5068,9 +5369,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 +5423,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 +5471,7 @@ broken-packages: - Haschoo - HasGP - hash + - hash-store - hashable-extras - hashable-generics - hashabler @@ -5185,7 +5498,6 @@ broken-packages: - haskell-cnc - haskell-coffee - haskell-compression - - haskell-conll - haskell-course-preludes - haskell-disque - haskell-eigen-util @@ -5194,6 +5506,7 @@ broken-packages: - haskell-generate - haskell-go-checkers - haskell-holes-th + - haskell-import-graph - haskell-in-space - haskell-kubernetes - haskell-lsp-client @@ -5215,7 +5528,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 +5571,8 @@ broken-packages: - haskelldb-th - haskelldb-wx - HaskellLM + - HaskellNet + - HaskellNet-SSL - HaskellNN - Haskelloids - haskellscrabble @@ -5301,6 +5615,7 @@ broken-packages: - haskus-system-build - haskus-utils - haskus-utils-compat + - haskus-utils-variant - haskus-web - haslo - hasloGUI @@ -5308,7 +5623,6 @@ broken-packages: - hasql-backend - hasql-class - hasql-cursor-query - - hasql-cursor-transaction - hasql-dynamic-statements - hasql-generic - hasql-implicits @@ -5331,7 +5645,6 @@ broken-packages: - HaTeX-qq - hats - hatt - - haven - haverer - HaVSA - hawitter @@ -5373,8 +5686,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 +5709,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 +5775,7 @@ broken-packages: - hexquote - hext - heyefi + - heyting-algebras - hF2 - hfann - hfd @@ -5486,6 +5800,7 @@ broken-packages: - hgis - hgithub - HGL + - hgmp - hgom - hgopher - HGraphStorage @@ -5494,7 +5809,6 @@ broken-packages: - hgrib - hharp - HHDL - - hi-file-parser - hi3status - hiccup - hichi @@ -5507,6 +5821,7 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph + - higgledy - HiggsSet - higherorder - highjson @@ -5524,6 +5839,7 @@ broken-packages: - hinstaller - hint-server - hinter + - hinterface - hinvaders - hinze-streams - hipbot @@ -5551,7 +5867,6 @@ broken-packages: - hjsonschema - hjugement-cli - HJVM - - hkgr - hlatex - hlbfgsb - hlcm @@ -5560,6 +5875,7 @@ broken-packages: - HLearn-classification - HLearn-datastructures - HLearn-distributions + - hledger-api - hledger-chart - hledger-flow - hledger-irr @@ -5569,14 +5885,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 +5902,7 @@ broken-packages: - hmatrix-sparse - hmatrix-static - hmatrix-sundials + - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests - hmeap @@ -5591,8 +5910,8 @@ broken-packages: - hmenu - hmep - hmk - - hmm - HMM + - hmm - hmm-hmatrix - hmm-lapack - hMollom @@ -5600,6 +5919,9 @@ broken-packages: - Hmpf - hmt-diagrams - hmumps + - hnetcdf + - hnix + - hnix-store-remote - HNM - hnormalise - ho-rewriting @@ -5648,6 +5970,7 @@ broken-packages: - hoovie - hopencc - hopencl + - hopenpgp-tools - hopfield - hoppy-docs - hoppy-generator @@ -5667,6 +5990,7 @@ broken-packages: - hp2any-graph - hp2any-manager - hpack-convert + - hpack-dhall - hpaco - hpaco-lib - hpage @@ -5681,12 +6005,14 @@ broken-packages: - hpdft - hpg - HPi + - hpio - hplaylist - HPlot - hpodder - HPong - hpqtypes - hpqtypes-extras + - hprotoc - hprotoc-fork - hprox - hps @@ -5701,8 +6027,8 @@ broken-packages: - hR - hranker - HRay - - hricket - Hricket + - hricket - hriemann - HROOT - HROOT-core @@ -5749,6 +6075,7 @@ broken-packages: - hsbencher - hsbencher-codespeed - hsbencher-fusion + - hsc2hs - hsc3-auditor - hsc3-cairo - hsc3-data @@ -5874,6 +6201,7 @@ broken-packages: - hsx - hsx-jmacro - hsx-xhtml + - hsx2hs - hsXenCtrl - HsYAML-aeson - hsyscall @@ -5892,6 +6220,8 @@ broken-packages: - html-kure - html-rules - html-tokenizer + - htoml + - htoml-megaparsec - hts - htsn - htsn-import @@ -5899,18 +6229,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 +6247,6 @@ broken-packages: - http-streams - http-wget - http2-client-grpc - - http2-grpc-types - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -5944,7 +6271,6 @@ broken-packages: - hunspell-hs - hunt-searchengine - hunt-server - - hup - hurdle - hurriyet - husk-scheme @@ -5956,6 +6282,7 @@ broken-packages: - hVOIDP - hw-balancedparens - hw-bits + - hw-ci-assist - hw-dsv - hw-dump - hw-eliasfano @@ -5995,8 +6322,8 @@ broken-packages: - hybrid - hydra-hs - hydra-print - - hydrogen - Hydrogen + - hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -6028,6 +6355,7 @@ broken-packages: - ical - iCalendar - IcoGrid + - iconv-typed - ide-backend - ide-backend-common - ide-backend-server @@ -6037,7 +6365,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -6073,7 +6400,6 @@ broken-packages: - imap - imapget - imbib - - imgur - imgurder - imj-animation - imj-base @@ -6085,6 +6411,7 @@ broken-packages: - imperative-edsl - imperative-edsl-vhdl - ImperativeHaskell + - impl - implicit-logging - implicit-params - importify @@ -6111,11 +6438,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 +6471,13 @@ broken-packages: - invertible-hlist - io-capture - io-reactive + - ion - IOR - IORefCAS - iostring - iothread - iotransaction + - ip - ip2location - ip2proxy - ipatch @@ -6190,7 +6519,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 +6536,8 @@ broken-packages: - iyql - j2hs - jack-bindings - - jackminimix - JackMiniMix + - jackminimix - jacobi-roots - jaeger-flamegraph - jail @@ -6213,10 +6551,10 @@ broken-packages: - java-character - java-reflect - javascript-extras - - javasf - Javasf - - javav + - javasf - Javav + - javav - jbi - jcdecaux-vls - Jdh @@ -6244,7 +6582,6 @@ broken-packages: - jsaddle-wkwebview - JsContracts - jsmw - - json-api - json-api-lib - json-ast-json-encoder - json-ast-quickcheck @@ -6269,7 +6606,6 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar - - jsonpath - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -6281,6 +6617,7 @@ broken-packages: - judge - judy - juicy-gcode + - JuicyPixels-blp - JuicyPixels-canvas - JunkDB - JunkDB-driver-gdbm @@ -6297,8 +6634,8 @@ broken-packages: - kademlia - kafka-client - kaleidoscope - - kalman - Kalman + - kalman - kangaroo - kansas-lava - kansas-lava-cores @@ -6306,14 +6643,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 +6677,7 @@ broken-packages: - keyring - keysafe - keystore + - keyvaluehash - keyword-args - khph - kicad-data @@ -6346,7 +6685,6 @@ broken-packages: - kickchan - kif-parser - kit - - kleene - kmeans-par - kmeans-vector - kmp-dfa @@ -6355,6 +6693,7 @@ broken-packages: - knit-haskell - knots - koellner-phonetic + - kontra-config - korfu - kqueue - krapsh @@ -6367,6 +6706,7 @@ broken-packages: - kubernetes-client-core - kure - kure-your-boilerplate + - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6418,7 +6758,6 @@ broken-packages: - LambdaShell - lambdatex - lambdatwit - - Lambdaya - lambdaya-bus - lambdiff - lame @@ -6484,11 +6823,11 @@ broken-packages: - lazy-hash-cache - lazy-io-streams - lazyarray + - lazyboy - lazyset - LazyVault - ld-intervals - lda - - ldap-client - ldapply - ldif - leaf @@ -6564,13 +6903,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 +6922,7 @@ broken-packages: - linkcore - linked-list-with-iterator - linkedhashmap + - linode - linode-v4 - linux-blkid - linux-cgroup @@ -6603,10 +6945,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 +7035,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -6719,17 +7064,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 +7113,7 @@ broken-packages: - map-exts - map-reduce-folds - map-syntax + - mapalgebra - Mapping - mappy - marionetta @@ -6772,6 +7121,7 @@ broken-packages: - markdown-pap - markdown2svg - marked-pretty + - markov-chain-usage-model - markov-processes - markov-realization - markup @@ -6783,12 +7133,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 +7160,7 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools + - mbug - MC-Fold-DP - mcl - mcm @@ -6823,19 +7178,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 +7232,10 @@ broken-packages: - microgroove - microlens-each - micrologger + - microsoft-translator - MicrosoftTranslator - mida + - midi-simple - midi-utils - midimory - midisurface @@ -6888,6 +7246,7 @@ broken-packages: - mikrokosmos - miku - mime-directory + - min-max-pqueue - minecraft-data - minesweeper - miniforth @@ -6904,6 +7263,7 @@ broken-packages: - mios - mirror-tweet - miso-action-logger + - miso-examples - miss - miss-porcelain - missing-py2 @@ -6915,9 +7275,6 @@ broken-packages: - ml-w - mlist - mltool - - mmark - - mmark-cli - - mmark-ext - mmtf - mmtl - mmtl-base @@ -6932,15 +7289,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 +7372,6 @@ broken-packages: - morphisms-objects - morte - mosaico-lib - - moss - mount - movie-monad - mp @@ -7034,6 +7389,8 @@ broken-packages: - mrifk - mrm - ms + - msgpack + - msgpack-aeson - msgpack-idl - msgpack-rpc - msh @@ -7129,9 +7486,11 @@ broken-packages: - nanovg - nanovg-simple - nanq + - NaperianNetCDF - narc - nat-sized-numbers - nationstates + - nats-queue - natural - natural-number - naver-translate @@ -7154,6 +7513,9 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap + - net-mqtt + - net-spider + - net-spider-cli - net-spider-pangraph - net-spider-rpl - netclock @@ -7172,7 +7534,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 +7551,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 +7588,12 @@ broken-packages: - nitro - niv - nixfromnpm - - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts - nm - NMap + - nn - nntp - no-role-annots - noether @@ -7247,13 +7607,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 +7657,7 @@ broken-packages: - objectid - ObjectIO - objective + - oblivious-transfer - ocaml-export - octane - octohat @@ -7318,8 +7678,8 @@ broken-packages: - olwrapper - omaketex - ombra - - omega - Omega + - omega - omnifmt - on-a-horse - onama @@ -7334,6 +7694,7 @@ broken-packages: - open-haddock - open-pandoc - open-signals + - open-typerep - OpenAFP - OpenAFP-Utils - openapi-petstore @@ -7347,6 +7708,7 @@ broken-packages: - OpenSCAD - opensoundcontrol-ht - openssh-github-keys + - openssh-protocol - opentheory-char - opentok - opentype @@ -7355,6 +7717,8 @@ broken-packages: - openweathermap - Operads - operational-extra + - opml-conduit + - opn - optima - optimal-blocks - optimization @@ -7362,7 +7726,6 @@ broken-packages: - optional - options-time - optparse-applicative-simple - - optparse-enum - orc - orchestrate - OrchestrateDB @@ -7399,26 +7762,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 +7806,7 @@ broken-packages: - Parallel-Arrows-Eden - parallel-tasks - parameterized - - paramtree + - parameterized-utils - paranoia - parco - parco-attoparsec @@ -7502,6 +7871,7 @@ broken-packages: - pedestrian-dag - peg - peggy + - pell - penny - penny-bin - penny-lib @@ -7511,8 +7881,9 @@ broken-packages: - peregrin - perf - perf-analysis - - perfecthash + - perfect-vector-shuffle - PerfectHash + - perfecthash - perhaps - periodic - perm @@ -7534,10 +7905,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 +7945,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 +7968,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 +7998,6 @@ broken-packages: - plat - platinum-parsing - PlayingCards - - plex - plist-buddy - plocketed - plot @@ -7653,7 +8020,6 @@ broken-packages: - pocket-dns - point-octree - pointfree-fancy - - pointful - pointless-lenses - pointless-rewrite - pokemon-go-protobuf-types @@ -7664,12 +8030,10 @@ broken-packages: - polh-lexicon - polimorf - Pollutocracy - - poly - poly-control - polydata - polydata-core - polynomial - - polysemy - polysemy-plugin - polysemy-RandomFu - polysemy-zoo @@ -7677,6 +8041,7 @@ broken-packages: - polysoup - polytypeable - polytypeable-utils + - pomaps - pomodoro - pomohoro - ponder @@ -7698,7 +8063,6 @@ broken-packages: - postgres-tmp - postgres-websockets - postgresql-copy-escape - - postgresql-lo-stream - postgresql-named - postgresql-query - postgresql-simple-bind @@ -7712,6 +8076,7 @@ broken-packages: - postgrest - postgrest-ws - postie + - postmark - postmark-streams - potato-tool - potoki @@ -7751,11 +8116,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 +8145,6 @@ broken-packages: - procrastinating-variable - procstat - producer - - product - prof2dot - prof2pretty - progress @@ -7794,12 +8156,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 +8217,7 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd + - PyF - pyffi - pyfi - python-pickle @@ -7890,7 +8254,7 @@ broken-packages: - quick-schema - QuickAnnotate - quickbooks - - quickcheck-arbitrary-template + - quickcheck-combinators - quickcheck-poly - quickcheck-property-comb - quickcheck-property-monad @@ -7900,8 +8264,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 +8290,7 @@ broken-packages: - radium - radium-formula-parser - radix + - radixtree - rados-haskell - raft - rail-compiler-editor @@ -7934,6 +8299,7 @@ broken-packages: - raketka - rakhana - rakuten + - ralist - rallod - raml - rand-vars @@ -7943,12 +8309,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 +8333,6 @@ broken-packages: - rasa-ext-vim - rascal - Rasenschach - - rating-chgk-info - rattle - rattletrap - raven-haskell-scotty @@ -7999,7 +8362,6 @@ broken-packages: - reactor - read-io - readline-statevar - - readme-lhs - readpyc - readshp - really-simple-xml-parser @@ -8021,13 +8383,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 +8402,9 @@ broken-packages: - reflex-orphans - reflex-sdl2 - reflex-transformers + - reflex-vty + - reform-happstack + - reform-hsp - reformat - refresht - refurb @@ -8075,6 +8441,8 @@ broken-packages: - reified-records - reify - relacion + - relapse + - relation - relational-postgresql8 - relative-date - reload @@ -8110,10 +8478,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 +8525,9 @@ broken-packages: - rfc-psql - rfc-redis - rfc-servant - - rfc1413-server + - rg - rhythm-game-tutorial + - rib - RichConditional - ridley - ridley-extras @@ -8162,7 +8535,6 @@ broken-packages: - riff - ring-buffer - ring-buffers - - rio-prettyprint - riot - risc386 - riscv-isa @@ -8174,6 +8546,7 @@ broken-packages: - rl-satton - Rlang-QQ - rlglue + - RLP - rlwe-challenges - rmonad - RMP @@ -8241,7 +8614,7 @@ broken-packages: - safe-json - safe-lazy-io - safe-length - - safe-money-xmlbf + - safe-money-store - safe-plugins - safe-printf - safecopy-store @@ -8254,7 +8627,6 @@ broken-packages: - sai-shape-syb - sajson - salak-toml - - salak-yaml - Salsa - saltine-quickcheck - salvia @@ -8282,14 +8654,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 +8676,6 @@ broken-packages: - scholdoc-citeproc - scholdoc-texmath - scholdoc-types - - SciBaseTypes - scidb-hquery - science-constants-dimensional - SciFlow @@ -8338,6 +8710,7 @@ broken-packages: - sde-solver - sdl2-cairo-image - sdl2-compositor + - sdl2-fps - sdr - seakale - seakale-postgresql @@ -8352,7 +8725,6 @@ broken-packages: - secret-sharing - secrm - sednaDBXML - - selda-json - selectors - SelectSequencesFromMSA - selenium @@ -8361,8 +8733,7 @@ broken-packages: - Semantique - semdoc - semi-iso - - semialign - - semialign-indexed + - semibounded-lattices - Semigroup - semigroupoids-syntax - semigroups-actions @@ -8398,6 +8769,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 +8777,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 +8790,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 +8806,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 +8822,7 @@ broken-packages: - servant-zeppelin-swagger - server-generic - serverless-haskell + - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod - services @@ -8451,7 +8832,6 @@ broken-packages: - sessions - sessiontypes - sessiontypes-distributed - - set-cover - set-with - setdown - setgame @@ -8466,6 +8846,7 @@ broken-packages: - sfnt2woff - SFont - SG + - sgd - SGdemo - sgf - SGplus @@ -8511,13 +8892,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 +8920,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 +8961,7 @@ broken-packages: - skylark-client - skype4hs - slack + - slate - slave-thread - slidemews - Slides @@ -8620,6 +9000,7 @@ broken-packages: - snake - snake-game - snap + - snap-accept - snap-auth-cli - snap-blaze-clay - snap-configuration-utilities @@ -8720,6 +9101,7 @@ broken-packages: - sparrow - sparse - sparse-lin-alg + - sparse-tensor - sparsebit - sparsecheck - sparser @@ -8743,11 +9125,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 +9154,6 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql - - squeeze - srcinst - sscan - sscgi @@ -8806,6 +9191,7 @@ broken-packages: - stackage-types - stackage-upload - stackage2nix + - stacked-dag - standalone-derive-topdown - starling - stash @@ -8837,6 +9223,7 @@ broken-packages: - stemmer - stemmer-german - stepwise + - stern-brocot - stgi - stm-chunked-queues - stm-containers @@ -8845,6 +9232,7 @@ broken-packages: - stm-io-hooks - stm-promise - stm-stats + - stm-supply - stmcontrol - stochastic - Stomp @@ -8859,8 +9247,6 @@ broken-packages: - stratum-tool - stratux - stratux-demo - - stratux-http - - stratux-types - stratux-websockets - stream - stream-fusion @@ -8871,12 +9257,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 +9274,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 +9304,7 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles + - superbuffer - supercollider-ht - supercollider-midi - superconstraints @@ -8924,6 +9312,7 @@ broken-packages: - supermonad - supero - supervisor + - supervisors - supplemented - surjective - sv @@ -8931,8 +9320,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - svg2q - SVG2Q + - svg2q - svgutils - svm-simple - svndump @@ -8949,16 +9338,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 +9372,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 +9390,9 @@ broken-packages: - taglib-api - tagsoup-ht - tagsoup-megaparsec + - tagsoup-navigate - tagsoup-parsec - tagsoup-selection - - tai - tai64 - takahashi - Takusen @@ -9032,7 +9419,7 @@ broken-packages: - tasty-lens - tasty-stats - tasty-tap - - tasty-travis + - Taxonomy - TaxonomyTools - TBC - TBit @@ -9070,12 +9457,10 @@ broken-packages: - tensorflow-opgen - tensorflow-ops - tensorflow-proto - - termbox-banana - termbox-bindings - terminal-punch - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -9107,7 +9492,6 @@ broken-packages: - text-containers - text-generic-pretty - text-icu-normalized - - text-icu-translit - text-lens - text-locale-encoding - text-markup @@ -9115,11 +9499,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 +9530,6 @@ broken-packages: - Theora - theoremquest - theoremquest-client - - these-lens - these-skinny - thih - thimk @@ -9158,6 +9542,7 @@ broken-packages: - thrift - throttled-io-loop - through-text + - throwable-exceptions - thumbnail-plus - tic-tac-toe - tickle @@ -9193,6 +9578,7 @@ broken-packages: - timers-tick - timeseries - timespan + - timeutils - timezone-unix - tintin - tiny-scheduler @@ -9224,11 +9610,11 @@ broken-packages: - tokyotyrant-haskell - tomato-rubato-openal - toml - - tomland + - tomlcheck - too-many-cells - toodles - - top - Top + - top - topkata - torch - TORCS @@ -9240,7 +9626,6 @@ broken-packages: - toysolver - tpar - tpb - - tpdb - trace - trace-call - trace-function-call @@ -9268,7 +9653,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 +9687,7 @@ broken-packages: - TrieMap - tries - trigger + - trim - trimpolya - tripLL - trivia @@ -9342,8 +9732,11 @@ broken-packages: - twill - twine - twitter + - twitter-conduit - twitter-enumerator - twitter-feed + - twitter-types + - twitter-types-lens - tx - txt - txtblk @@ -9358,7 +9751,6 @@ broken-packages: - type-combinators-singletons - type-digits - type-eq - - type-errors - type-indexed-queues - type-int - type-interpreter @@ -9390,6 +9782,7 @@ broken-packages: - types-compat - typesafe-precure - typescript-docs + - typograffiti - typography-geometry - tyro - u2f @@ -9401,7 +9794,6 @@ broken-packages: - uhc-light - uhc-util - uhexdump - - uhttpc - ui-command - UMM - unagi-bloomfilter @@ -9411,27 +9803,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 +9872,7 @@ broken-packages: - usb-id-database - usb-iteratee - usb-safe + - userid - users-mysql-haskell - users-persistent - utc @@ -9487,6 +9882,7 @@ broken-packages: - util-exception - util-primitive - util-primitive-control + - util-universe - uu-cco - uu-cco-examples - uu-cco-hut-parsing @@ -9500,6 +9896,7 @@ broken-packages: - uxadt - v4l2 - v4l2-examples + - vabal - vacuum - vacuum-cairo - vacuum-graphviz @@ -9507,7 +9904,6 @@ broken-packages: - vacuum-ubigraph - valid-names - validate-input - - validated-literals - validated-types - Validation - validations @@ -9541,6 +9937,7 @@ broken-packages: - vector-instances-collections - vector-random - vector-read-instances + - vector-space-map - vector-space-opengl - vector-static - vectortiles @@ -9565,7 +9962,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 +10027,7 @@ broken-packages: - wai-request-spec - wai-responsible - wai-router + - wai-routes - wai-routing - wai-secure-cookies - wai-session-alt @@ -9655,12 +10057,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 +10074,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 +10091,8 @@ broken-packages: - webserver - webshow - websockets-rpc + - websockets-simple - webwire - - weekdaze - weighted - weighted-regexp - welshy @@ -9700,6 +10107,7 @@ broken-packages: - whiskers - whitespace - why3 + - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -9722,6 +10130,7 @@ broken-packages: - wobsurv - woffex - wolf + - word - word2vec-model - WordAlignment - wordify @@ -9768,7 +10177,6 @@ broken-packages: - wxSimpleCanvas - wxturtle - wyvern - - X - x-dsp - X11-extras - X11-rm @@ -9793,9 +10201,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 +10222,7 @@ broken-packages: - xml-tydom-core - xml2json - xml2x - - xmlbf-xmlhtml + - xmlbf-xeno - XmlHtmlWriter - xmltv - XMMS @@ -9848,7 +10259,6 @@ broken-packages: - yajl - yajl-enumerator - yam-job - - yam-redis - yam-servant - yam-transaction-odbc - yam-web @@ -9909,6 +10319,7 @@ broken-packages: - yesod-dsl - yesod-examples - yesod-fast-devel + - yesod-fay - yesod-form-richtext - yesod-gitrev - yesod-goodies @@ -9942,6 +10353,7 @@ broken-packages: - yesod-tls - yesod-vend - yesod-worker + - yet-another-logger - YFrob - yggdrasil - yhccore @@ -9949,6 +10361,7 @@ broken-packages: - yi-contrib - yi-core - yi-dynamic-configuration + - yi-emacs-colours - yi-frontend-pango - yi-frontend-vty - yi-fuzzy-open @@ -9956,6 +10369,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 +10436,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 23cbf15e51b3..29483b56a7db 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; }; @@ -527,10 +531,6 @@ self: super: builtins.intersectAttrs super { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; })); - # Doctests hang only when compiling with nix. - # https://github.com/cdepillabout/termonad/issues/15 - termonad = dontCheck super.termonad; - # Expects z3 to be on path so we replace it with a hard sbv = overrideCabal super.sbv (drv: { postPatch = '' @@ -585,5 +585,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 184d45eda445..96774f71730f 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 d5e5aa7ef564..689251869257 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 @@ -9491,6 +9486,8 @@ self: { pname = "HaXml"; version = "1.25.5"; sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; + revision = "1"; + editedCabalFile = "1xnni9hdvi87incm1pcx0b7jv410maww99acdfkx1cwhlb6k91ag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9831,6 +9828,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 +9846,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 +10613,8 @@ self: { pname = "HsYAML-aeson"; version = "0.1.0.0"; sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw"; + revision = "1"; + editedCabalFile = "1kf35mnvc2syly35c2ffl8xxcw4h6lxv9kqirzj2in1ms19df41y"; libraryHaskellDepends = [ aeson base bytestring HsYAML mtl text vector ]; @@ -10740,6 +10743,20 @@ self: { broken = true; }) {}; + "I1M" = callPackage + ({ mkDerivation, array, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "I1M"; + version = "0.0.2"; + sha256 = "0f9pl46m05izxhychf7j8pd9rfx8bqw13735xvq602iyszng8pa4"; + libraryHaskellDepends = [ array base QuickCheck ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Code for the Haskell course taught at the University of Seville"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "IDynamic" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -11337,6 +11354,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 +11864,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 +12004,6 @@ self: { ]; description = "Library for RedPitaya"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "LargeCardinalHierarchy" = callPackage @@ -12718,24 +12693,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.2.0"; + sha256 = "1imnnd5plp3dqpfrpviwgabd0c47fxfxvh10gyxvssmslxi1k27p"; 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 +13293,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 +13714,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 +15274,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "2.0"; - sha256 = "0iwkvplldy6sznp33n5w5ink312cg6shh3qg98canz6j6hrspa8y"; - revision = "1"; - editedCabalFile = "063rizxqn44pzblj2nxyk3ia2zymryrqq55n081g21aih38n8xlr"; + version = "2.0.3"; + sha256 = "19zzggnzdfdvvp0svixpdrnxpjn5h4wgpi01vkjydczq4630aiaa"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -15762,25 +15733,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 +15878,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 +15892,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 +16078,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,16 +16274,37 @@ 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; }) {}; + "RabbitMQ" = callPackage + ({ mkDerivation, array, base, binary, bytestring, clock, containers + , HsOpenSSL, io-streams, monad-control, network, network-uri + , openssl-streams, split, stm, text, vector + }: + mkDerivation { + pname = "RabbitMQ"; + version = "0.1.0.0"; + sha256 = "14rxwsxxqhj91alcnvvp6949ig0ifnls9x2mgnd1jmknqz7pwvrs"; + libraryHaskellDepends = [ + array base binary bytestring clock containers HsOpenSSL io-streams + monad-control network network-uri openssl-streams split stm text + vector + ]; + description = "AMQP 0-9-1 client library for RabbitMQ servers"; + license = "BSD-3-Clause AND GPL-3.0-or-later"; + }) {}; + "Raincat" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time @@ -16715,6 +16692,24 @@ self: { broken = true; }) {}; + "S3" = callPackage + ({ mkDerivation, base, base-encoding, bytestring, cryptohash-md5 + , cryptohash-sha1, cryptohash-sha256, deepseq, hashable + , http-io-streams, io-streams, Prelude, text, text-short, time, X + }: + mkDerivation { + pname = "S3"; + version = "0.1.0.0"; + sha256 = "0z59h36qnb1vvshqik3f1ai3a3frnmzzxdcmkbbh3x6flnih7r0a"; + libraryHaskellDepends = [ + base base-encoding bytestring cryptohash-md5 cryptohash-sha1 + cryptohash-sha256 deepseq hashable http-io-streams io-streams + Prelude text text-short time X + ]; + description = "Library for accessing S3 compatible storage services"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "SBench" = callPackage ({ mkDerivation, base, bytestring, cassava, criterion, deepseq , directory, filepath, gnuplot, hp2any-core, parsec, process @@ -17319,8 +17314,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 +18133,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 +18176,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 +18194,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 +18287,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 +18831,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 +19508,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 +20123,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 +20426,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 +20985,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 +22464,6 @@ self: { ]; description = "AcousticBrainz API client"; license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "acquire" = callPackage @@ -22872,26 +22874,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 +22942,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 +22970,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23089,22 +23037,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 +23045,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 +23155,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 +23180,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -23754,30 +23655,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 +23733,8 @@ self: { ]; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "affine" = callPackage @@ -24453,8 +24332,8 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.6.0.2"; - sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc"; + version = "0.7.0.1"; + sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -24465,14 +24344,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "alarmclock_0_7_0_1" = callPackage + "alarmclock_0_7_0_2" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.7.0.1"; - sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; + version = "0.7.0.2"; + sha256 = "0sp9h8vy8i4pvyadnb1ibpxpfxjikdr9ds3y9y8321cmkprlbs87"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -24752,27 +24631,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 +24935,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 +25262,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 +25281,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 +25300,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 +25319,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 +25338,8 @@ self: { ]; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-appsync" = callPackage @@ -25489,6 +25357,8 @@ self: { ]; description = "Amazon AppSync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-athena" = callPackage @@ -25506,6 +25376,8 @@ self: { ]; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-autoscaling" = callPackage @@ -25523,6 +25395,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 +25414,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 +25433,8 @@ self: { ]; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-budgets" = callPackage @@ -25574,6 +25452,8 @@ self: { ]; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-certificatemanager" = callPackage @@ -25591,6 +25471,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 +25490,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 +25509,8 @@ self: { ]; description = "Amazon Cloud9 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-clouddirectory" = callPackage @@ -25642,6 +25528,8 @@ self: { ]; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudformation" = callPackage @@ -25659,6 +25547,8 @@ self: { ]; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudfront" = callPackage @@ -25676,6 +25566,8 @@ self: { ]; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsm" = callPackage @@ -25693,6 +25585,8 @@ self: { ]; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -25710,6 +25604,8 @@ self: { ]; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch" = callPackage @@ -25727,6 +25623,8 @@ self: { ]; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -25744,6 +25642,8 @@ self: { ]; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudtrail" = callPackage @@ -25761,6 +25661,8 @@ self: { ]; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch" = callPackage @@ -25778,6 +25680,8 @@ self: { ]; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -25795,6 +25699,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 +25718,8 @@ self: { ]; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codebuild" = callPackage @@ -25829,6 +25737,8 @@ self: { ]; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codecommit" = callPackage @@ -25846,6 +25756,8 @@ self: { ]; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codedeploy" = callPackage @@ -25863,6 +25775,8 @@ self: { ]; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codepipeline" = callPackage @@ -25880,6 +25794,8 @@ self: { ]; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codestar" = callPackage @@ -25897,6 +25813,8 @@ self: { ]; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-identity" = callPackage @@ -25914,6 +25832,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 +25851,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 +25870,8 @@ self: { ]; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-comprehend" = callPackage @@ -25965,6 +25889,8 @@ self: { ]; description = "Amazon Comprehend SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-config" = callPackage @@ -25982,6 +25908,8 @@ self: { ]; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-connect" = callPackage @@ -25999,6 +25927,8 @@ self: { ]; description = "Amazon Connect Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-core" = callPackage @@ -26029,6 +25959,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 +25978,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 +25997,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 +26016,8 @@ self: { ]; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-devicefarm" = callPackage @@ -26097,6 +26035,8 @@ self: { ]; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-directconnect" = callPackage @@ -26114,6 +26054,8 @@ self: { ]; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-discovery" = callPackage @@ -26131,6 +26073,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 +26092,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 +26111,8 @@ self: { ]; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb" = callPackage @@ -26182,6 +26130,8 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -26199,6 +26149,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 +26168,8 @@ self: { ]; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ec2" = callPackage @@ -26233,6 +26187,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 +26206,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 +26225,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 +26244,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 +26263,8 @@ self: { ]; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -26318,6 +26282,8 @@ self: { ]; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticsearch" = callPackage @@ -26335,6 +26301,8 @@ self: { ]; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elastictranscoder" = callPackage @@ -26352,6 +26320,8 @@ self: { ]; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elb" = callPackage @@ -26369,6 +26339,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 +26358,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 +26377,8 @@ self: { ]; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-fms" = callPackage @@ -26420,6 +26396,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 +26415,8 @@ self: { ]; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glacier" = callPackage @@ -26454,6 +26434,8 @@ self: { ]; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glue" = callPackage @@ -26471,6 +26453,8 @@ self: { ]; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-greengrass" = callPackage @@ -26488,6 +26472,8 @@ self: { ]; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-guardduty" = callPackage @@ -26505,6 +26491,8 @@ self: { ]; description = "Amazon GuardDuty SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-health" = callPackage @@ -26522,6 +26510,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 +26529,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 +26569,8 @@ self: { ]; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-inspector" = callPackage @@ -26594,6 +26588,8 @@ self: { ]; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot" = callPackage @@ -26611,6 +26607,8 @@ self: { ]; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-analytics" = callPackage @@ -26628,6 +26626,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 +26645,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 +26664,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 +26683,8 @@ self: { ]; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -26696,6 +26702,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 +26721,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 +26740,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 +26759,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 +26778,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 +26797,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 +26816,8 @@ self: { ]; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lex-models" = callPackage @@ -26815,6 +26835,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 +26854,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 +26873,8 @@ self: { ]; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -26866,6 +26892,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 +26911,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 +26930,8 @@ self: { ]; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26917,6 +26949,8 @@ self: { ]; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediaconvert" = callPackage @@ -26934,6 +26968,8 @@ self: { ]; description = "Amazon Elemental MediaConvert SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-medialive" = callPackage @@ -26951,6 +26987,8 @@ self: { ]; description = "Amazon Elemental MediaLive SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediapackage" = callPackage @@ -26968,6 +27006,8 @@ self: { ]; description = "Amazon Elemental MediaPackage SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediastore" = callPackage @@ -26985,6 +27025,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 +27044,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 +27063,8 @@ self: { ]; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ml" = callPackage @@ -27036,6 +27082,8 @@ self: { ]; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mobile" = callPackage @@ -27053,6 +27101,8 @@ self: { ]; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mq" = callPackage @@ -27070,6 +27120,8 @@ self: { ]; description = "Amazon MQ SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks" = callPackage @@ -27087,6 +27139,8 @@ self: { ]; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks-cm" = callPackage @@ -27104,6 +27158,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 +27177,8 @@ self: { ]; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pinpoint" = callPackage @@ -27138,6 +27196,8 @@ self: { ]; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-polly" = callPackage @@ -27155,6 +27215,8 @@ self: { ]; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pricing" = callPackage @@ -27172,6 +27234,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 +27253,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 +27272,8 @@ self: { ]; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-rekognition" = callPackage @@ -27223,6 +27291,8 @@ self: { ]; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroups" = callPackage @@ -27240,6 +27310,8 @@ self: { ]; description = "Amazon Resource Groups SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -27257,6 +27329,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 +27348,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 +27367,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 +27386,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 +27405,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 +27426,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 +27445,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 +27464,8 @@ self: { ]; description = "Amazon SageMaker Runtime SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sdb" = callPackage @@ -27395,6 +27483,8 @@ self: { ]; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-secretsmanager" = callPackage @@ -27412,6 +27502,8 @@ self: { ]; description = "Amazon Secrets Manager SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-serverlessrepo" = callPackage @@ -27429,6 +27521,8 @@ self: { ]; description = "Amazon ServerlessApplicationRepository SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-servicecatalog" = callPackage @@ -27446,6 +27540,8 @@ self: { ]; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ses" = callPackage @@ -27463,6 +27559,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 +27578,8 @@ self: { ]; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sms" = callPackage @@ -27497,6 +27597,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 +27616,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 +27635,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 +27654,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 +27673,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 +27692,8 @@ self: { ]; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-storagegateway" = callPackage @@ -27599,6 +27711,8 @@ self: { ]; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sts" = callPackage @@ -27616,6 +27730,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 +27749,8 @@ self: { ]; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-swf" = callPackage @@ -27650,6 +27768,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 +27791,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 +27810,8 @@ self: { ]; description = "Amazon Transcribe Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-translate" = callPackage @@ -27705,6 +27829,8 @@ self: { ]; description = "Amazon Translate SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf" = callPackage @@ -27722,6 +27848,8 @@ self: { ]; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf-regional" = callPackage @@ -27739,6 +27867,8 @@ self: { ]; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workdocs" = callPackage @@ -27756,6 +27886,8 @@ self: { ]; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workmail" = callPackage @@ -27773,6 +27905,8 @@ self: { ]; description = "Amazon WorkMail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workspaces" = callPackage @@ -27790,6 +27924,8 @@ self: { ]; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-xray" = callPackage @@ -27807,6 +27943,8 @@ self: { ]; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amby" = callPackage @@ -27876,33 +28014,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 +28031,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 +28628,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 +28635,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 +28666,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 +28673,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 +28687,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 +28810,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 +28823,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 +28849,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 +28865,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 +28888,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 +28899,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 +28913,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 +28922,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 +28933,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 +28946,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 +28963,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 +28987,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 +28999,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 +29014,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 +29023,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 +29244,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 +29258,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 +29266,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 +29281,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 +29291,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 +30345,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 +30405,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 +30865,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 +30890,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -31111,6 +30996,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 +31096,8 @@ self: { ]; description = "Memory-efficient ArrayList implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrow-extras" = callPackage @@ -31377,6 +31281,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 +31509,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 +32609,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 +32738,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 +32872,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 +33017,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 +33354,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 +33363,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 +33726,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 +33738,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 +34027,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 +34289,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 +34454,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 @@ -35052,8 +34881,8 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.2"; - sha256 = "10w3fb25jw7s3bal6hd0a7g5hzbdd4b3whzxkm9b3g0y36i713dm"; + version = "0.2.6.3"; + sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -35064,6 +34893,8 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backstop" = callPackage @@ -35388,20 +35219,20 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.1.0.8"; - sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j"; + 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; }) {}; - "bank-holidays-england_0_2_0_1" = callPackage + "bank-holidays-england_0_2_0_2" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.2.0.1"; - sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h"; + version = "0.2.0.2"; + sha256 = "1r82plqk1danqby90snmp4zjzdkwryvhbzj1c67b0h0k9w42v781"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; @@ -35436,8 +35267,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 +35277,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 +35742,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 +35802,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 +37204,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bifunctors" = callPackage @@ -37548,22 +37364,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 +37379,6 @@ self: { ]; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bimap-server" = callPackage @@ -37857,8 +37656,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-list" = callPackage @@ -37891,32 +37688,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 +37704,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -38123,37 +37893,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 +37922,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -38274,8 +38012,8 @@ self: { pname = "binding-core"; version = "0.2.2"; sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz"; - revision = "1"; - editedCabalFile = "1ijm34wxyxpx38yw42kl5yrb8i3gv1z7dvxhb98jz6pqxgqcvshs"; + revision = "2"; + editedCabalFile = "1cl8k9d0kkhxhdska3mk2c7w4xnyz7z0pd8xyynls0jx0qya0irl"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base HTF HUnit QuickCheck random ]; description = "Data Binding"; @@ -38288,8 +38026,8 @@ self: { pname = "binding-gtk"; version = "0.2.1"; sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr"; - revision = "1"; - editedCabalFile = "1dcccb26m1ih3mbkhf72rmz9ywva7llxjvg9s6fpssjxpms5fhwy"; + revision = "2"; + editedCabalFile = "1rcipk9zk7w0q0x9sxsdy53bak9izj0bix6jykzhsxywidcriwcy"; libraryHaskellDepends = [ base binding-core gtk mtl ]; testHaskellDepends = [ base binding-core directory gtk ]; description = "Data Binding in Gtk2Hs"; @@ -38304,8 +38042,8 @@ self: { pname = "binding-wx"; version = "0.2.1"; sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i"; - revision = "1"; - editedCabalFile = "1cpgwbzix794by0mvh3lrqv1pakh7i56hap3xhs7z2xccqc461q3"; + revision = "2"; + editedCabalFile = "18jckk1pf0bds9s3bw6bklp3nam4bxxs5nlkswar297byfpzghk1"; libraryHaskellDepends = [ base binding-core stm wx wxcore ]; testHaskellDepends = [ base binding-core directory wx ]; description = "Data Binding in WxHaskell"; @@ -39425,8 +39163,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 = [ @@ -39477,8 +39215,8 @@ self: { }: mkDerivation { pname = "bisc"; - version = "0.2.2.0"; - sha256 = "0ypkz75pzrqy12kfpkhai0xmz80bjkjz9m5ydrmzlbcwjwvzlvjz"; + version = "0.2.3.0"; + sha256 = "0x03smkfx0qnsxznlp1591gi938f15w057hywfp9497mhvkr7mxg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -39486,6 +39224,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 +39278,6 @@ self: { ]; description = "Plays chess"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bit-array" = callPackage @@ -40160,23 +39898,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 +39931,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 +40090,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 +40100,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 +40111,7 @@ self: { description = "A library providing BLAKE2"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blakesum" = callPackage @@ -41388,8 +41114,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bogocopy" = callPackage @@ -41722,6 +41446,8 @@ self: { ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boolector" = callPackage @@ -41863,23 +41589,49 @@ self: { }) {}; "boots" = callPackage - ({ mkDerivation, base, data-default, exceptions, fast-logger, hspec - , microlens, monad-logger, mtl, salak, salak-yaml, text - , unliftio-core - }: + ({ mkDerivation, base, exceptions, hspec, mtl }: mkDerivation { pname = "boots"; - version = "0.0.3"; - sha256 = "1glf3hq3vqa3rd115ym7jy5jmwx8mzqbidj875274safg8n552rm"; + version = "0.0.100"; + sha256 = "0q685h5z561lgjg2kqnkls35wpys9kx4zhghqqq3dyvl2i4dwmcz"; + libraryHaskellDepends = [ base exceptions mtl ]; + testHaskellDepends = [ base exceptions hspec mtl ]; + description = "IoC Monad in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "boots_0_1_1" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl }: + mkDerivation { + pname = "boots"; + version = "0.1.1"; + sha256 = "1z9h8i1r0jccqn0230nzn97yqzrlsapc84dnwhczzvdbaryykhbz"; + 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.1"; + sha256 = "1v8qbap22mpasjpmi9bd0n14q4vz80ksmlmk67yw840f2ly8sn0d"; libraryHaskellDepends = [ - base data-default exceptions fast-logger microlens monad-logger mtl - salak salak-yaml text unliftio-core + base boots data-default exceptions fast-logger menshen microlens + monad-logger mtl salak salak-yaml splitmix text unliftio-core vault ]; testHaskellDepends = [ - base data-default exceptions fast-logger hspec microlens - monad-logger mtl salak salak-yaml text unliftio-core + base boots data-default exceptions fast-logger hspec menshen + microlens monad-logger mtl salak salak-yaml splitmix text + unliftio-core vault ]; - description = "Boot application by plugins"; + description = "Startup factories using IoC monad"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -42684,6 +42436,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 +42492,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 +42924,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 +43236,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 +43286,8 @@ self: { ]; description = "Reflex infused with bulma (css)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bumper" = callPackage @@ -43796,28 +43555,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 +43578,6 @@ self: { ]; description = "Efficient little-endian bit vector library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv-sized" = callPackage @@ -43993,18 +43729,30 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, primitive, primitive-addr }: + ({ mkDerivation, base, primitive, primitive-addr, run-st }: mkDerivation { pname = "byteslice"; - version = "0.1.1.0"; - sha256 = "08abffrd6psiab220d8081lcs7ba7fvr7waqzykdk8i5dcm9iyvb"; - libraryHaskellDepends = [ base primitive primitive-addr ]; + version = "0.1.2.0"; + sha256 = "0bivb6gn3kfzi2rxvrf3klsgzj6p864vcxr2hnrdkr16qp1x8ysv"; + libraryHaskellDepends = [ base primitive primitive-addr run-st ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "bytesmith" = callPackage + ({ mkDerivation, base, byteslice, primitive }: + mkDerivation { + pname = "bytesmith"; + version = "0.1.0.0"; + sha256 = "1jj2shy510r83r8nahf6lwjhwp73kbmla6mly4fzjza81syrwrm4"; + libraryHaskellDepends = [ base byteslice primitive ]; + testHaskellDepends = [ base byteslice primitive ]; + description = "Nonresumable byte parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring_0_10_10_0" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random @@ -44530,8 +44278,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 +44723,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38.5"; - sha256 = "0pqislgc38q57jf252aha7x71pbdw5nxinx3gcm4s7311m25fw1f"; + version = "4.39"; + sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45079,6 +44827,34 @@ 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.1"; + sha256 = "07hx1s7l5zmh7vs2zmmm56msz2m7wnzn919mvnpypvrsswmmnnd9"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory 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 = "GPL-3.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-ghc-dynflags" = callPackage ({ mkDerivation, base, Cabal, ghc, transformers }: mkDerivation { @@ -45455,27 +45231,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 +45244,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 +45390,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 +45794,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 +45827,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 +45841,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 +45864,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 +45892,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 +46402,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 +46576,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 +46661,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 +47451,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 +47607,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 +47702,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 +47826,8 @@ self: { hspec QuickCheck ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cayene-lpp" = callPackage @@ -48245,29 +47922,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 +47943,6 @@ self: { ]; description = "Concise Binary Object Representation (CBOR)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cborg-json" = callPackage @@ -48710,6 +48363,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 +48587,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 +48603,6 @@ self: { ]; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -49550,19 +49186,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 +49193,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 +49414,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 @@ -50135,10 +49759,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.6"; - sha256 = "07z79acmr8768m31knr9r90x0f8xabdkvvyd7y0bv7061562fvdz"; - revision = "1"; - editedCabalFile = "156f61rp421x1hisdiq1m7nbaaq4hczfv66v9g94blv3a48rjwzz"; + version = "1.0.7"; + sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -51203,30 +50825,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; @@ -51395,8 +51018,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.15"; - sha256 = "1b9cjx4i196rdj1p4w243rk6pxk8h2fnwda9jadzj61nxz5sc3xv"; + version = "0.25.0"; + sha256 = "1jgxchshpkpbgpkn31iymswb08wjjfmvqglv5brs0zw4ialirrh9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -51419,17 +51042,22 @@ self: { }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage - ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl - , network, parsec + ({ mkDerivation, acid-state, base, clckwrks, containers, filepath + , haskeline, mtl, network, parsec }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.17.3"; - sha256 = "1akbfin1avsdd3r4f65p034divl8i24g4h627frcdypkc25j8qgf"; - isLibrary = false; + version = "0.3.0"; + sha256 = "0ardhl27n3al945s88dmygnw42ki5sn23s59rkhbs4pdyp9yawhs"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + acid-state base clckwrks containers filepath haskeline mtl network + parsec + ]; executableHaskellDepends = [ - acid-state base clckwrks haskeline mtl network parsec + acid-state base clckwrks containers filepath haskeline mtl network + parsec ]; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -51574,8 +51202,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.16"; - sha256 = "15m1bhiyw5rzfx1y6yhra2d0zkiaffy9rvp408pb4ccfdxg4bi2s"; + version = "0.4.3.18"; + sha256 = "0fgz0rxzkbavzqci4kcav1pljkhdy1mgmf3mldbxp8f88pr5lm42"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory @@ -52041,18 +51669,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 +51679,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 +52158,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 +52167,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 +52175,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 +52184,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 +52200,8 @@ self: { ]; description = "Code highlighting for cmark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmark-lucid" = callPackage @@ -52645,6 +52226,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 +52422,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 +52542,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 +52572,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 +52581,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 +52925,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 +53214,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 +55132,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 +55140,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 +55214,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 +55229,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 +55279,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 +55287,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 +55739,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 +55756,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -56527,8 +56039,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.1.0.4"; - sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb"; + version = "0.2.3.3"; + sha256 = "18z0p9bd2ca43a64k3idsywm2f1vv6qh03l8isgnahjh7j96ngih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56551,42 +56063,26 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "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 + "conferer" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, hspec + , text }: mkDerivation { - pname = "confcrypt"; - version = "0.2.3.3"; - sha256 = "18z0p9bd2ca43a64k3idsywm2f1vv6qh03l8isgnahjh7j96ngih"; - isLibrary = true; - isExecutable = true; + pname = "conferer"; + version = "0.1.0.0"; + sha256 = "0y62yj2cm7q9qwxl3jfdq16rza2mrjg60lchx4s0gbwiw959a83n"; 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 + base bytestring containers directory text ]; 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 + base bytestring containers directory hspec text ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Configuration management library"; + license = stdenv.lib.licenses.bsd3; }) {}; "confetti" = callPackage @@ -57021,25 +56517,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 +56533,6 @@ self: { ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -57276,8 +56752,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 +56787,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 +57837,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 +57903,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 +57920,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 +57956,8 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copr" = callPackage @@ -59076,8 +58556,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 +58771,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 +59505,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 +60369,8 @@ self: { ]; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptonite" = callPackage @@ -61079,6 +60530,8 @@ self: { ]; description = "Connection-set algebra (CSA) library"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cse-ghc-plugin" = callPackage @@ -61533,26 +60986,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 +60995,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 @@ -61609,6 +61041,27 @@ self: { broken = true; }) {}; + "cuckoo" = callPackage + ({ mkDerivation, base, bytestring, criterion, cryptonite, doctest + , hashable, memory, primitive, QuickCheck, random, stopwatch + , vector + }: + mkDerivation { + pname = "cuckoo"; + version = "0.2.0.1"; + sha256 = "1q070hzrsm0f1lfxnsk4jmmb9pay98522k2lqncvzg09fm2a687j"; + libraryHaskellDepends = [ base memory primitive random vector ]; + testHaskellDepends = [ + base bytestring cryptonite doctest hashable memory stopwatch + ]; + benchmarkHaskellDepends = [ + base bytestring criterion memory QuickCheck stopwatch + ]; + doHaddock = false; + description = "Haskell Implementation of Cuckoo Filters"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cuckoo-filter" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cereal, containers , criterion, hashable, QuickCheck, random, tasty, tasty-hunit @@ -61977,8 +61430,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 +61440,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 +61458,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 +61470,6 @@ self: { ]; description = "Generators for Purely Functional Cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "curve25519" = callPackage @@ -63774,6 +63235,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 +63869,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 +65271,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.95"; - sha256 = "1qbg1kya1a8ysmbls44hcwqlv7kr9cnlpnxwqv4pixamraqhqx1i"; + version = "3.95.1"; + sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66051,6 +65512,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 +65967,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 +65975,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -66877,12 +66337,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 +66489,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 +66503,6 @@ self: { ]; description = "Double-ended queues"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -67075,6 +66517,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 +66567,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 +67137,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 +67232,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 +67289,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 +67348,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 +68698,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 +68798,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 +69451,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 @@ -71019,12 +70481,14 @@ self: { }) {}; "ditto" = callPackage - ({ mkDerivation, base, containers, mtl, semigroups, text }: + ({ mkDerivation, base, containers, mtl, semigroups, text, torsor }: mkDerivation { pname = "ditto"; - version = "0.3.1"; - sha256 = "1y3s0q0c0lsj6hsszazbd0yjb10nagvg96nw3x154kz55mn2bdym"; - libraryHaskellDepends = [ base containers mtl semigroups text ]; + version = "0.4"; + sha256 = "0qnkv0r5dm73qlrsgwxwzm7f9gbknwcy1dzbjs6vlcmx8hyqh2gp"; + libraryHaskellDepends = [ + base containers mtl semigroups text torsor + ]; description = "ditto is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71033,8 +70497,8 @@ self: { ({ mkDerivation, base, ditto, lucid, path-pieces, text }: mkDerivation { pname = "ditto-lucid"; - version = "0.3.2"; - sha256 = "1asp25vi3m6rbk1wllqb1gzjrgifndhcpr2blx1j132ql6h5qqpj"; + version = "0.4"; + sha256 = "1if543wf7div8ww90ifdh75i2w99lhbfh8pfnzmd1yaw2j1m35ff"; libraryHaskellDepends = [ base ditto lucid path-pieces text ]; description = "Add support for using lucid with Ditto"; license = stdenv.lib.licenses.bsd3; @@ -71204,10 +70668,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 +70751,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 +70830,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 +70851,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -71602,6 +71040,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 +71194,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 +71216,6 @@ self: { ]; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -71936,8 +71346,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 +71620,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 +71804,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 +73181,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 +73745,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 @@ -74937,8 +74319,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.9.0"; - sha256 = "1law6pwgqvp6nniwwbbsdm6fjq2fp30ywjfla2qqgwdabcqbd2vq"; + version = "3.9.1"; + sha256 = "1q4hyvr52zv2p827cvkmi4rl1d1dvrdg9bly6wykbhdv6ycbihn5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75116,12 +74498,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 +74613,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 +74739,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 +74901,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 +74943,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 +75431,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 +75967,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 +76085,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 +76093,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 +76109,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 +76302,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 +76311,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 @@ -76977,8 +76335,8 @@ self: { }: mkDerivation { pname = "enumset"; - version = "0.0.4.1"; - sha256 = "0m6ha4m9hvmzkgnwani3z3vgcllzgv6n578g56x4sb9bgxgi37az"; + version = "0.0.5"; + sha256 = "0d9lnl7mmcwydfhb4iazh6gcdbxvdh7b3gar3c9l1k5xmc4r8qii"; libraryHaskellDepends = [ base data-accessor semigroups storable-record ]; @@ -77072,25 +76430,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 +76441,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 +77264,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 +77282,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; @@ -77986,6 +77324,74 @@ self: { broken = true; }) {}; + "essence-of-live-coding" = callPackage + ({ mkDerivation, base, foreign-store, QuickCheck, syb + , test-framework, test-framework-quickcheck2, transformers + , vector-sized + }: + mkDerivation { + pname = "essence-of-live-coding"; + version = "0.1.0.1"; + sha256 = "0804zqbl2w8cvj4n9y2qx9wdmigmw56fxdzkqrw6x2szl2qvsfjz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foreign-store syb transformers vector-sized + ]; + executableHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + base QuickCheck syb test-framework test-framework-quickcheck2 + ]; + description = "General purpose live coding framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "essence-of-live-coding-gloss" = callPackage + ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss + , syb, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-gloss"; + version = "0.1.0.1"; + sha256 = "0716mwww68x8v2r6fz6ah8m26w5h98kgd662rirh56nmwr219zk5"; + libraryHaskellDepends = [ + base essence-of-live-coding foreign-store gloss syb transformers + ]; + description = "General purpose live coding framework - Gloss backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "essence-of-live-coding-pulse" = callPackage + ({ mkDerivation, base, essence-of-live-coding, foreign-store + , pulse-simple, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-pulse"; + version = "0.1.0.1"; + sha256 = "18f6wrq5ar14yb44yl6m8xfi9c721yywl4gzwcrx65n6wn3h16va"; + libraryHaskellDepends = [ + base essence-of-live-coding foreign-store pulse-simple transformers + ]; + description = "General purpose live coding framework - pulse backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "essence-of-live-coding-quickcheck" = callPackage + ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding + , QuickCheck, syb, transformers + }: + mkDerivation { + pname = "essence-of-live-coding-quickcheck"; + version = "0.1.0.1"; + sha256 = "0wkffsy3jxz85lxlbppi477wkzlx2zvxmjc70rgf8bjw8s631a22"; + libraryHaskellDepends = [ + base boltzmann-samplers essence-of-live-coding QuickCheck syb + transformers + ]; + description = "General purpose live coding framework - QuickCheck integration"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "estimator" = callPackage ({ mkDerivation, ad, base, distributive, lens, linear, reflection }: @@ -78413,6 +77819,8 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "euphoria" = callPackage @@ -78833,6 +78241,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 +78264,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 +78293,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 +79282,12 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.0"; - sha256 = "1bm2bzkkjnwrzf67g7291pw7cvlxg86mz69fnlrigmlxcx3kxbn4"; + version = "0.1.2"; + sha256 = "0i6dh1kpadhh4faanmkszdq1bbsdyl2ngbyrwv7pb8kb3wqc4y6y"; 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 +79317,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 +79550,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 @@ -80230,6 +79605,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_18" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, semigroups, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.18"; + sha256 = "0jvd4l0hi8pf5899pxc32yc638y0mrc357w0rph99k3hm277i0cy"; + libraryHaskellDepends = [ + base clock directory filepath process semigroups time unix + ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -80296,6 +79688,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 +79706,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 +79827,6 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "facts" = callPackage @@ -80839,8 +80231,8 @@ self: { }: mkDerivation { pname = "fast-builder"; - version = "0.1.0.1"; - sha256 = "0ykl1s29kma3bxvv1jfi7q8yv9vmbn1lsrfyn7axgi51j4g06x32"; + version = "0.1.1.0"; + sha256 = "024n5q1zsmd1va662sjdnc42w4qj6pmqg64fsfcn0jx5zvmg62d9"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ @@ -81232,6 +80624,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 +80638,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 +80673,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 +80687,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 +80715,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 +80729,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 +80759,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 +80773,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 +80787,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 +80815,6 @@ self: { ]; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -81750,23 +81130,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 +81149,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 +81221,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 +81235,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 +81799,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 +82370,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 +82383,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 +82672,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 +82731,6 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fit" = callPackage @@ -83471,6 +82775,8 @@ self: { ]; description = "Parse FITS files"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fitsio" = callPackage @@ -83556,23 +82862,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 +82972,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 +83279,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 +84257,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 +84300,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 @@ -86021,6 +85276,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 +85365,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 +85372,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 +86517,8 @@ self: { ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frontmatter" = callPackage @@ -87616,6 +86859,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 +86897,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 +86915,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 +87423,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 +87582,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 +87634,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 +87651,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 +87666,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 @@ -88463,8 +87710,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.11.2"; - sha256 = "0bjbz5zan20bpid2i6kbjwk589gkdwfvfawlg27j13p8a82srpdf"; + version = "0.12.1"; + sha256 = "00f95mhw6z5hz5jg6mnpgklkm548gp6nr3c49qhr661n8xl1fpyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88608,26 +87855,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 +87867,6 @@ self: { ]; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -88858,6 +88084,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 +89053,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 +89070,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 +89410,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 +89460,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 +89652,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 +89713,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 +89729,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 +89741,6 @@ self: { ]; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -90575,26 +89750,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 +89761,6 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -90615,24 +89769,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 +89779,6 @@ self: { ]; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -90652,26 +89787,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 +89799,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 +89809,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 +89821,6 @@ self: { ]; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -90830,9 +89921,7 @@ self: { typed-uuid uuid ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {genvalidity-typed-uuid = null; typed-uuid = null;}; + }) {}; "genvalidity-path" = callPackage ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec @@ -90859,22 +89948,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 +89956,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 +89982,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 +89992,6 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -90957,28 +90010,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-unordered-containers" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable - , hspec, QuickCheck, unordered-containers, validity - , validity-unordered-containers + "genvalidity-typed-uuid" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-uuid, hspec, QuickCheck + , typed-uuid }: mkDerivation { - pname = "genvalidity-unordered-containers"; - version = "0.2.0.4"; - sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q"; + pname = "genvalidity-typed-uuid"; + version = "0.0.0.0"; + sha256 = "17lxwdb94lqprbymqsrm8xkgmgxaff6a3cczb1mzid9c91s1ym88"; libraryHaskellDepends = [ - base genvalidity hashable QuickCheck unordered-containers validity - validity-unordered-containers + base genvalidity genvalidity-uuid QuickCheck typed-uuid ]; testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec unordered-containers - validity + base genvalidity genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec QuickCheck typed-uuid ]; - description = "GenValidity support for unordered-containers"; + description = "Generators for Phantom-Typed version of UUID"; license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-unordered-containers_0_3_0_0" = callPackage + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity , validity-unordered-containers @@ -90997,7 +90049,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -91024,24 +90075,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 +90085,6 @@ self: { ]; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -91201,29 +90233,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 +90250,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 +90306,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 +90449,6 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -91750,29 +90758,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 +90772,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -91833,8 +90817,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 +90911,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 +90952,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 +90962,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 +90991,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 @@ -92135,6 +91163,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-paths_0_1_0_12" = callPackage + ({ mkDerivation, base, Cabal, directory }: + mkDerivation { + pname = "ghc-paths"; + version = "0.1.0.12"; + sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base ]; + description = "Knowledge of GHC's installation directories"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-pkg-autofix" = callPackage ({ mkDerivation, base, Cabal, cmdargs, filepath, parsec, process , split @@ -92620,18 +91661,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 +91670,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 +91756,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 +91773,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -93138,25 +92139,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 +92149,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 +92158,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 +92172,6 @@ self: { ''; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -93286,8 +92242,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 +92266,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 +92276,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 +92324,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 +92336,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 +92358,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 +92379,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 +92388,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 +92398,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 +92417,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 +92426,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 +92436,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 +92445,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 +92455,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 +92474,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 +92500,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 +92521,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 +92542,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 +92563,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 +92633,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 +92643,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 +92657,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 +92682,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 +92736,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 +92744,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 +92777,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 +92791,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 +92826,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 +92882,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 +92891,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 +92905,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 +92931,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 +92975,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 +92996,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 +93006,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 +93020,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 +93137,6 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -94442,8 +93180,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.9.0.0"; - sha256 = "14racx3vadxypk8h5cwj2qhg5fpc2pma6gmwlmr2ga6yswpgkl29"; + version = "0.9.1.0"; + sha256 = "0qlsqbkxwyc4hi8228l0mgiylnc0q9i02i46043m1390mdmp34qz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -94463,8 +93201,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 +93314,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 @@ -94663,8 +93401,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190730"; - sha256 = "16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg"; + version = "7.20190819"; + sha256 = "1fvyxx47qx7yr8xfan398jlixbawblpz5h69kqsw1z7kh6plnycy"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -94712,6 +93450,26 @@ 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.4.0"; + sha256 = "1ss2axjwjx7pqx9dq7mxhbnn43k1g1zj7n54f2xq7zwq2ngd5x8f"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base brick microlens process vector vty + ]; + executableHaskellDepends = [ + base brick microlens process vector vty + ]; + testHaskellDepends = [ base brick microlens process vector vty ]; + doHaddock = false; + description = "git checkout command-line tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -94875,6 +93633,22 @@ self: { broken = true; }) {}; + "git-lfs" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, http-client, http-types, network-uri, text + }: + mkDerivation { + pname = "git-lfs"; + version = "1.0.0"; + sha256 = "0ryxi43sng5nwb9brdirvvxcs2j6bmg1x9vdx9fq5r4dch62b1zy"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-types network-uri text + ]; + description = "git-lfs protocol"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "git-mediate" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory , filepath, mtl, optparse-applicative, process, unix-compat @@ -95044,8 +93818,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 +93924,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 +94137,8 @@ self: { }: mkDerivation { pname = "githud"; - version = "3.0.0"; - sha256 = "1zr7d5h0x1fsnwb2pg9vn34ir0m144h1vnlh0avickazz2ljx2xr"; + version = "3.1.0"; + sha256 = "0shdb3a73w0n0p9pl0j7gmsqjwvniah3l251cgn27sp1cm33li8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95380,7 +94150,7 @@ self: { base daemons mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - description = "More efficient replacement to the great git-radar"; + description = "Heads up, and you see your GIT context"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95733,6 +94503,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 +94531,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 +94545,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 +94565,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 +94576,6 @@ self: { ]; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -96740,8 +95469,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 ]; @@ -97119,8 +95848,8 @@ self: { }: mkDerivation { pname = "gogol"; - version = "0.4.0"; - sha256 = "1w6bxhgdsilv6z1q0m2qidv1in10i9p5biz733v2nqg2pflj8qgh"; + version = "0.5.0"; + sha256 = "1aah3db2ws07q4z2pka4gmsagpwlimv19xq0p6y0bznq86yy7i1q"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit conduit-extra cryptonite directory exceptions filepath gogol-core http-client @@ -97137,8 +95866,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-abusiveexperiencereport"; - version = "0.4.0"; - sha256 = "0jlpybzl1p6jifrj3cdc5wndjg1ds15liz844wl3vmx45p5bj2mq"; + version = "0.5.0"; + sha256 = "1c701rajjybggf04rvmj39mn5ryq27kvz79jacxhk9ia1g48lfbb"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Abusive Experience Report SDK"; license = "unknown"; @@ -97149,20 +95878,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-acceleratedmobilepageurl"; - version = "0.4.0"; - sha256 = "0bd34zw60bzx4h2iczz02ynn7vm2pma3b1x419nafr70jlil11bc"; + version = "0.5.0"; + sha256 = "0mr77fifnjl9r1jvmdzr7nvbxrh18n1c7m5yahlg4gsph9jzxg6i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Accelerated Mobile Pages (AMP) URL SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-accessapproval" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-accessapproval"; + version = "0.5.0"; + sha256 = "062377i1nrhynsqyg53fkczhj9ljxa1ms062zykyxq4inv7d9r2a"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Access Approval SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-accesscontextmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-accesscontextmanager"; - version = "0.4.0"; - sha256 = "1rq8q9av1vj0v7y7av6y92isyf0rrr0v5dqihx2ryhsxcn9bly4m"; + version = "0.5.0"; + sha256 = "0nglp371pxal59p33bb50r1vck6mc662z2yrqsq326w77dc24k6z"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Access Context Manager SDK"; license = "unknown"; @@ -97173,8 +95914,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; - version = "0.4.0"; - sha256 = "056896r5iq343bam9qzd41x1iaqa0p31x20w6zspn3v9r8i1x76b"; + version = "0.5.0"; + sha256 = "0a2v15z4x0a6dbc789s1j78qcsfqypdf65ydw0gxzgajl136ni7x"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; @@ -97185,8 +95926,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; - version = "0.4.0"; - sha256 = "17pvmi371xx06qav5c4fsq5il9a54478jwjfk7wh1snifxwsg3dn"; + version = "0.5.0"; + sha256 = "02y7sz24flvm6fayfjjvdrywsqy0qw3wrqkfg4jcwa1093j2x3g9"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Seller SDK"; license = "unknown"; @@ -97197,8 +95938,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchangebuyer2"; - version = "0.4.0"; - sha256 = "0bsxix42viyg74yvw03bhn19c9rcav1hby63fjlcg9zvs9pqx9a2"; + version = "0.5.0"; + sha256 = "0sy40qp8z47d364dml5fafdy34xwlaa8lwn86n076i0xr0a2c3sc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Exchange Buyer API II SDK"; license = "unknown"; @@ -97209,8 +95950,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexperiencereport"; - version = "0.4.0"; - sha256 = "0n9gg9rgwyj7x115dpp73gqsz61qjkph8iwlf51ak0dflvhpcirc"; + version = "0.5.0"; + sha256 = "1sk083dkiwzr39w7bgqv3klvnx0jb8xqz1v3x0val3dzhfhd0rg0"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Ad Experience Report SDK"; license = "unknown"; @@ -97221,8 +95962,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.4.0"; - sha256 = "0i0zrz1wgwdqxisq47icaa9rz1vawgkwk80pg8lzraaf82scxsd2"; + version = "0.5.0"; + sha256 = "149h3kg68xqanpzyqxbjxq1nskigv1310fq17inkl3bqm7mk0d3s"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Data Transfer SDK"; license = "unknown"; @@ -97233,8 +95974,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; - version = "0.4.0"; - sha256 = "0nikrrv152xnr4b8542vlmnqazq8cvq89mi004nzd8pfl0a7nz5m"; + version = "0.5.0"; + sha256 = "0kinbhz4j11nd6s5w4jg13dpbq6hgf6acnqi6hvmn4m4yjm6qs5i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Directory SDK"; license = "unknown"; @@ -97257,8 +95998,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-reports"; - version = "0.4.0"; - sha256 = "0ncx9knx8lnkbg0zcc5ak1ywgk1nqdqvplri247wxxlyn582xx2b"; + version = "0.5.0"; + sha256 = "17m4924mqr0wiq07n3ada8jqc2kbwn2apzmbkpcsf6ns8qpw4r4k"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Admin Reports SDK"; license = "unknown"; @@ -97269,8 +96010,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; - version = "0.4.0"; - sha256 = "0ahw3mapm93krj2lkzvcxqg3n7v912drfqb40afjl9p572hppl0w"; + version = "0.5.0"; + sha256 = "07v6sgp6dqvgcmni4579c6iyxqbbn24lyp64zfdv88s4wjhjbdjj"; libraryHaskellDepends = [ base gogol-core ]; description = "Google AdSense Management SDK"; license = "unknown"; @@ -97281,8 +96022,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.4.0"; - sha256 = "03pm68sksb2r51a7962bjypaf0ycbjsqwdyzl338v2l03jwp4d3w"; + version = "0.5.0"; + sha256 = "1s9dsrz6svnm8jjl13w3v72gyyg2xc5sxg6piw087c8j1sqfx131"; libraryHaskellDepends = [ base gogol-core ]; description = "Google AdSense Host SDK"; license = "unknown"; @@ -97305,8 +96046,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-alertcenter"; - version = "0.4.0"; - sha256 = "0sb4r4xbcfmrygz92xy1b0qps32mvw4kxlgixzmx5lhabhmh19rg"; + version = "0.5.0"; + sha256 = "0d114xkvdjzfgl63gyc1a56jfdacbr5chdz80199jp85zp04h3wi"; libraryHaskellDepends = [ base gogol-core ]; description = "Google G Suite Alert Center SDK"; license = "unknown"; @@ -97317,8 +96058,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; - version = "0.4.0"; - sha256 = "0vbz4ydkkglradhmrs1s3ldz8isz65lvfw84imhrmfrnbj8mvwsr"; + version = "0.5.0"; + sha256 = "1bfm1z13hvijln3f92n4i8042dd56z6wian6scnbfcndnsfwsrc9"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Analytics SDK"; license = "unknown"; @@ -97329,8 +96070,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analyticsreporting"; - version = "0.4.0"; - sha256 = "0wcnvdf02l3s81f53v33f6vy3ksnpcyhdls4jf6939x2pz7frrld"; + version = "0.5.0"; + sha256 = "0ih63njgb3612myqfc1impas9jc5gx5hlmhvjzw0bp6rn7dv5qvm"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Analytics Reporting SDK"; license = "unknown"; @@ -97341,8 +96082,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; - version = "0.4.0"; - sha256 = "0pq3krv5gncwpiblrkqsabrkqldjl1gardkf279qqc8z7qw74wn8"; + version = "0.5.0"; + sha256 = "0qxvqv3i21k9g0mgy67073xb2yd8m357c2806v18inh7cikhndgy"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play EMM SDK"; license = "unknown"; @@ -97353,8 +96094,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; - version = "0.4.0"; - sha256 = "0f9s1zss2i5xq67mv7wgvgbbba0fybqmnyr4vxjg28c2y5kvvggv"; + version = "0.5.0"; + sha256 = "05dz12615l74y4iqasgn84vi79i1m7wv11gz5sfbmmmddizjdxy4"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Developer SDK"; license = "unknown"; @@ -97365,8 +96106,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-androiddeviceprovisioning"; - version = "0.4.0"; - sha256 = "0zynvy8720b26sp884da98cfnx9g7rcwgrj6n27lqmpw3lqmfh4r"; + version = "0.5.0"; + sha256 = "1yc88s0h6v8ipw26a90ds0wdmsg78zpp3pqrybip9fh8grzbplv5"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Android Device Provisioning Partner SDK"; license = "unknown"; @@ -97377,8 +96118,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-androidmanagement"; - version = "0.4.0"; - sha256 = "16xarhr93vpxawd7mg59zc53bl7xh63hpqjz869vhnf481vn4pmq"; + version = "0.5.0"; + sha256 = "0j68bbdyb3qnjylkb7fyv162pxfjx6802cnb63kryl7wbzcvf02s"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Android Management SDK"; license = "unknown"; @@ -97389,8 +96130,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; - version = "0.4.0"; - sha256 = "14pf281j7q05dlz8i08m8082qixx1d5fjyi3zm19blsghx7hsn6a"; + version = "0.5.0"; + sha256 = "1p4cxp4f417m0llw58zslaabfswp5s9b9xlxfn3qrl3mdghs8lvk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google App Engine Admin SDK"; license = "unknown"; @@ -97401,8 +96142,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; - version = "0.4.0"; - sha256 = "1iv4q10h5n8mbkjgw2v7j9d9y4zvl0srpkw1kwd98h1chgg7hyhi"; + version = "0.5.0"; + sha256 = "0frs0976h57gckraxhipbsd1ps39ddw5bcsxrya9mczyh31aqn4w"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive Activity SDK"; license = "unknown"; @@ -97413,8 +96154,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.4.0"; - sha256 = "1dbxva37p8ww835y4sg1v01f12kr049ralsfqs3hkv516lsh7kxr"; + version = "0.5.0"; + sha256 = "1q68zbqk7pkh7clvlyjlkdy7i3zwrh8rl7ksyxd9x8wvla91qc34"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Calendar SDK"; license = "unknown"; @@ -97425,8 +96166,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; - version = "0.4.0"; - sha256 = "1sbbr7ihl415zx7axjwlvbfp646gr3fbb90n27wxh8pl4h2hlzkf"; + version = "0.5.0"; + sha256 = "1x86ssslmksdlfmf8rasavpn9dg5kpk416zf001mb896lh6r5dlq"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Enterprise License Manager SDK"; license = "unknown"; @@ -97437,8 +96178,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; - version = "0.4.0"; - sha256 = "038qfmfpw3wi5v9x9wgbpv2agbjab8z5q0idwzfih8xjckfxd520"; + version = "0.5.0"; + sha256 = "0zxjp7apiqd12bcj6fwwrlx8j466pavfgmv35d2alvmb83n1h8gw"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; @@ -97449,8 +96190,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; - version = "0.4.0"; - sha256 = "1nfzl9hqsh2dwgxhwwx5w6yr6vvcbx0j72iprb42bp6hsv5lh5nx"; + version = "0.5.0"; + sha256 = "0cb61wqjq8za2d44i0h561hzp2nmyynr2fy24mbhj2gb0zcd14bc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Tasks SDK"; license = "unknown"; @@ -97461,8 +96202,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; - version = "0.4.0"; - sha256 = "1z6k2kx20jgankjb1ynyhr0s9q8n2wln5ng8w0bd2gnflxnh26l7"; + version = "0.5.0"; + sha256 = "1gx52lnrp6mdsf168x0viwkj8pr49a0npf98a402ij3gndsn28aq"; libraryHaskellDepends = [ base gogol-core ]; description = "Google App State SDK"; license = "unknown"; @@ -97485,8 +96226,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; - version = "0.4.0"; - sha256 = "1c1gr2pwy9a0chysfi6v1imy15f5k689ys5lfnrgnl65ff0hqifq"; + version = "0.5.0"; + sha256 = "1z3rdh9qrabycxnxrzay6ddw5l97qws48hn78g5pkbn73z1dh22z"; libraryHaskellDepends = [ base gogol-core ]; description = "Google BigQuery SDK"; license = "unknown"; @@ -97497,8 +96238,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquerydatatransfer"; - version = "0.4.0"; - sha256 = "0gccvjc81c3kz88iy4kd7ihp57z5p2a83ma23c1rishfl2cr3p00"; + version = "0.5.0"; + sha256 = "13pbbhk4ryg7vpkhkdvkjhc4sjnizdpjll4x9inb0zm8k1ki21ws"; libraryHaskellDepends = [ base gogol-core ]; description = "Google BigQuery Data Transfer SDK"; license = "unknown"; @@ -97509,8 +96250,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigtableadmin"; - version = "0.4.0"; - sha256 = "10hcaalxhx2ds2drjqry27kk416q87hcd020nvfzsnj4hl0msl5q"; + version = "0.5.0"; + sha256 = "0nxrcyf3spmhchmmjbszpv935lcwb979zfil9iwdigymq5wvfzgx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Bigtable Admin SDK"; license = "unknown"; @@ -97521,8 +96262,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.4.0"; - sha256 = "0ilfy5bn1wk95wg4496ap9szl9lp6sh1sdr9ngg6vral05jjf7ck"; + version = "0.5.0"; + sha256 = "1zx7k5qhasvjz1568znasix6xrkxhsfhcsqwv6r1zd5a3pnzvaxm"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Billing SDK"; license = "unknown"; @@ -97533,8 +96274,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-binaryauthorization"; - version = "0.4.0"; - sha256 = "182ghkavwbi6y759235wrifwywyq2r7vc45xpgk979kcgk5jnjlk"; + version = "0.5.0"; + sha256 = "19gbql17mrxn4xgdbl96f245fckaj5gwwggn5f7xa59ahzbgfgay"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Binary Authorization SDK"; license = "unknown"; @@ -97545,8 +96286,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; - version = "0.4.0"; - sha256 = "16yv9rld0q2hi553k72c9z6854r7n8h3yx2hf8fam3zmkcr1qad4"; + version = "0.5.0"; + sha256 = "027g8vj7msdzmkb7sjbd9s0p3zpxyal1l0daxbw1bhwr9lrd8j94"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Blogger SDK"; license = "unknown"; @@ -97557,8 +96298,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; - version = "0.4.0"; - sha256 = "1zkz32mwarmfcjbqzjm3lpmdibfhgpra68cad2rh68bm2jkj71yf"; + version = "0.5.0"; + sha256 = "07rd2592hqvbx1lkz9hgrqjfy91a6g5vhy6d88yqzzyl1mkwq405"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Books SDK"; license = "unknown"; @@ -97569,8 +96310,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-chat"; - version = "0.4.0"; - sha256 = "12af5z86s3xxhn8ci4aqls3h2q52msmnh5ygd0igmdq0vn0278ij"; + version = "0.5.0"; + sha256 = "0dxwfml51xh3a04ghhr41dbaayq1c36klaiwams3rq95ak7mnq6i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Hangouts Chat SDK"; license = "unknown"; @@ -97581,8 +96322,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.4.0"; - sha256 = "1cvb0wbmv7a78d3bannd2n3ymny90dbnn68d979qgd8nz45r0k5z"; + version = "0.5.0"; + sha256 = "04kv6rnaiq1bxn46ir1l5w6w5qysb6f85ly3c9jksf0m5607gxxr"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Civic Information SDK"; license = "unknown"; @@ -97593,8 +96334,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.4.0"; - sha256 = "0fyq54ddh2a8l0ai29x1dz4kcisx671mcg74p3c103iynfqnlyzr"; + version = "0.5.0"; + sha256 = "0hh6kbknnz7drd6ba1irr9wk5vhf51pgiskydgcav3f251j31sx4"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Classroom SDK"; license = "unknown"; @@ -97605,8 +96346,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudasset"; - version = "0.4.0"; - sha256 = "0ki8r45p59hdakhdpz4sxxkfgnm908limvsd8z8afrnw5jg2h9ac"; + version = "0.5.0"; + sha256 = "0368lmz0nsffs9pj1v4ab5yx5xhfh1g27c9l3fs49aihdrvij3yk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Asset SDK"; license = "unknown"; @@ -97617,8 +96358,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-clouderrorreporting"; - version = "0.4.0"; - sha256 = "1ixc67805bv4klz1sxgjg83zydar1712n4zdpps6wnccl8rh0f3p"; + version = "0.5.0"; + sha256 = "1hsgrpc9cbazn5a1g6lsg5azd8bgl45b95djwy13bc6vi9xwsr28"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Error Reporting SDK"; license = "unknown"; @@ -97629,8 +96370,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudfunctions"; - version = "0.4.0"; - sha256 = "1fz3yxhaffgn8414ak95qkliwwkd8k7kxv7kyx2sdahhk6f7gckw"; + version = "0.5.0"; + sha256 = "1pv7h53zyqlp7wbw48hxxp3x9n515v0jdkjnpxqbszfhza28jsy9"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Functions SDK"; license = "unknown"; @@ -97641,8 +96382,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudidentity"; - version = "0.4.0"; - sha256 = "1zfyc73xbdzwcmzn9pd8y118bwwgw02igd5knjwsvlv7jdjrsghh"; + version = "0.5.0"; + sha256 = "1z4ncvzggpn52r75bl7y9mk19vdpsimxfflggvzz1lgy941ciyil"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Identity SDK"; license = "unknown"; @@ -97653,8 +96394,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudiot"; - version = "0.4.0"; - sha256 = "0h30a94vj2g58y87l6k8amzxpxr71q94jli48pq81ddas78486i3"; + version = "0.5.0"; + sha256 = "07zw4p2pi9gb90fzfg899xqbv50iwxc7rsb705wbpiyj80ynd85b"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud IoT SDK"; license = "unknown"; @@ -97665,8 +96406,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudkms"; - version = "0.4.0"; - sha256 = "14rhdja6wwrcdhh67avbi395n870rmyrnzfx7cqyfvvngpp4321v"; + version = "0.5.0"; + sha256 = "0wpjmxrp1gl663sqcfgalrgjqw90wcahjlsg9bm6ay9y7g8mic0m"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Key Management Service (KMS) SDK"; license = "unknown"; @@ -97685,12 +96426,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-cloudprivatecatalog" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudprivatecatalog"; + version = "0.5.0"; + sha256 = "0y0z6wmsr2qsgj6wh4y37ph68fayk5szzk02xv0ncggrn5pbpm07"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Private Catalog SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-cloudprivatecatalogproducer" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudprivatecatalogproducer"; + version = "0.5.0"; + sha256 = "1zq8pb3jm6gpp116q4x8i69jihgwnbyafdrnw5jxyl3ynr6bwll0"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Private Catalog Producer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-cloudprofiler" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudprofiler"; - version = "0.4.0"; - sha256 = "188c11fn4cqf32d6jp0dfql4cg4fwn85hlw59q54i2yvpkxmw666"; + version = "0.5.0"; + sha256 = "022d1ix4a4n3kk108jl1yl2x13q57ahg4c9gvbxlvm7g3skz2rda"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Profiler SDK"; license = "unknown"; @@ -97701,8 +96466,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudscheduler"; - version = "0.4.0"; - sha256 = "13yx14k78vmfdslhj5wcd8kqnh77dy0svc1d2hhbb6qazs523liq"; + version = "0.5.0"; + sha256 = "1vb3xwnn59b3fzybp09lxpysij37q8rxg3392gnf09mqg57vlcpw"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Scheduler SDK"; license = "unknown"; @@ -97713,8 +96478,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudsearch"; - version = "0.4.0"; - sha256 = "01ra2xwqp33v1izmsx08xwxnif3qmgz51hsgmib1l409p425bzy0"; + version = "0.5.0"; + sha256 = "05nwvrdilz79hdlbzl853h3aj4gqcwql251slmzgg3s92haz0ygx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Search SDK"; license = "unknown"; @@ -97725,8 +96490,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudshell"; - version = "0.4.0"; - sha256 = "0j1f9b050vifnsdp8hby3sry77wfvx7856z92xal2adgv23qcrv1"; + version = "0.5.0"; + sha256 = "08hngcd8v08j7gp7pfyx6jm10p1g5w80ljq511f0jg5i5s6pkpr9"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Shell SDK"; license = "unknown"; @@ -97737,8 +96502,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtasks"; - version = "0.4.0"; - sha256 = "02dg92n6q6j5fzvm018dsa09n1ks1dx1bh6sjl74d8wqksnzsnfr"; + version = "0.5.0"; + sha256 = "1rgm3m1nsvfc96vipsqjaci6h21j8lxk0qb9jxs7qmifyhlycr5a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Tasks SDK"; license = "unknown"; @@ -97749,20 +96514,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; - version = "0.4.0"; - sha256 = "0jgpx5aln442m1zgwp44c2hlwygjkvzlxyb9lh8jb1m4yvigwmrd"; + version = "0.5.0"; + sha256 = "12yh4ks9mwfk48qqgkp38vv7xrrlqlnx1d41x851xwb7hw61288r"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Trace SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-commentanalyzer" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-commentanalyzer"; + version = "0.5.0"; + sha256 = "1psy2vd6xj2rlnacay6srp0lcy4bvfnkpqjg5yvl41qx74w11dc9"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Perspective Comment Analyzer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-composer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-composer"; - version = "0.4.0"; - sha256 = "0r28qibn9sin49gfnzqwkxd86lp4jczq3s10ry3j84rnjn6rnwf6"; + version = "0.5.0"; + sha256 = "1hzdnrchczaha310sr5ndk7bwykvv6qy70hh2jcw6s5fg6kjmpi5"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Composer SDK"; license = "unknown"; @@ -97773,8 +96550,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; - version = "0.4.0"; - sha256 = "16cfb8z1aycc9zgdasfp1xxihdnb92wh0kg5gw7xkfbqxvh1gbfy"; + version = "0.5.0"; + sha256 = "1z0l373qb3swnli6987r5s6l1kkrrh4m3hc8mghchviz16hpwm30"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine SDK"; license = "unknown"; @@ -97785,8 +96562,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-consumersurveys"; - version = "0.4.0"; - sha256 = "0ssk3b4iq6977ivs3zki6i4bnvwcyr9sf6pay3yi17g9r4g3fxqc"; + version = "0.5.0"; + sha256 = "13az55a4hdpgrsfa4s4x2l40yjlfl01ypba3p1z36ckv70yqvmax"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Consumer Surveys SDK"; license = "unknown"; @@ -97797,8 +96574,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.4.0"; - sha256 = "1jx33ziy5lmdaxiipdd6hb3qzhy1zflc3jmzhjax9lsvla8j2krx"; + version = "0.5.0"; + sha256 = "06pjabcch02pknn8rqq2kl4zyb331v89iq3l6i279i5prqp8jkh2"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Kubernetes Engine SDK"; license = "unknown"; @@ -97809,8 +96586,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containeranalysis"; - version = "0.4.0"; - sha256 = "0hqkm4xjbw927pazvcawa87kfyzk7x97k3ic85q8a8zy2gc30vsg"; + version = "0.5.0"; + sha256 = "059nkdz6zb9ffi5731dfrppk2cv5mcvh84x8b30yhfp63vs083dp"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Container Analysis SDK"; license = "unknown"; @@ -97821,8 +96598,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.4.0"; - sha256 = "18ggnqngj564mbm3zm5ip8kpc1diwgvxbr51qz60jcymwlgrzk50"; + version = "0.5.0"; + sha256 = "04jrblg8z1sji9xg6qbypxkbwzidx76hwy2c9kdgchjj298xifcc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Build SDK"; license = "unknown"; @@ -97838,8 +96615,8 @@ self: { }: mkDerivation { pname = "gogol-core"; - version = "0.4.0"; - sha256 = "1bfmdhlf5l612mwln1may5l2vqlps2k8hhxsbkx8h4n1gblriic2"; + version = "0.5.0"; + sha256 = "0xvlrx4hzhwp3slinh8apnxlgxmispjjnmwsfbpi4p9n451ilx93"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -97856,8 +96633,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; - version = "0.4.0"; - sha256 = "1iq951qmm264w1lkq958fw90fcvzjsq4skz73kim4xvgiwr4q7kj"; + version = "0.5.0"; + sha256 = "1rfc932v4pwffry7864in7q9g68xzqz2sharzwfn8ql04la88fg7"; libraryHaskellDepends = [ base gogol-core ]; description = "Google CustomSearch SDK"; license = "unknown"; @@ -97868,20 +96645,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; - version = "0.4.0"; - sha256 = "0k2dlr938ilqbj56z5p75fs6yl8q6qbkfld7rbay1pnx9ss6yf67"; + version = "0.5.0"; + sha256 = "0k27idpz6n8gilpm5cb1yz6x6x89qlnpqg7jzpp4ipld1h4m6xp1"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Dataflow SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-datafusion" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-datafusion"; + version = "0.5.0"; + sha256 = "0g90fa6mdicv4fyv999vild0accvsd4kr7mj9b008b5f4x286wpn"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Data Fusion SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dataproc" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; - version = "0.4.0"; - sha256 = "0h3y503chr8srqjnk1hgvn4naayp09yvp0gf9np8da9mdxwk98c6"; + version = "0.5.0"; + sha256 = "0v1h6621v0aj415c8d11rfgri40vh3d1h3wl5i40nnz81qa11d5j"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Dataproc SDK"; license = "unknown"; @@ -97892,8 +96681,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; - version = "0.4.0"; - sha256 = "018qjg7vwspd86fdzxsag732d1x81yag6h8bw5arq38cq50ak3fx"; + version = "0.5.0"; + sha256 = "17raqp9la38r2jbx5438hxi12blkckzfdgmfvnw05isdwnz1azjl"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Datastore SDK"; license = "unknown"; @@ -97904,8 +96693,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.4.0"; - sha256 = "1q3nsda0w6zkl0j49l1ry6mr030b65mzf6hylny1gxxdy2mypq3l"; + version = "0.5.0"; + sha256 = "0a29kcihp90s6zvc8f9733rylsnf6098vkvqx7nsrg78x7qcz48p"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Debugger SDK"; license = "unknown"; @@ -97916,8 +96705,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; - version = "0.4.0"; - sha256 = "123m18nqjfgdmgrbl6b6kwppnq16bd7i3gn7mjdlrk6dm6wh84j0"; + version = "0.5.0"; + sha256 = "0l52j1vlnhm5dnz9jfld2rixs511l567gw7dbd2ylnx77632fvsw"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; @@ -97928,8 +96717,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; - version = "0.4.0"; - sha256 = "0jsv73zmdkm1lz0kk41yqayy07cfz4c2xn7q3vlg85ksv7jnn5ha"; + version = "0.5.0"; + sha256 = "0s7s5cm7kdigx1212abzyv69p4gzpx4dkxvycip60p27chsiv47p"; libraryHaskellDepends = [ base gogol-core ]; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; @@ -97940,8 +96729,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dialogflow"; - version = "0.4.0"; - sha256 = "1qma0gilizalyrwafw7rvpqmyc5vcsg4pds6f089qhxm42jwcmlk"; + version = "0.5.0"; + sha256 = "02q9qj713gz75gzdvqlladddniyk0waf2gbfqnh7dyirn8l67k6a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Dialogflow SDK"; license = "unknown"; @@ -97952,8 +96741,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-digitalassetlinks"; - version = "0.4.0"; - sha256 = "1lvgk9ba0l5i39zvswqbmwhhpsq0bijis6gp6n9wq30bgzf9a8vq"; + version = "0.5.0"; + sha256 = "04mfan610hzi9ar7rpmdwn4hw2m4v4n5hfz00si648vx6grn3835"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Digital Asset Links SDK"; license = "unknown"; @@ -97964,10 +96753,10 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; - version = "0.4.0"; - sha256 = "1nvhmh95k1z9q4s1lfv078dlv33lm1qkwq5hkd0nysqaibfgql5x"; + version = "0.5.0"; + sha256 = "14igx8cs86v88vfvdw3fr090yk3f5dnpiggai1w2xnshbvg3gfdd"; libraryHaskellDepends = [ base gogol-core ]; - description = "Google APIs Discovery Service SDK"; + description = "Google API Discovery Service SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -97976,8 +96765,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dlp"; - version = "0.4.0"; - sha256 = "1hbd1bld98k7am5gr0569vsdzgd9w95nx3z40lhbr23f6fybv3w7"; + version = "0.5.0"; + sha256 = "0wd5l1bjiaw5cp78ppz81ab3cb9dpgjw5iy3hz9cg0y6y8x6smm5"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Data Loss Prevention (DLP) SDK"; license = "unknown"; @@ -97988,20 +96777,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; - version = "0.4.0"; - sha256 = "1y0n41pq031kcphpxvr4fzrvdgy4imfmkb5frazgb3acx874pqwc"; + version = "0.5.0"; + sha256 = "0wzlbpkaqd94dkgbg5nqss9kbyx2lqk0jbd97l9jmka1pmm0c30a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud DNS SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-docs" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-docs"; + version = "0.5.0"; + sha256 = "1ig79q8iwfmyrjy7jb27fcdd05zjgpi0aikw597gkjj9vga5jzms"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Docs SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-doubleclick-bids" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.4.0"; - sha256 = "1f1x12gcab5lz1yig3p7b9fxdwr1mj4c5r7w1c97awg4wa4qyv61"; + version = "0.5.0"; + sha256 = "1jk725c2viyvbi4i12zlvwnz855jnpjjfc9qp5rbbfkkyf8904n3"; libraryHaskellDepends = [ base gogol-core ]; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; @@ -98012,8 +96813,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; - version = "0.4.0"; - sha256 = "0mzwg6njbdvn0y3qqnal919gsj5fi8fcdsn6f438dfg481g93igk"; + version = "0.5.0"; + sha256 = "1kd0x3xb365r30gaz74wksny20dp96ynr9xvds2z4jnmabhlc1fx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google DoubleClick Search SDK"; license = "unknown"; @@ -98024,8 +96825,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; - version = "0.4.0"; - sha256 = "1k2ndnqrnc1y5ymic1g6jpigg2vg3k6y1j3mm413zh5p7lvx4ngy"; + version = "0.5.0"; + sha256 = "0qbdchfni89h0l28db37dl5ysjlzckby59ng7026xhjkk5c8iyrl"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive SDK"; license = "unknown"; @@ -98036,20 +96837,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-driveactivity"; - version = "0.4.0"; - sha256 = "0d4mbp7jryma7lr63cy819986q3plc4cgqfn217gydq7ajdzpqds"; + version = "0.5.0"; + sha256 = "1n2frzhrz1rfbxm6lcxyd13q99wwlyp7c6n4pjy87skvd332xqsg"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Drive Activity SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-factchecktools" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-factchecktools"; + version = "0.5.0"; + sha256 = "1bga1plk1v57v6lpyk292ia0fzxks6lj0jq9d5gqz7k22yaqwzl5"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Fact Check Tools SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-file" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-file"; - version = "0.4.0"; - sha256 = "161xmzxsjynnfd51df7q553bmdzgmyvddd2dn84b3hc82n3xj4km"; + version = "0.5.0"; + sha256 = "1k0mc2vavnfpxx6h878iib3a15bp2h2mx7wq9pa3527syh5d424p"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Filestore SDK"; license = "unknown"; @@ -98060,8 +96873,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-dynamiclinks"; - version = "0.4.0"; - sha256 = "0qckmvkrgwa79c0zg1dlr0ihz666yfg2kilanjir0yylax2w87lb"; + version = "0.5.0"; + sha256 = "1hbknisl0358iznc45hhjixhdb3kh2b5chxiyq028ayl5w1p4rvn"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; @@ -98072,8 +96885,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; - version = "0.4.0"; - sha256 = "0j8wd8vwbpiwkhijrlh9d4c004sqy0m99qxz9sv23nakmnmq04d0"; + version = "0.5.0"; + sha256 = "06779qj9vjhvzw0d60ddxlzmij7sjjv67npav670xkgs3q71b655"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Rules SDK"; license = "unknown"; @@ -98084,8 +96897,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebasehosting"; - version = "0.4.0"; - sha256 = "1g05b90fpyl2wqi3w0w6zp4qmzc82j4qvlja0ra5vnid129l5ll2"; + version = "0.5.0"; + sha256 = "0h2k4ymqn0r5vpgqb1pzcydmcwx2s0x4yim5j47b963qqwrwb7yc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Hosting SDK"; license = "unknown"; @@ -98096,8 +96909,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebaseremoteconfig"; - version = "0.4.0"; - sha256 = "0x6k93d8gdff2byjwk47z84rmdbsr676nml1638mvq6vwx1d4zv1"; + version = "0.5.0"; + sha256 = "1qpv689lrizcv308303ajzjvkh9z4hs256ibnmlk0835xzwcw1qc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Firebase Remote Config SDK"; license = "unknown"; @@ -98108,8 +96921,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firestore"; - version = "0.4.0"; - sha256 = "07x7ksyx91wisah8lmmq3p4cln1wx1wzbyc2cwb5wp0n78r83hdh"; + version = "0.5.0"; + sha256 = "13y9g4h21mis26x663pv9lhi9i3r4s6x4pcnnwsk20a0s83k8x2k"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Firestore SDK"; license = "unknown"; @@ -98120,8 +96933,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; - version = "0.4.0"; - sha256 = "0170r4pph2pfsp4phfq8sjj63cz6sn5nwlqsv8810zli4ghzrcsa"; + version = "0.5.0"; + sha256 = "0pbz6kjkrwcb1mz83gfmyf1mcdp6lsbdp450h79083xlpbwz0kwx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Fitness SDK"; license = "unknown"; @@ -98132,8 +96945,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; - version = "0.4.0"; - sha256 = "11cjwnil31sskinfzfgqcq1p5d8c7gzackba5ap5kydvs9l7k6hf"; + version = "0.5.0"; + sha256 = "0cgkdgvs65znknf1dpdr2jxn3wan705i89bwfzfwavwykacsjqbk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Fonts Developer SDK"; license = "unknown"; @@ -98156,8 +96969,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.4.0"; - sha256 = "0rb3h779wy1rw1hh0y1sdvz8wg31dbsa0980wbj12jlna13qaw82"; + version = "0.5.0"; + sha256 = "1bi9cjm7xn5dq74a7r5y95snbfjwljmfjl5pxfh2cjshpjgdpd67"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Fusion Tables SDK"; license = "unknown"; @@ -98168,8 +96981,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; - version = "0.4.0"; - sha256 = "0asy79mx2aixh9fylzczr0d8wghzgkhf1xvssmc65w41gdw9w2gg"; + version = "0.5.0"; + sha256 = "0kdqw6l1fr37amhd830lyqrh87znbbbs2lxh7cbqr831gwj4qnpk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services SDK"; license = "unknown"; @@ -98180,8 +96993,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; - version = "0.4.0"; - sha256 = "08g29wc9x872mq2179r9sq8sy7b8mbl4q2ak0z9wcknckn6ziq0c"; + version = "0.5.0"; + sha256 = "0j2psg58f6ilvnvdq88vmq1b462dpfssij1pa6y5xmm62gvvv6i5"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services Publishing SDK"; license = "unknown"; @@ -98192,8 +97005,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; - version = "0.4.0"; - sha256 = "1j43bfb0b4xmbjhzh732mncwqlz0j0vfx032kscfy4sx9hbb2kva"; + version = "0.5.0"; + sha256 = "0bnkv9vic8rly2ga4k73s8cnhvird3kv5nmy17560pw4q40a5d9n"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Game Services Management SDK"; license = "unknown"; @@ -98204,8 +97017,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; - version = "0.4.0"; - sha256 = "1n0iqmfryqzslhq14h7sg2fxis8wbl0lkxbmcb6v51yi3cbp3ckv"; + version = "0.5.0"; + sha256 = "0cygvkm388g0scmy51b2dmkj6kzpcdwpxd0w98dfmwhgvln3xgl2"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Genomics SDK"; license = "unknown"; @@ -98216,8 +97029,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; - version = "0.4.0"; - sha256 = "0fwayrrd510jm1qvsnqckar3hhvq7s2sbpzqxkj4hpgh221rmi7f"; + version = "0.5.0"; + sha256 = "053l0k1h2wmwgqzywswhhmwh2275n6psiy8bk684dkzvdj1msbkz"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Gmail SDK"; license = "unknown"; @@ -98228,8 +97041,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; - version = "0.4.0"; - sha256 = "1d3r5qkcj9370ykg54lcfh0qmj5fs0al6k8zdjpqybr1rpfb2pnn"; + version = "0.5.0"; + sha256 = "1sbmnq1ivy8dcgngfprd7g5g08fvzgwhr5hrixg4gmw95hwplafi"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Groups Migration SDK"; license = "unknown"; @@ -98240,20 +97053,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.4.0"; - sha256 = "0z7ljg2k99n0rmgy85sp1wqvmybl48y2cv91p5b2kz9jrn3bvg60"; + version = "0.5.0"; + sha256 = "0l1bwgwic8q252idfv8d6jamfqfghwxq4jkaan3dwwlgjc2b6b3a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Groups Settings SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-healthcare" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-healthcare"; + version = "0.5.0"; + sha256 = "1ny184rhkjs571ibnwznxhc8zxqc2bag7z0lj922v53js4bvbrld"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Healthcare SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-iam" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iam"; - version = "0.4.0"; - sha256 = "04r8igvai15rh61pskg6pa4zgrl5ik0v4xk3kqqp8z9i927h1k1d"; + version = "0.5.0"; + sha256 = "1hxzg3v9b8va2s76q3jizz84vfjnjrckv5ysy9193dv6yk68h48p"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; @@ -98264,8 +97089,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iamcredentials"; - version = "0.4.0"; - sha256 = "0a5mx6fxp6k675bhysdpr2lg2i02y7x8a9w06gqqy77wa7p7a1jj"; + version = "0.5.0"; + sha256 = "021x1rgmws8r2mj1ji6wpj8lspn70m1pzal6zmj3j8cbgmvbzgra"; libraryHaskellDepends = [ base gogol-core ]; description = "Google IAM Service Account Credentials SDK"; license = "unknown"; @@ -98276,8 +97101,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iap"; - version = "0.4.0"; - sha256 = "0ri312mp793ki23bp5kdlhpww2xj56p3zh5j865jvbsphm0jccvz"; + version = "0.5.0"; + sha256 = "04cph84f8h7qcg8jmz442qciq81ra2yw3jrffy8apyhy78x8zxlc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Identity-Aware Proxy SDK"; license = "unknown"; @@ -98288,8 +97113,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; - version = "0.4.0"; - sha256 = "0sw4ddfbd9x3h2w76y7r3l1rjmqdw1zv1haacsi21ipv1ic5jgf3"; + version = "0.5.0"; + sha256 = "12yqcxcqvmlcrjla1qx6j78dk5qnfa8mia4nv1rr9y728w0k2ski"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Identity Toolkit SDK"; license = "unknown"; @@ -98300,8 +97125,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-indexing"; - version = "0.4.0"; - sha256 = "0l3g0lyldf6m83jzrpk3h0jvz6h6w9jah2ink9p7d9pszjvnwwq5"; + version = "0.5.0"; + sha256 = "1vyxrl7abwkz1mc08id08ncm9f1qgpkwc9mriyx3hlr9cvdj2fb0"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Indexing SDK"; license = "unknown"; @@ -98312,8 +97137,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-jobs"; - version = "0.4.0"; - sha256 = "0d0mr7fmikxkwxws77cnsf2mvs2g6lsa993bbxlzn2qpal9h9qrs"; + version = "0.5.0"; + sha256 = "1azggfjas13dqhl9kzqpr8bvks1gbjg1q7ia64ssxdj19mx1d5ii"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Talent Solution SDK"; license = "unknown"; @@ -98324,8 +97149,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; - version = "0.4.0"; - sha256 = "080391qg2vzw8ana00azdwjdrkwx0k7a1n0l341dgmdqcj0w02rh"; + version = "0.5.0"; + sha256 = "0ynll6mm551x0jbx6bar5p97hy29g6nfq9mshlapmv82n9i2qqk4"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Knowledge Graph Search SDK"; license = "unknown"; @@ -98336,8 +97161,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-language"; - version = "0.4.0"; - sha256 = "0j0z2x4h3db2gr1pham390xx66rili6yi68slr9hydfj5brm9129"; + version = "0.5.0"; + sha256 = "0hw181ha949q97yyg35yvwwshign43wxb2xkg482g4fq86b2iy3h"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Natural Language SDK"; license = "unknown"; @@ -98360,8 +97185,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-libraryagent"; - version = "0.4.0"; - sha256 = "0b90mvy1wj6dv6403wvm5qh0qdzfdf3ck9h8cd0bvf95iraknxly"; + version = "0.5.0"; + sha256 = "1jk46i3a9z5i1451gyjzmqahcjg3r1w03y2x64dfpc309zwivaar"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Library Agent SDK"; license = "unknown"; @@ -98372,8 +97197,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; - version = "0.4.0"; - sha256 = "1ln3m7n0lksjd8sbdy3dvnrixq0gv86jh643chnpdif24yradkqp"; + version = "0.5.0"; + sha256 = "0795dsyq28w3kgw3f96w99ax6v24lbahmr0mvyql1cx4z2slqp82"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Logging SDK"; license = "unknown"; @@ -98384,8 +97209,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-manufacturers"; - version = "0.4.0"; - sha256 = "0qar60zzbnpnpy1154ccynwn2k0sdkmrvxvlscjswsqhgdpbrziw"; + version = "0.5.0"; + sha256 = "1l7dpp39yszay5aykiq81qi1f7l3fyz2s8zskyl37lvb46mv9ywr"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Manufacturer Center SDK"; license = "unknown"; @@ -98420,8 +97245,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; - version = "0.4.0"; - sha256 = "1vfwziz3jyhz7k96hdrrlvndxnnvqysl9bg0ipcss2h2aiha5yd0"; + version = "0.5.0"; + sha256 = "1nb7wydv7z5ip7jnj1928kfk57sk67ng3dhz9hq136lajl0lqy4r"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Mirror SDK"; license = "unknown"; @@ -98432,8 +97257,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-ml"; - version = "0.4.0"; - sha256 = "198hid538lxwav21r0pxkb57rlb6wzzgyjfylc20m02p72790858"; + version = "0.5.0"; + sha256 = "01n7jhi8p0db7dhbjm7ll3r6yqw0cfi6l48r1ms0kcrscdfij93v"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Machine Learning Engine SDK"; license = "unknown"; @@ -98444,8 +97269,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; - version = "0.4.0"; - sha256 = "0k0fxnym1xg0jvvssys76xvdx39jicd6cd507qg47izww0vzv618"; + version = "0.5.0"; + sha256 = "1754cssjhcfxn6g71vvq7jspgbwqn2a1821lhhn2ybhq8ngiay8i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Stackdriver Monitoring SDK"; license = "unknown"; @@ -98456,8 +97281,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; - version = "0.4.0"; - sha256 = "07vjw6xwbrvihwhsy7v28gw9ww71skvscc0h21lgdibhksza2mzb"; + version = "0.5.0"; + sha256 = "0pnwmm0vn0hcdnww13b65ii5wapy8638svkf3srh2ap161ijf443"; libraryHaskellDepends = [ base gogol-core ]; description = "Google OAuth2 SDK"; license = "unknown"; @@ -98468,8 +97293,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oslogin"; - version = "0.4.0"; - sha256 = "0k8g6lmclzhccdz5zyb4pnzv71d9cn429gi6px1jrls3w0ai8jih"; + version = "0.5.0"; + sha256 = "02gzg06qlli84wvq6cr1xch8qxk70r5kgs5hqaqfqsr7rg79vfvd"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud OS Login SDK"; license = "unknown"; @@ -98480,8 +97305,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; - version = "0.4.0"; - sha256 = "0jgkvkpk1lw7jcjc04n8p4dw7m1by4jzi6i0c3r72sjiflmvxds3"; + version = "0.5.0"; + sha256 = "116diwib3xi34znhl9b2hx3y4m3nqyqfkry0zh2aqknrxx3mpyl7"; libraryHaskellDepends = [ base gogol-core ]; description = "Google PageSpeed Insights SDK"; license = "unknown"; @@ -98492,8 +97317,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.4.0"; - sha256 = "1035fn0ifypfv69ks9z1c960g28vkwkcfix1d01cmkmzn4a0m0wa"; + version = "0.5.0"; + sha256 = "12wfzjf3hvwba4ccnymxrqwk2hzi1zcw5h53iqk33yscx6s30jzm"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Partners SDK"; license = "unknown"; @@ -98504,8 +97329,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; - version = "0.4.0"; - sha256 = "1x5vz0i722fj6ps7ggmjb2xnxbbyrln2s3940w575gb79c0lfji3"; + version = "0.5.0"; + sha256 = "01msa1r6p96kgz9isnnqy6ndsrh579c25m9sw43azsij8l1dd43j"; libraryHaskellDepends = [ base gogol-core ]; description = "Google People SDK"; license = "unknown"; @@ -98528,8 +97353,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; - version = "0.4.0"; - sha256 = "0wrhx81pph7yw0a613k66l1p9h21y9vadi3ax8ah5ciy1vxnymh8"; + version = "0.5.0"; + sha256 = "0cjkikknkk4la3nlw8mn1r0xdq871sd9wakyvsznm9wjqrzysn97"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Movies Partner SDK"; license = "unknown"; @@ -98540,8 +97365,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-playcustomapp"; - version = "0.4.0"; - sha256 = "1hb0498mm8fxl93bwjr633yi371kib27nrd7ba3nylrnv21bxp8k"; + version = "0.5.0"; + sha256 = "0dfiwncjngfaj5i3sf38q3qkrlggvpiw9d08xpwr5rbcbi9qp43i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Play Custom App Publishing SDK"; license = "unknown"; @@ -98552,8 +97377,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; - version = "0.4.0"; - sha256 = "0n546pnmvsfjp32xy2xcqlns1f06ipx0ll0kiblsalrq16gd2bcr"; + version = "0.5.0"; + sha256 = "00njgd754pzyss5n3ilnaqr1qd1f4rfz1q9m4x1a3g73fja1yzgh"; libraryHaskellDepends = [ base gogol-core ]; description = "Google + SDK"; license = "unknown"; @@ -98564,8 +97389,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.4.0"; - sha256 = "07nz7chwi9mls8i3h949p1ip7bfd39n61f1928x1ffik3kzrybpv"; + version = "0.5.0"; + sha256 = "1p3qdj0vjz01yrkdjxsikriy755028v4yhw1d27ypriqh7k5widk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google + Domains SDK"; license = "unknown"; @@ -98576,8 +97401,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-poly"; - version = "0.4.0"; - sha256 = "1ixidwaczgsys7pnj4pf67j61pa250nhvb9ip0fb9lb93l0ykijd"; + version = "0.5.0"; + sha256 = "1da600ahg4x5k8vsw37cr5wrqrz8sq3mhir874fk5xpf2kdqdmkp"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Poly SDK"; license = "unknown"; @@ -98588,8 +97413,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; - version = "0.4.0"; - sha256 = "06miyjhxvyp05nvdni56h4ldhs0ca3sl3n4nrx8fc6s2dam83q8b"; + version = "0.5.0"; + sha256 = "17dkm1wi5im1an1izcca2v432c2d86i74h6wlcyy92g7a86ajc2f"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Prediction SDK"; license = "unknown"; @@ -98600,8 +97425,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.4.0"; - sha256 = "17gmd37mrg86afbx3rn4y4c48k8mi81dwrc4697rbhripviqf4fm"; + version = "0.5.0"; + sha256 = "1n49i32isjx3iljj035yc4y1lv3d01mpf15ab4ji49x01a0qfs5a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Proximity Beacon SDK"; license = "unknown"; @@ -98612,8 +97437,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; - version = "0.4.0"; - sha256 = "0cjdmfzhxk3rb55q2aza8vs0p1p51j1i5ypnafwcnhvx90910074"; + version = "0.5.0"; + sha256 = "1pfw3pz8yr7slbyhp9rf32brqck2l2a60lx3ysz4pjjmfc72rahz"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; @@ -98624,8 +97449,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; - version = "0.4.0"; - sha256 = "02p4jncgfcr8jbwldjyc2zn7p6nwbjccw8la1dy9dy2c863pvjrj"; + version = "0.5.0"; + sha256 = "1xqlqv680w1rr3sqzq5k8kk1xcxagh8zk5g6rqs83xjr1j5lfmsr"; libraryHaskellDepends = [ base gogol-core ]; description = "Google QPX Express SDK"; license = "unknown"; @@ -98636,8 +97461,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-redis"; - version = "0.4.0"; - sha256 = "1jka9qfnhsrg3i7d7adcigwimffp3w3fm65dvz905d5sk0fkja0j"; + version = "0.5.0"; + sha256 = "0x774h1pryr12s6ndcgdvbwqx1nw2sc8yln147hjf4mg3fva6gkc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Memorystore for Redis SDK"; license = "unknown"; @@ -98648,8 +97473,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-remotebuildexecution"; - version = "0.4.0"; - sha256 = "1p2llw3l79313hp3lmd2gvbfhxgyzw6g4yw08psi0zb3iqz5gqaj"; + version = "0.5.0"; + sha256 = "037biha22xv1ayb3zxx5dc7a86sbmr5zwmg1m24f3bbsgjfnn5ms"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Remote Build Execution SDK"; license = "unknown"; @@ -98660,8 +97485,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; - version = "0.4.0"; - sha256 = "1xdspcwbcfd48gf80i6dwnhllnbm4rh8c1wfk31gs52y5w3haxgd"; + version = "0.5.0"; + sha256 = "173ywr9vc69jf5s5vncwjby75mgfbfxw3m42jyi7dcyrxc4jbg68"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Replica Pool SDK"; license = "unknown"; @@ -98672,8 +97497,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; - version = "0.4.0"; - sha256 = "0xw7js7b1w633z56bq7lz4kw7m2gz7c4my3gc868s4xv4a4hzsga"; + version = "0.5.0"; + sha256 = "1wi8x5zj61daln96dqlhq8ki57kl2k6jjz4sm1lbqffcgq66743d"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; @@ -98684,8 +97509,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.4.0"; - sha256 = "04kvnzf20km94dx6znx3zravqi3khl3kws6y9rxwjivhiyim11dp"; + version = "0.5.0"; + sha256 = "1sd8zaigvpbq591nwsjyxf9jf9hxc00mjhwfc0i6mahbgax73764"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Resource Manager SDK"; license = "unknown"; @@ -98704,12 +97529,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-run" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-run"; + version = "0.5.0"; + sha256 = "0219vjrlpq16akzwsbk8kfh7p8gc8kkczcvg5a3l6lssxjp87lfg"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Run SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-runtimeconfig" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.4.0"; - sha256 = "16nykcs4iknqnyj3p1wdqvdb5sbmg0mqf1qvm291q3vsf9hsapjb"; + version = "0.5.0"; + sha256 = "057qlad1mipdyif8n6wmhwinknnf0qgb65wbw0484b2yzcdj3zd1"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Runtime Configuration SDK"; license = "unknown"; @@ -98720,8 +97557,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.4.0"; - sha256 = "1lw498y5dbb2yq9zigsw9cq5rkhzvvix94m4ir9d4ifa29xi9fmp"; + version = "0.5.0"; + sha256 = "0690xz81mz8gn0qgkg11y5sx57kjmvd4lryqw8rblrh7ixypn8wb"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Safe Browsing SDK"; license = "unknown"; @@ -98732,8 +97569,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; - version = "0.4.0"; - sha256 = "08w8xln6wcvcp911vmfaixzgwfmg4jxazprkyrr8mwg4l45nr15s"; + version = "0.5.0"; + sha256 = "1ckjj9i8fqd3igz7bnjmri5pgj3risqarcivrr3nmd1d045rx1zx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Apps Script SDK"; license = "unknown"; @@ -98744,20 +97581,32 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-searchconsole"; - version = "0.4.0"; - sha256 = "1m49h2kcs2xkxk5hy3kvyi2s3wfylkdwkfh8ckkv0nfcjxz0nxvx"; + version = "0.5.0"; + sha256 = "0k971p9c4yhscnxxfhxlb5wnkzjxd2k9q8qnxlbnvp7ch7z1yv00"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Search Console URL Testing Tools SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-securitycenter" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-securitycenter"; + version = "0.5.0"; + sha256 = "1axvvz60vdvjpd9bd0516fhbqnk8cjb3x52sgf42fq00dhwxy3mj"; + libraryHaskellDepends = [ base gogol-core ]; + description = "Google Cloud Security Command Center SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-servicebroker" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicebroker"; - version = "0.4.0"; - sha256 = "15cd8hscgddwzafjcl5zj47qbv5pfs5x44h3h39315xyabps3l01"; + version = "0.5.0"; + sha256 = "13726hq8c3g7gqwz2zrzx0k6vywv5ggd6bl90kkw09118zvyc13a"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Broker SDK"; license = "unknown"; @@ -98768,8 +97617,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-serviceconsumermanagement"; - version = "0.4.0"; - sha256 = "0mql8dlw07dmqrs98yb7wpgpz2dsa4y6npp9brakxpglnhqnncgi"; + version = "0.5.0"; + sha256 = "1pln47lpr1wb9w84z8lmskbn49456k9h4awi67mdfg10jzh4n46j"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Consumer Management SDK"; license = "unknown"; @@ -98780,8 +97629,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicecontrol"; - version = "0.4.0"; - sha256 = "08xy568njzlpgs7crrxizv0nv2j9jrm3f28mv2zc3pvpi6hvf6in"; + version = "0.5.0"; + sha256 = "01vfjg16x6vpabvb1q2ipnv04j7r7fxxvcbjgq08phq0fnnk8sd1"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Control SDK"; license = "unknown"; @@ -98792,8 +97641,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicemanagement"; - version = "0.4.0"; - sha256 = "1z9km7g6550kpwb9g0x43960xra2p0zaqc5kiy0pxzg84spwx300"; + version = "0.5.0"; + sha256 = "0bzcv7z5n2ykkydq4wc5ka11cc82y17x4rb26k3hbsak62qx67j2"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Management SDK"; license = "unknown"; @@ -98804,8 +97653,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicenetworking"; - version = "0.4.0"; - sha256 = "15f09ixf7lw0knb3vclj27fp8y7x818rhpkdvs2a22crsk7wai31"; + version = "0.5.0"; + sha256 = "1aja2maxgjhxgqf6agngbx37w02ifb1b5ypnqdwwpi1615qxvrsh"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Networking SDK"; license = "unknown"; @@ -98816,8 +97665,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-serviceusage"; - version = "0.4.0"; - sha256 = "1dc56jlz9qyq3x2acpgb55hjdxdgq73bgik9yc57h0cr237g46pp"; + version = "0.5.0"; + sha256 = "0zvnd7pl5q73kzdx2x19zrw0rk334l8xlqawlbl5p1zimvvsbpkl"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service Usage SDK"; license = "unknown"; @@ -98828,8 +97677,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-serviceuser"; - version = "0.4.0"; - sha256 = "04akaaw9in2s1q4mf6w7isg3p8ck5mg904lanmidbsz01x70mflq"; + version = "0.5.0"; + sha256 = "1xfgp5nm23c8hjzkjamk4qc6qs5j4q3z5pxrlsbnir7lqv73jnwf"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Service User SDK"; license = "unknown"; @@ -98840,8 +97689,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; - version = "0.4.0"; - sha256 = "12v7lrp6b0jiv7rcicxw7p9b7jr768wamhddvglib98ravcjr5n3"; + version = "0.5.0"; + sha256 = "0wl00f6p5qylbffhm3jw0123aqfc3acls91150nj3ncfl55q0g28"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Sheets SDK"; license = "unknown"; @@ -98852,8 +97701,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; - version = "0.4.0"; - sha256 = "1pkh3f7yjh9g1crqkxpxl6fac4ca9rlnf6d4v2nhmjrjr8spwrmr"; + version = "0.5.0"; + sha256 = "0b7i6vc5cw1sigvkpn8k1q8k06alx36h7fw520swhyk2p3v5shmh"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Content API for Shopping SDK"; license = "unknown"; @@ -98864,8 +97713,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; - version = "0.4.0"; - sha256 = "1z4f8lmw5pgzj5h6pdayrgs83yhxbslkhp2c69ykl4n85qzsrdvk"; + version = "0.5.0"; + sha256 = "0lapqji0cwf0gqp4855wqg8h1xd61bncya5b7b25lnqlld7gnp9w"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Site Verification SDK"; license = "unknown"; @@ -98876,8 +97725,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-slides"; - version = "0.4.0"; - sha256 = "0br96z0lvdqbbd4jr9qjisjx83a8w76hrqs68pxiyrpkdkq5vd81"; + version = "0.5.0"; + sha256 = "0b76hx0bllbpb25d59pqlz0clcv34pkw8rpd7g7g1916sqrsd7dx"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Slides SDK"; license = "unknown"; @@ -98888,8 +97737,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sourcerepo"; - version = "0.4.0"; - sha256 = "1r57m08ggz8j9r6wya7wkhvnb8answ7mkvm9vsw7sp6vh6bfqn30"; + version = "0.5.0"; + sha256 = "0j3hcc9fq2aksx1nrvrb0g6xwv86a4n8l2vfgyyzji3gknbqx9ff"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Source Repositories SDK"; license = "unknown"; @@ -98900,8 +97749,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spanner"; - version = "0.4.0"; - sha256 = "1zk0078ig63rmqdxm02bw4x8a4a0dmlqw8f3cmay0w85991m0kkz"; + version = "0.5.0"; + sha256 = "0z9aycaqp3rb798mcrmrni9jfa8r9j2gjgmlxjx9icg9wh4bs5h4"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Spanner SDK"; license = "unknown"; @@ -98912,8 +97761,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; - version = "0.4.0"; - sha256 = "1x8z4h7g7a60pkdb4j7j85i0wvn4vpi3zjm2g0m91gzghgwankx0"; + version = "0.5.0"; + sha256 = "12h0rgnldgjf6qkvjbjsjcbw9vn3wlbs02baybyf70hmp58n8f0k"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Spectrum Database SDK"; license = "unknown"; @@ -98924,10 +97773,10 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-speech"; - version = "0.4.0"; - sha256 = "1syq64vrdbvyi3ch4ppz2aczf37nc0whns00hv8rg7v2w6mwa3kf"; + version = "0.5.0"; + sha256 = "1snmajsca1fdq1c98f1pqvghlwgff6vsmz47wvwsjjjqz15nx9j1"; libraryHaskellDepends = [ base gogol-core ]; - description = "Google Cloud Speech SDK"; + description = "Google Cloud Speech-to-Text SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -98936,8 +97785,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; - version = "0.4.0"; - sha256 = "1vqwylh42bi1rz8fykrpkdfsy06d901mnz5k8bikbq3fv5hc853m"; + version = "0.5.0"; + sha256 = "0yyamr3mgwg1gxy1w258gg6gvzcymmqmknkabgxp2p5kkqsyqgv1"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud SQL Admin SDK"; license = "unknown"; @@ -98948,8 +97797,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.4.0"; - sha256 = "1cn41jzrwxyxwmb96wgb42pbslhh3rnydnyc6yvi37n6ngp49gab"; + version = "0.5.0"; + sha256 = "0jsmgb311iinbmj12chbch3z0d56k9vqqvhjzfcilx05m1pm9xan"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Storage JSON SDK"; license = "unknown"; @@ -98960,8 +97809,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.4.0"; - sha256 = "0vdqqlv0c45k0xp1plxj8jzrb5xbkj258v7q50zi1jijv0rqnj2i"; + version = "0.5.0"; + sha256 = "1zlfszkh59p4pca2n2scxa02ln4va6k5vjz41186350lfxqwba4r"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Storage Transfer SDK"; license = "unknown"; @@ -98972,8 +97821,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-streetviewpublish"; - version = "0.4.0"; - sha256 = "0gyxs1kawqvbz851hd587zw999vbggv0z4hc5glc3saskl41nvpf"; + version = "0.5.0"; + sha256 = "07w3s049sglcvh8s94kbhj8l3irscji9s14bl493p7bwj1n3dbsb"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Street View Publish SDK"; license = "unknown"; @@ -98984,8 +97833,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-surveys"; - version = "0.4.0"; - sha256 = "1x15hdm3p7zfqadb5xnms0d6cp1gg1kk0xc81zls4hg6ryzpw43k"; + version = "0.5.0"; + sha256 = "0p9qkqxddgv8m24h2g58hiwhcpwndxl9r9gifjgpbh4mlcsx42q1"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Surveys SDK"; license = "unknown"; @@ -98996,8 +97845,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; - version = "0.4.0"; - sha256 = "0faihzsl4i4h7ns618c1dsih9a9xplvpixmnivpxyq4z18c7mzip"; + version = "0.5.0"; + sha256 = "116wc01i63q519bbqdi7ln12cvbfdsf6jdfbxrmz7zrzj4zw27l5"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Tag Manager SDK"; license = "unknown"; @@ -99020,8 +97869,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-testing"; - version = "0.4.0"; - sha256 = "1qfv2qi7l2dqv7bqj1ajbmpi77a4gcr2hywjyk2s3ixyv8m97j8g"; + version = "0.5.0"; + sha256 = "1fawwvbcy51ri9szfiknkrqvhapdhfw2qpbvdf10mjn5jpiqmj39"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Testing SDK"; license = "unknown"; @@ -99032,8 +97881,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-texttospeech"; - version = "0.4.0"; - sha256 = "18jxvrfr90jza5k75bmnf8g2z06z5m7c14hjshi39vf8x45sh8bv"; + version = "0.5.0"; + sha256 = "0na9qf1307lg9bf23pd20wic530hy8hdqy95g65gdjz9g2969flk"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Text-to-Speech SDK"; license = "unknown"; @@ -99044,8 +97893,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-toolresults"; - version = "0.4.0"; - sha256 = "1kh3vyzgg21sy4pl9gxx06g2pvyd4n6b6m0slq0wi160zhwnbm3b"; + version = "0.5.0"; + sha256 = "1m84mv6nbbf142ss1dgk91qhciy9wlfshf3hybb364wxqf4bkq93"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Tool Results SDK"; license = "unknown"; @@ -99056,8 +97905,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tpu"; - version = "0.4.0"; - sha256 = "0wf8arqp75rzs862s9b6jg9s2g39kmrw60mgx1n5fn13vj88i931"; + version = "0.5.0"; + sha256 = "1w6qcqz13sgk05i49nkx6pkxgsyc8pxy0rjyqlbribiwy30isxv3"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud TPU SDK"; license = "unknown"; @@ -99068,8 +97917,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tracing"; - version = "0.4.0"; - sha256 = "10k5fr7m8m60z5bd87y54j68kq09ybh95mnaw5fzy44xr3w7jbwy"; + version = "0.5.0"; + sha256 = "12f84mhfyckic7kq92xyry4xfipic50znzm4q37vphjfsv9m9r4i"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Tracing SDK"; license = "unknown"; @@ -99080,8 +97929,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; - version = "0.4.0"; - sha256 = "0vkls4digsig95d54fzc6s222h9zvyqrivnyksyir6d897awfagn"; + version = "0.5.0"; + sha256 = "1ida8wkwp0fqvzsnbd99c842b6a3bcg5nw84aicffn95vwbl9rma"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Translation SDK"; license = "unknown"; @@ -99092,8 +97941,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; - version = "0.4.0"; - sha256 = "05in4ydrjd9xjijb1mvzyn1z2caijg1jyby3lmd11i8bmwdjllq3"; + version = "0.5.0"; + sha256 = "0a5fxcrmwjncxz6l9mhgj44i8lk8rnbgqacvkdmmhylc0yh3al2l"; libraryHaskellDepends = [ base gogol-core ]; description = "Google URL Shortener SDK"; license = "unknown"; @@ -99116,8 +97965,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vault"; - version = "0.4.0"; - sha256 = "16jrgigvhcl05fykxfh6qa4zdbibdf9rhig2i367h121k28l56lw"; + version = "0.5.0"; + sha256 = "1dzk79y10396qq6l3y7zs9jm5rga02yxvdhp8dm7af9lb3izmjnc"; libraryHaskellDepends = [ base gogol-core ]; description = "Google G Suite Vault SDK"; license = "unknown"; @@ -99128,8 +97977,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-videointelligence"; - version = "0.4.0"; - sha256 = "0xpayfcxcaq3lgbnr1q5yl8nx635kly6y1cdc18dq9a7y79fhxzb"; + version = "0.5.0"; + sha256 = "16jczzbvk4ww8li0yyk6clx4l2b28g48pxsckic9sdsqy5xj709c"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Video Intelligence SDK"; license = "unknown"; @@ -99140,8 +97989,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.4.0"; - sha256 = "0w5jini2yhm33pa38mkqkw2lpxjrxal9q6h1dh6kmr2lh489lcb0"; + version = "0.5.0"; + sha256 = "1h71p2a35lwj3p8zw6mvzxas9yyw5diss0lyg2w2nqsx8cynh7rb"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Cloud Vision SDK"; license = "unknown"; @@ -99152,8 +98001,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; - version = "0.4.0"; - sha256 = "1ahjxr2m4x3bn5hjk7sygkpwnh7cy75cw7jap3p8qr9akqc5pb48"; + version = "0.5.0"; + sha256 = "029kbgzsbqyd8mbflkca8djmavmphddcldkjf8ds5jkp1qpqnnha"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Search Console SDK"; license = "unknown"; @@ -99164,8 +98013,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-websecurityscanner"; - version = "0.4.0"; - sha256 = "1z6dk8a538ljkba82k9x8jlvwb9qxhc1wfm5h9fgyhwa671fhj3y"; + version = "0.5.0"; + sha256 = "1mcr0cs8pnlbwwsmlwjmkclvcwdwzhg2zqw9bqljw3iism43m9dq"; libraryHaskellDepends = [ base gogol-core ]; description = "Google Web Security Scanner SDK"; license = "unknown"; @@ -99176,8 +98025,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; - version = "0.4.0"; - sha256 = "1vi8mmiagfq4i34q7hcw85mz02l7pjd9ri8g5vk62b8n1kki46lf"; + version = "0.5.0"; + sha256 = "0gamhcnhvxkybsnikwrlmin0fkf1h3fcflk4vg1zcm1sg7sk9xlj"; libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Data SDK"; license = "unknown"; @@ -99188,8 +98037,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; - version = "0.4.0"; - sha256 = "1hq2g199i8wpr7br21ijsryk2dgv5rr7zryv5xsrql04mqiwq9d0"; + version = "0.5.0"; + sha256 = "0fnrmabcw5kfl8s5nam6wl8qr6ri693wk6wlhvynj1skc54v6l4s"; libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Analytics SDK"; license = "unknown"; @@ -99200,8 +98049,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; - version = "0.4.0"; - sha256 = "060bha9j7fsyhbq94md5c26dg2xqfzsfkw0jmqv3shsbjd1k4993"; + version = "0.5.0"; + sha256 = "0cb88q2g67cx9zndf40a0c62cw7r32g1ps12a2ks0gz863bq53vn"; libraryHaskellDepends = [ base gogol-core ]; description = "Google YouTube Reporting SDK"; license = "unknown"; @@ -99344,6 +98193,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 +98324,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 +98637,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 +98814,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 +98828,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 +98850,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 +99484,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 +99530,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 +99542,8 @@ self: { ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-api" = callPackage @@ -100676,19 +99569,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 +100464,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 +100899,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 +100910,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 +101704,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 +101737,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -104586,6 +103427,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 +103461,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 @@ -105035,6 +103880,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 +103910,8 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-filestore" = callPackage @@ -105088,10 +103937,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 +103949,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 +103979,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 +103992,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 +104011,8 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -105880,37 +104735,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; @@ -106135,8 +104959,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.16"; - sha256 = "1m94q0bkhy88x0bm6jqbmiqx6fw05lcnd1iswzicj1cxbwiwfwbb"; + version = "2.4.0"; + sha256 = "1q4k8x6mwh9g7y5njcjd1xyn79yjnjv01nk4xa5q9yspmsa4685m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -106276,6 +105100,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 +105227,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 +105364,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 +105384,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 +105442,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 +105915,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 +106130,8 @@ self: { ]; description = "Hash as cache"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hash-tree" = callPackage @@ -107432,8 +106266,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 +106430,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 +107009,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 +107263,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 +107274,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 +107396,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 +107448,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 +107474,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 +107499,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 +107513,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 +107599,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 +107612,6 @@ self: { ]; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-neo4j-client" = callPackage @@ -109095,6 +107815,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 +107991,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 +108002,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 +108076,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 +109415,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 +109430,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 +109544,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 +110254,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 +110399,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 +110422,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 +110505,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 +110595,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 +110712,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 +110721,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 +111089,6 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haverer" = callPackage @@ -112549,32 +111175,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 +111191,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 +112272,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 +112548,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 +112621,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 +112644,6 @@ self: { ]; description = "Release with confidence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -114105,19 +112677,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 +112722,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 +112759,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 +112772,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 +112782,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 +112796,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 +113512,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 +114309,8 @@ self: { ]; description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfann" = callPackage @@ -116235,6 +114782,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 +114962,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 @@ -116571,8 +115118,8 @@ self: { }: mkDerivation { pname = "hierarchical-clustering"; - version = "0.4.6"; - sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm"; + version = "0.4.7"; + sha256 = "15fiqvhcd0i5l1w4s5liggfbdknasdpvyxd54qrjjdp41qb4d3qk"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; @@ -116617,7 +115164,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 +115173,12 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.4.1.1"; - sha256 = "0wi1yw0mhszalixay7sd1n7i8xjmb3m6v7h3kn09ih5vn3bxj26f"; + version = "0.4.1.3"; + sha256 = "1vhndwkny2sjh7c7m8qym6iasqacsaim0rkihdq3x58mdm2848n7"; 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 +115269,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 +115814,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 +115832,6 @@ self: { ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -117367,6 +115895,8 @@ self: { ]; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinvaders" = callPackage @@ -117962,8 +116492,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 +116518,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 +116585,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hkt" = callPackage @@ -118225,6 +116753,8 @@ self: { pname = "hledger-api"; version = "1.14"; sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; + revision = "1"; + editedCabalFile = "05jlbpp4p45q8bd3152l0fm4xz9yvz07ip2cd0kplzvwnmy8sfrg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118235,6 +116765,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 +117167,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 +117326,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 +117336,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -118834,8 +117346,8 @@ self: { }: mkDerivation { pname = "hmatrix-backprop"; - version = "0.1.2.5"; - sha256 = "1m6imvvcg8cjlqlcj2qhk5k0g88w853mw9r2mky54rmxfd86xfsf"; + version = "0.1.3.0"; + sha256 = "1nknwamc51f3d1syy1wi8fkvlx40riwi7x94yh34y0fzgddgjl2k"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl @@ -118846,6 +117358,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 +117599,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 @@ -119129,8 +117645,8 @@ self: { }: mkDerivation { pname = "hmatrix-vector-sized"; - version = "0.1.1.3"; - sha256 = "1p4222rq9xm8admm3811hgb32q1nin9y35bm4c121yhz6c0ic5cg"; + version = "0.1.2.0"; + sha256 = "0n9pylrxz0pkdlha1rqi2xabfjxpiya9kcyx6qlcqal1q57wh2bc"; libraryHaskellDepends = [ base hmatrix vector vector-sized ]; testHaskellDepends = [ base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized @@ -119442,6 +117958,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 +118024,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 +118076,8 @@ self: { ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnn" = callPackage @@ -119673,27 +118195,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.7"; - sha256 = "0x99dh6k6njhsab5vk9q9q4jd5l4yq4cb9c08shvsv0xghsnlh4z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_8_8" = 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 = [ @@ -119702,7 +118205,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -120737,6 +119239,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 +119904,8 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpaco" = callPackage @@ -121643,13 +120149,16 @@ self: { }: mkDerivation { pname = "hpdft"; - version = "0.1.0.4"; - sha256 = "1rxr2qfs6cvk0hyvvq7w0jsq8vjf8b84ay5jzfhqyk8qk73ppfji"; + version = "0.1.0.5"; + sha256 = "1wcbkxcfwnmfbwfa3dqlqgf825b00x0fvmp4fp3jfxs6s5dyi6lh"; + isLibrary = true; + isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers directory file-embed parsec text utf8-string zlib ]; + executableHaskellDepends = [ base bytestring utf8-string ]; description = "A tool for looking through PDF file using Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -121698,6 +120207,8 @@ self: { ]; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hplayground" = callPackage @@ -121855,6 +120366,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 +121892,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 +122590,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 +122604,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 +122668,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 +122678,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 +122726,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 +122735,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 ]; }) {}; @@ -124555,6 +123038,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsinspect" = callPackage + ({ mkDerivation, base, directory, ghc, ghc-boot, ghc-paths, time }: + mkDerivation { + pname = "hsinspect"; + version = "0.0.1"; + sha256 = "13z7dk42cnwdxfqnadis56m2wy0s5kyzw2dv55dnspd77hd5v28k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory ghc ghc-boot time ]; + executableHaskellDepends = [ + base directory ghc ghc-boot ghc-paths time + ]; + description = "Inspect Haskell source files"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "hsinstall" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process , safe-exceptions @@ -124764,6 +123263,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_0_3_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.0.3.2"; + sha256 = "183bgl5jcx5y2r94lviqfw0a5w9089nxjd1z40k8vx9y2h60pm6j"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions fail mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -125176,21 +123699,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 +123706,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -125253,33 +123760,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 +123777,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 +123802,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 +123814,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 +124032,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 +124040,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 +125210,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 +125798,8 @@ self: { ]; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htoml-megaparsec" = callPackage @@ -127380,6 +125824,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 +125949,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 +125970,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 +125994,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 +126010,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 +126145,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 +126331,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 +126413,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 +126582,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 +126595,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 +126632,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 +127055,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 +127068,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 +127451,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 +127649,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 +127816,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 +127936,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 +128063,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 +128174,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 +128190,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 +128204,14 @@ self: { }) {}; "hw-ip" = callPackage - ({ mkDerivation, appar, base, containers, generic-lens, hedgehog - , hspec, hw-bits, hw-hspec-hedgehog, iproute, text - }: - mkDerivation { - pname = "hw-ip"; - version = "2.0.1.0"; - sha256 = "1r1ck890id7x9b1dpp23h656mvh24bacxdbvxhgkdjiryklrjsqr"; - libraryHaskellDepends = [ - appar base containers generic-lens hw-bits iproute text - ]; - testHaskellDepends = [ - appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog - text - ]; - 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 ({ 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 +128234,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 +128504,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 +128524,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 +128607,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 +128627,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -130431,15 +128651,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 +128669,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 +129254,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 +130063,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 +130079,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -132257,6 +130445,8 @@ self: { testHaskellDepends = [ base ]; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ide-backend" = callPackage @@ -132604,8 +130794,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -133407,8 +131595,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 +131847,8 @@ self: { doHaddock = false; description = "Framework for defaulting superclasses"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "implicit" = callPackage @@ -133946,12 +132134,16 @@ self: { }) {}; "incremental" = callPackage - ({ mkDerivation, base, containers, deepseq, semigroups }: + ({ mkDerivation, aeson, base, containers, deepseq, extensible + , semigroups, text + }: mkDerivation { pname = "incremental"; - version = "0"; - sha256 = "01fvc963gln6svash9cf9v2wbfnssh4j5r49l6y23zmnmqnzxs8x"; - libraryHaskellDepends = [ base containers deepseq semigroups ]; + version = "0.1"; + sha256 = "03yax3xkp1mlipi1vn97ljz05c6fxflpvz9myqvlxcj658p9f3kh"; + libraryHaskellDepends = [ + aeson base containers deepseq extensible semigroups text + ]; testHaskellDepends = [ base ]; description = "incremental update library"; license = stdenv.lib.licenses.bsd3; @@ -134467,29 +132659,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 +132681,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -134546,21 +132714,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 +132727,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 +132741,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 +133093,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 +133797,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 +133809,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 +134395,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 +134454,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 +134476,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 +134746,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 +134765,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 +134803,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 +134813,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -137676,6 +135739,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 +135776,8 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-bitdata" = callPackage @@ -137749,6 +135816,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 +135840,8 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-hw" = callPackage @@ -137783,6 +135854,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 +135872,8 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -137820,6 +135895,8 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-serialize" = callPackage @@ -137836,6 +135913,8 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-stdlib" = callPackage @@ -137848,6 +135927,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 +136981,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 +137004,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 +137352,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 +138129,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 +139097,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 +139118,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -141136,8 +139140,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 +139186,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 +139214,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 +139326,8 @@ self: { ]; description = "A haskell implementation of Katydid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kawa" = callPackage @@ -141394,6 +139398,8 @@ self: { ]; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kazura-queue" = callPackage @@ -142167,6 +140173,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 +140386,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 +140404,6 @@ self: { ]; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kmeans" = callPackage @@ -142613,6 +140598,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 +140925,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 +141990,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 +143259,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 +143329,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 +143341,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 +143550,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 +143570,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 +143882,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 +144023,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 +144130,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 @@ -147146,8 +145045,8 @@ self: { }: mkDerivation { pname = "lenz"; - version = "0.3.0.0"; - sha256 = "17a3d91az0qv138q7x8wbka797z9pfxl3mbyydcr7i7p87dk48k3"; + version = "0.3.1.0"; + sha256 = "1c87m35wvsk9dyfp9d8ar6qb4gz534xmg1rf8xahsjkryn9vjqfn"; libraryHaskellDepends = [ base base-unicode-symbols hs-functors transformers ]; @@ -147787,6 +145686,18 @@ self: { broken = true; }) {}; + "libmodbus" = callPackage + ({ mkDerivation, base, bytestring, data-default, modbus, vector }: + mkDerivation { + pname = "libmodbus"; + version = "1.1.0"; + sha256 = "0fhx0cda803sad7489dp09lrxhwwsbldssjq4jkaprnqjvhj32al"; + libraryHaskellDepends = [ base bytestring data-default vector ]; + librarySystemDepends = [ modbus ]; + description = "Haskell bindings to the C modbus library"; + license = stdenv.lib.licenses.bsd2; + }) {modbus = null;}; + "libmolude" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary , bytestring, concurrent-machines, containers @@ -147963,46 +145874,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 +146787,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 +146814,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 +146921,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 +147019,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 +147045,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 @@ -149258,6 +147133,25 @@ self: { broken = true; }) {}; + "lingo" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, hspec, raw-strings-qq, text, yaml + }: + mkDerivation { + pname = "lingo"; + version = "0.1.0.1"; + sha256 = "1yany2pi06yvkmgz808gji6yk9v0wbl5vnaijhb8vqd152zmmzb4"; + setupHaskellDepends = [ + base bytestring Cabal containers directory filepath text yaml + ]; + libraryHaskellDepends = [ + base bytestring containers filepath raw-strings-qq text yaml + ]; + testHaskellDepends = [ base hspec ]; + description = "File extension based programming language detection"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linguistic-ordinals" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -149381,6 +147275,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linnet" = callPackage + ({ mkDerivation, base, bytestring, bytestring-conversion + , case-insensitive, either, exceptions, hspec, http-types + , io-streams, mtl, QuickCheck, quickcheck-classes + , quickcheck-instances, text, transformers, uri-encode, utf8-string + , wai, warp + }: + mkDerivation { + pname = "linnet"; + version = "0.1.0.0"; + sha256 = "0ikrw7xm490rs46l7555mirkly3h5565kadwfrdjbqgrqv1cjx7k"; + libraryHaskellDepends = [ + base bytestring bytestring-conversion case-insensitive either + exceptions http-types io-streams mtl text transformers uri-encode + utf8-string wai warp + ]; + testHaskellDepends = [ + base bytestring bytestring-conversion case-insensitive either + exceptions hspec http-types io-streams mtl QuickCheck + quickcheck-classes quickcheck-instances text transformers + uri-encode utf8-string wai warp + ]; + description = "Lightweight library for building HTTP API"; + license = stdenv.lib.licenses.asl20; + }) {}; + "linode" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , errors, lens, process, retry, safe, tasty, tasty-hunit @@ -149400,6 +147320,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 +148015,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 +148159,8 @@ self: { ]; description = "Append only key-list database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lit" = callPackage @@ -150630,8 +148574,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 +148596,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 +148607,6 @@ self: { ]; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -151233,24 +149156,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 +149170,6 @@ self: { ]; description = "Structured logging solution (base package)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-domain" = callPackage @@ -151448,21 +149352,27 @@ self: { }) {}; "log4hs" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, directory - , filepath, hspec, hspec-core, process, QuickCheck - , template-haskell, text, time + ({ mkDerivation, aeson, aeson-qq, base, containers, criterion + , data-default, directory, filepath, generic-lens, hspec + , hspec-core, lens, process, QuickCheck, template-haskell, text + , time }: mkDerivation { pname = "log4hs"; - version = "0.0.3.0"; - sha256 = "0bbl1cfa85dr1kxiikykh32x0141bkgfabvkjp37m52sv3vs9mvi"; + version = "0.0.7.0"; + sha256 = "0f05sqjrfg3wkr1avdwljfllfs40bakyims9xd5kn9fv48fzvran"; libraryHaskellDepends = [ - aeson base containers data-default directory filepath - template-haskell text time + aeson base containers data-default directory filepath generic-lens + lens template-haskell text time ]; testHaskellDepends = [ - aeson base containers data-default directory filepath hspec - hspec-core process QuickCheck template-haskell text time + aeson aeson-qq base containers data-default directory filepath + generic-lens hspec hspec-core lens process QuickCheck + template-haskell text time + ]; + benchmarkHaskellDepends = [ + aeson aeson-qq base containers criterion data-default directory + filepath generic-lens lens template-haskell text time ]; description = "A python logging style log library"; license = stdenv.lib.licenses.bsd3; @@ -151737,17 +149647,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 +149656,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 +150403,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 +150497,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -152808,24 +150681,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 +150689,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 +151480,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 +151609,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 +151680,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 +151781,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 +152740,8 @@ self: { ]; description = "Efficient, polymorphic Map Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mappy" = callPackage @@ -155096,6 +152969,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 @@ -155117,17 +152992,12 @@ self: { }) {}; "markov-realization" = callPackage - ({ mkDerivation, base, comonad, configuration-tools, contravariant - , discrimination, generic-deriving, HTF, matrix, MonadRandom - }: + ({ mkDerivation, base, comonad, HTF, MonadRandom }: mkDerivation { pname = "markov-realization"; - version = "0.3.0"; - sha256 = "0sgfz89cxv899f0p0v9fh1xprzqjk9rgm1r1zvkrg2x5fhh9hcca"; - libraryHaskellDepends = [ - base comonad configuration-tools contravariant discrimination - generic-deriving matrix MonadRandom - ]; + version = "0.3.2"; + sha256 = "08zsqpsklffp26ccrqf3kja2x5p8njn9vpy24ysha01f4j9y7has"; + libraryHaskellDepends = [ base comonad MonadRandom ]; testHaskellDepends = [ base HTF ]; description = "Realizations of Markov chains"; license = stdenv.lib.licenses.bsd3; @@ -155362,27 +153232,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 +153253,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 +153270,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 +153388,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 +153559,8 @@ self: { ]; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathista" = callPackage @@ -155791,23 +153647,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 +153656,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 +154050,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 +154065,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 +154108,8 @@ self: { ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcl" = callPackage @@ -156580,8 +154399,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 +154569,8 @@ self: { ]; description = "Convert MediaWiki text to LaTeX"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "medium-sdk-haskell" = callPackage @@ -156791,25 +154612,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,33 +154628,7 @@ self: { description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "megaparsec_6_5_0" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, hspec, hspec-discover, hspec-expectations - , mtl, parser-combinators, QuickCheck, scientific, text - , transformers, weigh - }: - mkDerivation { - pname = "megaparsec"; - version = "6.5.0"; - sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; - revision = "4"; - editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq mtl - parser-combinators scientific text transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-expectations mtl QuickCheck - scientific text transformers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "megaparsec" = callPackage @@ -157043,8 +154819,6 @@ self: { ]; description = "Type-safe memory units"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "memcache" = callPackage @@ -158302,6 +156076,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 +156242,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 +156512,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 +156521,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 +156585,8 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minecraft" = callPackage @@ -159026,39 +156786,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 +157188,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 +157198,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 +157213,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 +157357,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 +157371,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 +157380,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 +157510,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 +157526,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 +157549,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 +157571,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 +157761,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 +157882,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 +158174,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 +159188,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 +159586,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 +159604,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 @@ -162104,8 +159709,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.11.0"; - sha256 = "1lipj4ld99cb3sc9i8va9w7cfki89h436dysyr5ifcb1l0kxg861"; + version = "1.0.12.0"; + sha256 = "1h586myaayxg73lc1fx18axlq2bw761fypyy7mii1h0h75d8fyry"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -162295,17 +159900,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 +160434,6 @@ self: { ]; description = "Haskell client for Moss"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "moto" = callPackage @@ -163359,6 +160962,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 +160982,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 +161066,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 +162764,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 +163542,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 +164042,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 +164654,8 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -167094,6 +164678,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 +164700,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 +165331,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 +165354,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 +165412,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 +165426,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 +165455,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 +165801,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 +165809,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 +165886,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 +165942,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 +165976,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 +165992,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 +166008,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 +166251,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 +167189,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 +167311,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 +167715,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 +167726,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 +167966,6 @@ self: { transformers tuple ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "notmuch" = callPackage @@ -170516,6 +168063,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "now-haskell" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aws-lambda-runtime, base + , base64-bytestring, bytestring, Cabal, case-insensitive + , containers, deepseq, directory, exceptions, filepath + , fused-effects, ghc-lib-parser, hspec, http-api-data, http-client + , http-client-tls, http-media, http-types, iso8601-time, katip + , memory, microlens, mtl, network, QuickCheck, random + , safe-exceptions, semigroups, stack, text, time, transformers + , unordered-containers, vector, wai, yaml + }: + mkDerivation { + pname = "now-haskell"; + version = "0.1.0.0"; + sha256 = "1246jc17bcsm5jmpcbn9w5l5mnq2vvkya1q7jrw7ip5wwi6vaw7m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip memory microlens mtl + network random safe-exceptions text time transformers + unordered-containers vector wai + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring Cabal containers directory + filepath fused-effects ghc-lib-parser stack text yaml + ]; + testHaskellDepends = [ + aeson aws-lambda-runtime base bytestring containers hspec + iso8601-time mtl QuickCheck semigroups text time transformers + unordered-containers vector + ]; + description = "Zeit Now haskell-side integration and introspection tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "nowdoc" = callPackage ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { @@ -170827,6 +168410,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 +169356,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 +169729,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 +170404,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 +170866,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 +171260,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 +171284,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 +171303,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 +171535,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 +172512,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 +172616,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 +172729,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 +172760,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 +172858,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 +172906,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 +172943,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 +173035,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 +173118,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 +173179,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 +173227,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 +173235,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 +173255,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 +173551,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 +174204,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 +174216,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 +174433,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 +174691,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 +174717,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 +175258,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 +176381,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 +176748,8 @@ self: { ]; description = "Library for performing vector shuffles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perfecthash" = callPackage @@ -179546,7 +177041,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 +177050,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 @@ -179765,21 +177260,27 @@ self: { }) {}; "persistent-mongoDB" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal - , conduit, containers, http-api-data, mongoDB, network, path-pieces - , persistent, resource-pool, resourcet, text, time, transformers - , unliftio-core + ({ mkDerivation, aeson, base, blaze-html, bson, bytestring, cereal + , conduit, containers, hspec, http-api-data, HUnit, mongoDB + , network, path-pieces, persistent, persistent-qq + , persistent-template, persistent-test, process, QuickCheck + , resource-pool, resourcet, template-haskell, text, time + , transformers, unliftio-core }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.8.0"; - sha256 = "12hp7cqdz672r5rhad6xvjpxhrs8v1swiz0d9n7xbn41g11a247l"; - revision = "1"; - editedCabalFile = "06iqf7frc5h7qvxhnxi2zirgspsmafp2ls0jw3ppzb01q0y6mgi4"; + version = "2.9.0"; + sha256 = "1xahxmr1rwi2sj809zfqs50kss7ii6df9k52rqr2zxp8q2ipkrx9"; libraryHaskellDepends = [ - aeson attoparsec base bson bytestring cereal conduit containers - http-api-data mongoDB network path-pieces persistent resource-pool - resourcet text time transformers unliftio-core + aeson base bson bytestring cereal conduit http-api-data mongoDB + network path-pieces persistent resource-pool resourcet text time + transformers unliftio-core + ]; + testHaskellDepends = [ + base blaze-html bytestring containers hspec HUnit mongoDB + persistent persistent-qq persistent-template persistent-test + process QuickCheck template-haskell text time transformers + unliftio-core ]; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; @@ -179807,7 +177308,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 +177317,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 +177573,6 @@ self: { ]; description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-spatial" = callPackage @@ -180155,7 +177654,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_10_4" = callPackage + "persistent-sqlite_2_10_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger , persistent, persistent-template, persistent-test, QuickCheck @@ -180165,8 +177664,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.10.4"; - sha256 = "0x4b327h2gqhccy7yw5sa8mn8xfc4zb5kqwx98nr9yk7f1s0fr79"; + version = "2.10.5"; + sha256 = "1sghp7ffi383bzlgm83g0l5bzjbs67m6lxn3fsz74y0yy9ix33ha"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -180196,10 +177695,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 +177795,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 +177836,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 +178925,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 +179120,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 +179142,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 +179156,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -181876,6 +179380,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 +179886,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 +179903,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,16 +179916,14 @@ self: { ]; description = "WebSockets support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-ordered-zip" = callPackage ({ mkDerivation, base, foldl, pipes }: mkDerivation { pname = "pipes-ordered-zip"; - version = "1.0.0.1"; - sha256 = "18qm08h5mq8pyn7cx1dabvmj63mhykm4cqsxhqsb7qf1kv70nqc8"; + version = "1.0.1"; + sha256 = "10ywi5ykp398mghc3mvcy2alz1lp6kah0yxmn5pz1l6nbsv7wyk5"; libraryHaskellDepends = [ base pipes ]; testHaskellDepends = [ base foldl pipes ]; description = "merge two ordered Producers into a new Producer"; @@ -183287,8 +180806,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 +181437,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 +181650,6 @@ self: { benchmarkHaskellDepends = [ base gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "poly-arity" = callPackage @@ -184297,6 +181810,18 @@ self: { license = "LGPL"; }) {}; + "polyparse_1_13" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "polyparse"; + version = "1.13"; + sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; + libraryHaskellDepends = [ base bytestring text ]; + description = "A variety of alternative parser combinator libraries"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polysemy" = callPackage ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover @@ -184325,8 +181850,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 +182054,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 +182774,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 +182922,6 @@ self: { ]; description = "Utilities for streaming PostgreSQL LargeObjects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgresql-named" = callPackage @@ -185521,6 +183076,21 @@ self: { broken = true; }) {}; + "postgresql-simple-interpolate" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec + , postgresql-simple, template-haskell + }: + mkDerivation { + pname = "postgresql-simple-interpolate"; + version = "0.1"; + sha256 = "0nq4j1lbylklsz3fhc4y7rh6c4lfzzfyha65g6i22mbpx51vdf30"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec postgresql-simple template-haskell + ]; + description = "Interpolated SQL queries via quasiquotation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-simple-migration" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, text, time @@ -185865,6 +183435,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 +184613,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_3_1_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest + , containers, criterion, doctest, Glob, mtl, QuickCheck + , template-haskell, text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "3.1.0.0"; + sha256 = "0p3p5i2rjwv19hzgqyarv7x6g6hvam159y50irvs0dd5wwphd2pa"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal base containers mtl text transformers + ]; + testHaskellDepends = [ + base doctest Glob QuickCheck template-haskell + ]; + 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 +184681,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 +184718,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 +185028,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 +185088,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 +185131,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 +185871,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 +186346,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 +186390,8 @@ self: { ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prometheus-client" = callPackage @@ -188982,8 +186588,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 +186761,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 +186781,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 +186871,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 +186885,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 +186920,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 +186934,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 +186950,6 @@ self: { ]; doHaddock = false; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -189664,23 +187191,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 +187200,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 @@ -190556,8 +188065,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.13.2"; - sha256 = "0g4g2xsn3r5xxqndlyg1yxnsdgj27l5zll9q6wly119mkcllvvql"; + version = "0.13.3"; + sha256 = "05cz0ilxawrcn4hm6mbd0qpkbfp0g8mcqvcscl4ghagjljgimaqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191367,37 +188876,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 +188897,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 +189129,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 +189138,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quandl-api" = callPackage @@ -192107,8 +189561,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 +189582,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 +189599,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 +189623,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 +189647,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 +189665,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 +189673,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 +189687,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 +189837,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 +189860,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 +189929,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 +189989,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 @@ -192651,8 +190070,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1.1"; - sha256 = "185sivnl9zwkzrsqknlpkm3mkl5irk6nawbwgm67x1y08d2wvmc4"; + version = "2.1.2"; + sha256 = "0igqwa195qgps5vla2a4f83rq4vdq739i94kbzzmbnniylx9wgdw"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -193188,6 +190607,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 +190643,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 +190859,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 +191114,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 +191319,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 +191327,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 +191419,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 +191771,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 +191778,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 +191806,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 +191854,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 +192799,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 +193036,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 +193050,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 +193218,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 +193749,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 +194198,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 +194252,8 @@ self: { ]; description = "Happstack support for reform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform-hsp" = callPackage @@ -196931,6 +194265,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 @@ -197036,18 +194372,19 @@ self: { }) {}; "regex-applicative" = callPackage - ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, transformers + ({ mkDerivation, base, containers, criterion, smallcheck, tasty + , tasty-hunit, tasty-smallcheck, transformers }: mkDerivation { pname = "regex-applicative"; - version = "0.3.3"; - sha256 = "1riv7jqf26lbv4rm54sd6mrx8xdh4dvh4xbzymzdfdw13k6a4nb6"; + version = "0.3.3.1"; + sha256 = "0p0anx5vamrhrdvviwkh2zn6pa3pv2bjb7nfyc7dvz2q7g14y1lg"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers smallcheck tasty tasty-hunit tasty-smallcheck transformers ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Regex-based parsing with applicative interface"; license = stdenv.lib.licenses.mit; }) {}; @@ -197707,26 +195044,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 +195296,8 @@ self: { ]; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relation" = callPackage @@ -197976,6 +195315,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 +195346,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 +195358,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 +195516,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 +195538,6 @@ self: { ]; description = "Custom prelude from Kowainik"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -199057,38 +196351,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 +196376,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 +196424,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 +196442,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 +196459,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 +196592,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 +197233,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 +197250,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 +197591,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 +197664,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 +197800,29 @@ 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.3.0.0"; + sha256 = "1dw86xrz310vrapgln48r46z0ss35jm85c0r95pqvnq4smbwiw18"; + 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 + ]; + description = "Static site generator using Shake"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ribbit" = callPackage ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { @@ -200832,30 +198081,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 +198101,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -200915,8 +198139,6 @@ self: { ]; description = "Pretty-printing for RIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "riot" = callPackage @@ -201690,8 +198912,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 +198930,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 +198947,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 +198964,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 +200507,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 +200526,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,47 +200813,61 @@ 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, base, bytestring, containers, criterion + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, megaparsec, menshen, mtl + , QuickCheck, random, scientific, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "salak"; - version = "0.1.11"; - sha256 = "03l6vadg5wzz2pf1kaxl0h7qndkspymamfdm27ifpwz3vwfy7m1p"; + version = "0.3.4.1"; + sha256 = "178vjvyqvs2m6671wckw8yb5s5xy0nvdivxvyxqq9w8ckdnnk1q0"; libraryHaskellDepends = [ - aeson attoparsec base containers data-default directory filepath - menshen mtl pqueue scientific text transformers - unordered-containers vector yaml + base bytestring containers data-default directory dlist exceptions + filepath hashable heaps megaparsec 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 + base bytestring containers data-default directory dlist exceptions + filepath hashable heaps hspec megaparsec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers ]; - description = "Configuration Loader"; - license = stdenv.lib.licenses.bsd3; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default directory dlist + exceptions filepath hashable heaps megaparsec menshen mtl + scientific text time unliftio-core unordered-containers + ]; + 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 + "salak_0_3_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, megaparsec, menshen, mtl + , QuickCheck, random, scientific, text, time, unliftio-core , unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.3"; - sha256 = "1jq9vngi03wqcvfb1r9ndg4w1vipgbhbzdyybkpj4hmc074l1079"; + version = "0.3.5.1"; + sha256 = "0g41h9a89cp24cm99q1lgiyz794szf85hinybbjz75s33a3lykgv"; libraryHaskellDepends = [ - attoparsec base bytestring data-default directory exceptions - filepath hashable heaps menshen mtl scientific text time + base bytestring containers data-default directory dlist exceptions + filepath hashable heaps megaparsec 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 + base bytestring containers data-default directory dlist exceptions + filepath hashable heaps hspec megaparsec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default directory dlist + exceptions filepath hashable heaps megaparsec menshen mtl scientific text time unliftio-core unordered-containers ]; description = "Configuration (re)Loader and Parser"; @@ -203640,13 +200876,37 @@ self: { }) {}; "salak-toml" = callPackage - ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak - , text, time, tomland, unordered-containers + ({ mkDerivation, base, criterion, exceptions, hspec, mtl + , QuickCheck, salak, text, time, tomland, unordered-containers }: mkDerivation { pname = "salak-toml"; - version = "0.3.3"; - sha256 = "0961xwj928map27az5qlp86wxg5jj6kq9cxqhbmcyl7m1cic91dy"; + version = "0.3.4.1"; + sha256 = "1gsgl6wzrzhpgbz1paig9xbxknm9g5z3g3cq47i198qzxnmqad7c"; + libraryHaskellDepends = [ + base salak text time tomland unordered-containers + ]; + testHaskellDepends = [ + base exceptions hspec mtl QuickCheck salak text time tomland + unordered-containers + ]; + benchmarkHaskellDepends = [ + base criterion salak text time tomland unordered-containers + ]; + description = "Configuration Loader for toml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "salak-toml_0_3_5_1" = callPackage + ({ mkDerivation, base, criterion, exceptions, hspec, mtl + , QuickCheck, salak, text, time, tomland, unordered-containers + }: + mkDerivation { + pname = "salak-toml"; + version = "0.3.5.1"; + sha256 = "1clgsr1aqz2zfnsazhql6m125161yxbfp6q0lc4dllbvdhjygmrf"; libraryHaskellDepends = [ base salak text time tomland unordered-containers ]; @@ -203654,6 +200914,9 @@ self: { base exceptions hspec mtl QuickCheck salak text time tomland unordered-containers ]; + benchmarkHaskellDepends = [ + base criterion salak text time tomland unordered-containers + ]; description = "Configuration Loader for toml"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -203661,21 +200924,42 @@ self: { }) {}; "salak-yaml" = callPackage - ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl - , QuickCheck, salak, text + ({ mkDerivation, base, conduit, criterion, exceptions, hspec + , libyaml, mtl, QuickCheck, salak, text }: mkDerivation { pname = "salak-yaml"; - version = "0.3.3"; - sha256 = "038pfna1jijw6vf8b89ql4f4987s60lpj90nlny66wxkj4b2nbrq"; + version = "0.3.4.1"; + sha256 = "083ba1pdv6pnlzc9ijh9pzvxn056yjhy46283jf49m4sbma105w4"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; + testHaskellDepends = [ + base conduit exceptions hspec libyaml mtl QuickCheck salak text + ]; + benchmarkHaskellDepends = [ + base conduit criterion libyaml salak text + ]; + description = "Configuration Loader for yaml"; + license = stdenv.lib.licenses.mit; + }) {}; + + "salak-yaml_0_3_5_1" = callPackage + ({ mkDerivation, base, conduit, criterion, exceptions, hspec + , libyaml, mtl, QuickCheck, salak, text + }: + mkDerivation { + pname = "salak-yaml"; + version = "0.3.5.1"; + sha256 = "1qzpbv2g7ds3dbcfi90ncjrk66vm1kxdkkdx1i49jq9g2xcai9n6"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit exceptions hspec libyaml mtl QuickCheck salak text ]; + benchmarkHaskellDepends = [ + base conduit criterion libyaml salak text + ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "saltine" = callPackage @@ -204277,32 +201561,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 +201585,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 +201612,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 +201633,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 +201838,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 +201851,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 +201870,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 @@ -204920,6 +202115,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scheduler_1_4_2" = callPackage + ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest + , criterion, deepseq, doctest, exceptions, fib, genvalidity-hspec + , hspec, monad-par, mwc-random, parallel, primitive, QuickCheck + , streamly, template-haskell, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "scheduler"; + version = "1.4.2"; + sha256 = "0px7k4lq758s8303fx690pzzigqi26m45wxpapj9pgl4kar45jzc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions primitive unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck + template-haskell unliftio vector + ]; + benchmarkHaskellDepends = [ + async base criterion deepseq fib monad-par parallel streamly + unliftio + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -205455,8 +202677,8 @@ self: { ({ mkDerivation, base, ditto, ditto-lucid, lucid, scotty, text }: mkDerivation { pname = "scotty-form"; - version = "0.1.0.0"; - sha256 = "0ks11rav9x52lq27mr12qlygg6yl9wl87fqa28jbz084fwn97w44"; + version = "0.2.0.0"; + sha256 = "048vfcvi2wmpmg0ldm4fjkszsx498m22fsg0p8xdanbfbfzrzwwa"; libraryHaskellDepends = [ base ditto ditto-lucid lucid scotty text ]; @@ -205942,27 +203164,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 +203177,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 +203243,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 @@ -206300,8 +203502,8 @@ self: { ({ mkDerivation, base, containers, doctest, hspec }: mkDerivation { pname = "search-algorithms"; - version = "0.3.0"; - sha256 = "046v424bvfnvf3hw38k9isdn9f05l4jk8k1fb2p3zn5zgb4h77aa"; + version = "0.3.1"; + sha256 = "1803pmk78l29nlgh68y7hndhlmlsabddf78hsva1bq87yhzz1rlv"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hspec ]; description = "Common graph search algorithms"; @@ -206561,22 +203763,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 +203776,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 +203789,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 +203805,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 +203821,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "select" = callPackage @@ -206887,8 +204034,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 +204050,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 +204062,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 +204237,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 +204250,6 @@ self: { ]; description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semver" = callPackage @@ -207259,8 +204388,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.7.0.2"; - sha256 = "08ymh5ckn6nwcyds683mgz42ik12q12wqknwb6m6c0dsbm901b57"; + version = "0.7.0.3"; + sha256 = "1afn67bxmxch2gpjar89dkagchp3h0rqbv8jkglgfzjc137047dc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -207517,20 +204646,23 @@ self: { }) {}; "sequence-formats" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-memocombinators, errors, exceptions, foldl, hslogger - , lens-family, MissingH, pipes, pipes-attoparsec, pipes-bytestring - , pipes-safe, pipes-text, split, text, transformers, turtle, vector + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector }: mkDerivation { pname = "sequence-formats"; - version = "1.1.4.1"; - sha256 = "1zh2n1ksyvqzk2w35nsyj3sxdf7ni2iqv2ksrk8xs64n0j25c7ac"; + version = "1.3.2"; + sha256 = "0ghmhn9cmgxwn9nix309q300ma23snkvhmhg4vsl5gnx6bhg7caj"; libraryHaskellDepends = [ - attoparsec base bytestring containers data-memocombinators errors - exceptions foldl hslogger lens-family MissingH pipes - pipes-attoparsec pipes-bytestring pipes-safe pipes-text split text - transformers turtle vector + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl pipes pipes-safe tasty tasty-hunit + transformers vector ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = stdenv.lib.licenses.gpl3; @@ -207794,34 +204926,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 +204951,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 +205019,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 +205039,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 +205354,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 +205362,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 +205386,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 +205408,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 +205430,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 +205463,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 +205491,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 +205514,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 +205728,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 +205747,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 +205791,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 @@ -208972,8 +205904,8 @@ self: { }: mkDerivation { pname = "servant-github-webhook"; - version = "0.4.1.0"; - sha256 = "0v6gd7swhl58x3sqbb5cmn5ac6x1p5mg7jqbwk9ny9bzggz9pglb"; + version = "0.4.2.0"; + sha256 = "1z80h42zp781p49bskw5ilb49dnhs7y4j2g0v4xdyrrabj2m885g"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github github-webhooks http-types memory servant servant-server @@ -208984,8 +205916,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 +206132,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 +206140,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 +206358,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 +206463,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 +206550,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 +206568,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 +206697,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 +206720,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 +206850,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 +206866,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 +206968,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 +207014,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 +207158,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 @@ -210450,8 +207312,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.8"; - sha256 = "14qjlji11xa2v72bskv1cqk3x0z4gjl77mx1vqi183sd4798xhci"; + version = "0.8.10"; + sha256 = "1gvswqkdk5awnvjqzvhbrvdmsyj73kiph872fvplmmdyvq8hb8gy"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -210557,6 +207419,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 +207647,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 +207910,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 +207956,7 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -211115,6 +208006,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sexpr-parser_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, hspec, megaparsec + , process + }: + mkDerivation { + pname = "sexpr-parser"; + version = "0.2.0.0"; + sha256 = "0cgfmnv72n5li15k8dq4w2rvfx0ahbyb7h2g51a5i4x9w70dyllg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base data-default megaparsec ]; + executableHaskellDepends = [ base bytestring megaparsec process ]; + testHaskellDepends = [ base data-default hspec megaparsec ]; + description = "Simple s-expression parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sext" = callPackage ({ mkDerivation, base, bytestring, tasty, tasty-hunit , template-haskell, text, vector @@ -211205,6 +208114,8 @@ self: { ]; description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sgf" = callPackage @@ -211428,8 +208339,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 +208476,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 +208498,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 +209020,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 +209154,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 +209178,6 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -212313,27 +209216,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.4"; + sha256 = "10gnkk0645aznkry063kl5m68n7ip88m8cf97lwffj1y86iazk5b"; 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 +209503,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 +209518,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 +209776,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 +209823,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 +209876,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 +209967,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 +210058,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 +210519,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 +210595,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 +210648,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 +210715,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 +210759,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 +210767,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 +211062,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 +211070,6 @@ self: { libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -214843,29 +211656,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 +211668,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -214891,38 +211680,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 +211700,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -215138,6 +211894,8 @@ self: { ]; description = "A note taking CLI tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slave-thread" = callPackage @@ -215194,6 +211952,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sliceofpy" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, process, split + , tasty, tasty-hspec, template-haskell, text + }: + mkDerivation { + pname = "sliceofpy"; + version = "1.0.0"; + sha256 = "0jc6abvgyrljyvzxw3v3nhxzqw3fjh2r51xag2v2xg3zb9qx8fra"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring lens process split template-haskell text + ]; + executableHaskellDepends = [ + base bytestring lens process split template-haskell text + ]; + testHaskellDepends = [ + base bytestring containers lens process split tasty tasty-hspec + template-haskell text + ]; + description = "Python-ish slicing traversals for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "slick" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, lens , lens-aeson, mustache, pandoc, shake, text, time @@ -215898,24 +212680,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 +212695,6 @@ self: { ]; description = "Simple email sending via SMTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp-mail-ng" = callPackage @@ -216094,6 +212857,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 +213147,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 +213175,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 +214720,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 +214730,6 @@ self: { ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sodium" = callPackage @@ -218774,6 +215482,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "sparse-tensor" = callPackage + ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers + , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise + , hmatrix, parallel, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tf-random, zlib + }: + mkDerivation { + pname = "sparse-tensor"; + version = "0.2.1"; + sha256 = "10950cp07m1p011n3a14bka2rpfrmn20k0kjb1cvca7dnxn2iv2f"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + ad base bytestring cereal containers deepseq ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix parallel tf-random zlib + ]; + testHaskellDepends = [ + base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + 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 +215738,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.3"; + sha256 = "0izf0lvk989y4d04240hbnsr5lc5lbl9200c5km0p72lv1v07mgf"; 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 +215769,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 ]; @@ -219431,8 +216163,8 @@ self: { pname = "split"; version = "0.2.3.3"; sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x"; - revision = "1"; - editedCabalFile = "0vz2ylx81nfq2981msig080j7n41xf2lrxzf3hj1x3g3cllb3izi"; + revision = "2"; + editedCabalFile = "1c8bcssxq5rkxkixgms6w6x6lzf4n7cxk6cx6av1dp3lixdy9j34"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; @@ -219460,6 +216192,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 +216227,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 +216244,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -220125,8 +216837,6 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sr-extra" = callPackage @@ -220541,6 +217251,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 +218050,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 +219037,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 +219390,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 +219670,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 +219705,6 @@ self: { ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -223095,8 +219785,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.29.1"; - sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; + version = "0.40.0"; + sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223112,15 +219802,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 +219903,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 +219918,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 +220341,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 +220493,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 +220529,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 +220550,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 +221212,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 +221226,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 +221241,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 +221320,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 +221393,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 +221723,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 +221794,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 +222109,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 +222280,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 +222333,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 +222525,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 +222605,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 +222643,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 +222658,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 +222683,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 +222692,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 +222717,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 +223006,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 +223025,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 +223300,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 +223316,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 +223498,6 @@ self: { ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-xml" = callPackage @@ -226896,16 +223539,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 +223764,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 +224079,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 +224499,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 +224694,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 +224884,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 +225235,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.2"; + sha256 = "16n0s9vpwrnbknm9yfsh3qv2j3k1h579fwfqjbr1kzjn40729348"; + 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 +225315,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 +225803,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 +225850,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 +225858,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -229261,23 +225903,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 +226087,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 +226312,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 +226325,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 +226422,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 +227659,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 +227668,6 @@ self: { executableHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termbox-banana" = callPackage @@ -231107,8 +227683,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 +227849,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 +227865,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 @@ -231302,9 +227877,7 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; 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 +228652,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 +228944,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 +229176,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 +229186,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 +229261,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 +229272,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 +229283,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 +229296,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 +229315,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 +229348,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 +229527,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 +229698,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 +229706,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 +229812,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 +230021,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,35 +230029,16 @@ 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 - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.12"; - sha256 = "1kjfwfmkn7r35qlsa0n4la3103jlfbjf3ia1pvsgizgrwxr1zjid"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift-instances_0_1_13" = 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 @@ -233592,7 +230048,6 @@ self: { ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -233945,7 +230400,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 +230424,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 +230441,6 @@ self: { ]; description = "An either-or-both data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-lens" = callPackage @@ -233997,8 +230452,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 +230868,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 +230893,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,42 +231088,22 @@ 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 + , network, parsec, primitive, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.3.0"; - sha256 = "0zd9z0nc600b1zw0c1bpl5b3ik1dcspv5kd72p3if70g81x56d8l"; + version = "1.4.0"; + sha256 = "0zh1d5apjsayqjwl019qcd4b7v2f2w14amq3rysdwqx8cz7z5045"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc - mwc-random network parsec text transformers vector + mwc-random network parsec primitive text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; 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 +231333,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 +231349,6 @@ self: { ]; description = "Compatibility package for time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-extras" = callPackage @@ -235500,23 +231923,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 +231932,6 @@ self: { testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timerep" = callPackage @@ -235666,6 +232071,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 +232263,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 +232272,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 +232593,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 +232600,6 @@ self: { ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmapchan" = callPackage @@ -236256,30 +232644,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 +232712,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "to" = callPackage + ({ mkDerivation, base, bytestring, containers, gauge, hashable + , text, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "to"; + version = "1.2.0"; + sha256 = "13y4vxfm76929c4nj6rp06y81nm30m3v52r927k41nbb0fdx8z7y"; + libraryHaskellDepends = [ + base bytestring containers hashable text unordered-containers + utf8-string vector + ]; + benchmarkHaskellDepends = [ + base containers gauge text unordered-containers + ]; + description = "Simple, safe, boring type conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "to-haskell" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, transformers }: @@ -236684,38 +233067,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 @@ -236748,8 +233099,6 @@ self: { ]; description = "Bidirectional TOML serialization"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tomlcheck" = callPackage @@ -236767,6 +233116,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 +233270,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 +233736,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 +233906,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 +234491,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 +234509,8 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-extra" = callPackage @@ -238186,8 +234539,8 @@ self: { }: mkDerivation { pname = "trasa-form"; - version = "0.3.2.0"; - sha256 = "0q59wkg7k66iq8n6b73226z23sgy8pfvylac9qvlaiib6dllq1g8"; + version = "0.4"; + sha256 = "0d3fkwvjjwvjzaw5n9n4j4mrrrf8zwrg1882gyqjg0bglsd27xzx"; libraryHaskellDepends = [ base bytestring cookie ditto ditto-lucid http-api-data http-types lucid mtl quantification text trasa trasa-server @@ -238195,6 +234548,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 +234583,8 @@ self: { ]; description = "Type safe web server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-th" = callPackage @@ -238378,31 +234735,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 +234756,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -238896,6 +235227,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 +236595,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 +236662,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 +236679,8 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tx" = callPackage @@ -240651,8 +236990,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 +237313,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 +237365,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 +237398,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 +237567,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 +237582,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -241324,6 +237628,22 @@ self: { broken = true; }) {}; + "typed-uuid" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable + , http-api-data, random, text, uuid, validity, validity-uuid + }: + mkDerivation { + pname = "typed-uuid"; + version = "0.0.0.0"; + sha256 = "1v862wfmd03ssch7p5hr5cmzc38gzmxvw22swdfs2blfxv13cdc8"; + libraryHaskellDepends = [ + aeson base binary bytestring deepseq hashable http-api-data random + text uuid validity validity-uuid + ]; + description = "Phantom-Typed version of UUID"; + license = stdenv.lib.licenses.mit; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -241448,17 +237768,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 +237776,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 +237829,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 +237955,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 +238410,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 +238509,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 +238819,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 +238837,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 +239176,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 @@ -242936,6 +239217,17 @@ self: { broken = true; }) {}; + "unipatterns" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unipatterns"; + version = "0.0.0.0"; + sha256 = "07jl3an9y4gbpmsq2gcbp3xwyvrnvkjcxcpq1702cc320c8zq542"; + libraryHaskellDepends = [ base ]; + description = "Helpers which allow safe partial pattern matching in lambdas"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uniplate" = callPackage ({ mkDerivation, base, containers, hashable, syb , unordered-containers @@ -243130,8 +239422,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 +239567,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 +239580,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 +239601,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 +239614,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 +239627,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 +239640,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 +239653,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 +239736,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 +239871,8 @@ self: { ]; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unlambda" = callPackage @@ -243675,31 +239901,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 +239923,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 +241088,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 +241353,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 +241799,8 @@ self: { testHaskellDepends = [ base process ]; description = "the cabal companion"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vabal-lib" = callPackage @@ -245716,12 +241922,12 @@ self: { }) {}; "valid" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, util }: mkDerivation { pname = "valid"; - version = "0.1.0.0"; - sha256 = "10nrr48ki8vxckbz1q24nn2x8vwflj4ndgvlj99ishyypb1ijx37"; - libraryHaskellDepends = [ base ]; + version = "0.1.1.0"; + sha256 = "1c029mb3szixs9rr5i7ri2nm0ya5gv5r6bv8hzsyw90ys5nbgcz5"; + libraryHaskellDepends = [ base util ]; description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -245779,6 +241985,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 +241994,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 +242016,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 +242026,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 +242384,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 +242391,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 +242643,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 +242653,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 +243068,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 +243085,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 +243235,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 +243247,6 @@ self: { ]; description = "Simple enum that encodes application verbosity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verdict" = callPackage @@ -247171,8 +243296,8 @@ self: { }: mkDerivation { pname = "verifiable-expressions"; - version = "0.5.0"; - sha256 = "04bm6m9aflf2zcbwbgga6sl3ydxmp295pgwp9wfbvnzyc2bggrg5"; + version = "0.6.0"; + sha256 = "1drb5zkpm5zn765fkp2p7jq69q50f9577rz9bs76cp0gvccan8my"; libraryHaskellDepends = [ base containers lens mtl sbv transformers union vinyl ]; @@ -247565,28 +243690,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 +243703,7 @@ self: { description = "Extensible Records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-generics" = callPackage @@ -247617,6 +243721,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 +243744,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 +243775,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 +244594,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 +244611,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,37 +244754,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.26.1"; - sha256 = "1gsjji9i471j224sfp4xdm4vga3jcbdvdg7f40y3l58pplf6a3qd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types http2 iproute network old-locale - resourcet streaming-commons text time transformers unix unix-compat - vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_27" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, http2, HUnit, iproute, network, old-locale, resourcet - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, void, wai, wai-logger, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.27"; - sha256 = "1p8x61xjbwjif10iibc3b2gxh3dd3rymrfvinrdn0h9wn7qsyh2x"; + version = "3.0.28"; + sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248709,7 +244771,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -249825,6 +245886,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 +246631,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 +246648,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 +246848,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 +247003,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 +247071,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 +247233,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 +247322,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 +247341,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 +247362,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 +247819,8 @@ self: { ]; description = "Composable websockets clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "websockets-snap" = callPackage @@ -251912,8 +247940,6 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "weigh" = callPackage @@ -252222,6 +248248,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 +248465,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 +248499,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 +248636,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 +248995,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 +249421,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 +249433,6 @@ self: { ]; description = "Open Union and Open Product Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wp-archivebot" = callPackage @@ -253609,46 +249586,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 +249610,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 +250008,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 +251072,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 +251090,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 +251253,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 +251772,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 +251790,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 +251799,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 +251811,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 +251833,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlgen" = callPackage @@ -256020,8 +251949,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.29.5"; - sha256 = "0k5hjpr1vanj6hxf5mn3j5rfjrmiz4x29kcvi55d8qpzsan3iz0m"; + version = "0.30"; + sha256 = "1msyl3gy8cybdkx24k6ykcxjf95b5zid8b6vdwqmsamw1yrb3sgr"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -256844,37 +252773,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 +252802,6 @@ self: { ]; description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-app" = callPackage @@ -256947,21 +252844,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 +252858,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-job" = callPackage @@ -257020,8 +252901,6 @@ self: { ]; description = "Yam Redis Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-servant" = callPackage @@ -257162,6 +253041,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml_0_11_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.1.1"; + sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -258593,8 +254502,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.14"; - sha256 = "1p7rm95fb3d27khzq6c10mvqffj8jwiirgfy53hvi3x27w9hqg6s"; + version = "1.6.15"; + sha256 = "0rzmx9cx2lzlmhjrbczdpzv6divwr0n6h3330rsdh15kn8wjkfr8"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -258838,6 +254747,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 +254800,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 +254811,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 @@ -258979,6 +254867,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-multi" = callPackage + ({ mkDerivation, base, containers, network-uri, shakespeare, text + , transformers, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-multi"; + version = "1.6.0"; + sha256 = "162pyvyv5kv5bicl8ikvffnsyjqc8z0n758ycgnvwly0bvskrl37"; + libraryHaskellDepends = [ + base containers network-uri shakespeare text transformers + yesod-core yesod-form + ]; + description = "Multi-input form handling for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-form-richtext" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -259890,8 +255794,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.6.1"; - sha256 = "1mr0ad6z6s9rnxnv5ayg8xr93xfx9gxm8zym0866339w7p292wqd"; + version = "1.6.6.2"; + sha256 = "1c5q11f2wscapl6a16v1r5livjiy8i2iz5zvlcsx89ikrqgvfc58"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -260083,6 +255987,8 @@ self: { ]; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yggdrasil" = callPackage @@ -260219,6 +256125,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 +256307,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 +257304,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 +257316,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 +257702,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 +257716,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/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index b7b057f2dc20..1793299bf6cd 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -12,4 +12,44 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + + cabal-install-3 = (self.callPackage + ({ mkDerivation, array, async, base, base16-bytestring, binary + , bytestring, Cabal, containers, cryptohash-sha256, deepseq + , directory, echo, edit-distance, filepath, hackage-security + , hashable, HTTP, mtl, network, network-uri, parsec, pretty + , process, random, resolv, stdenv, stm, tar, text, time, unix, zlib + , fetchFromGitHub + }: + mkDerivation { + pname = "cabal-install"; + version = "3.0.0.0"; + src = fetchFromGitHub { + owner = "haskell"; + repo = "cabal"; + rev = "b0e52fa173573705e861b129d9675e59de891e46"; + sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass"; + }; + postUnpack = "sourceRoot+=/cabal-install"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath process ]; + executableHaskellDepends = [ + array async base base16-bytestring binary bytestring Cabal + containers cryptohash-sha256 deepseq directory echo edit-distance + filepath hackage-security hashable HTTP mtl network network-uri + parsec pretty process random resolv stm tar text time unix zlib + ]; + doCheck = false; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; + }) {}).overrideScope (self: super: { + Cabal = self.Cabal_3_0_0_0; + }); + } 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 8354c7fa5890..000000000000 --- 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/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6b1a71c80207..b5a7c2b467ef 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.466"; + version = "1.10.1.469"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1rh4isdac7l8k8p45cqim8lfccjzxw7z173xqnpgk3z307jj4n90"; + sha256 = "0hpb6rixmgllss69vl9zlpb41svm4mx4xmfbq1q7y12jsxckzgpq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index e0d4ecbc95ac..25a3f662565c 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 c408d21d9b31..016e175d6b56 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 60eb6c8a6a5e..e21bf6dafbff 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 1af047f43bd7..a8c05513c5a6 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/evcxr/cargo-lock.patch b/pkgs/development/interpreters/evcxr/cargo-lock.patch deleted file mode 100644 index 6feaf12844c2..000000000000 --- a/pkgs/development/interpreters/evcxr/cargo-lock.patch +++ /dev/null @@ -1,684 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..edf585d ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,661 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "aho-corasick" -+version = "0.6.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "approx" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "argon2rs" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "arrayvec" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.2 (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.54 (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)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "base64" -+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)", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "blake2-rfc" -+version = "0.2.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "byteorder" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cc" -+version = "1.0.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cgmath" -+version = "0.16.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "colored" -+version = "1.8.0" -+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)", -+ "winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "dirs" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_users 0.3.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 = "evcxr" -+version = "0.3.3" -+dependencies = [ -+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "json 0.11.13 (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.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "evcxr_repl" -+version = "0.3.3" -+dependencies = [ -+ "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "evcxr 0.3.3", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "evcxr_runtime" -+version = "1.1.0" -+dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure" -+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)", -+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure_derive" -+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)", -+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "json" -+version = "0.11.13" -+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" -+ -+[[package]] -+name = "libc" -+version = "0.2.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libloading" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "log" -+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)", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "nix" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.36 (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.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "nodrop" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "num-traits" -+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)", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "proc-macro2" -+version = "0.4.27" -+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)", -+] -+ -+[[package]] -+name = "quote" -+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)", -+] -+ -+[[package]] -+name = "rand" -+version = "0.4.6" -+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.54 (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.54 (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.2 (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.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)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.0" -+source = "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" -+dependencies = [ -+ "rand_core 0.3.1 (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" -+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.54 (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.54 (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.2 (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 = "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" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex" -+version = "1.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "aho-corasick 0.6.10 (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)", -+ "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" -+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" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rgb" -+version = "0.8.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rustyline" -+version = "3.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8parse 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 = "scoped_threadpool" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "sig" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "syn" -+version = "0.15.27" -+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)", -+ "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" -+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)", -+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.27 (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 = "tempfile" -+version = "3.0.7" -+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)", -+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.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 = "thread_local" -+version = "0.3.6" -+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)", -+] -+ -+[[package]] -+name = "ucd-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "utf8-ranges" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "utf8parse" -+version = "0.1.1" -+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 = "winapi" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winconsole" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[metadata] -+"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -+"checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" -+"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" -+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" -+"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 backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd1fa8ad26490b0a5cfec99089952250301b6716cdeaa7c9ab229598fb82ab66" -+"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" -+"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" -+"checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" -+"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" -+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" -+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be" -+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" -+"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" -+"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" -+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" -+"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" -+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" -+"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 proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" -+"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" -+"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_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+"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 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_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" -+"checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f" -+"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 rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4f089652ca87f5a82a62935ec6172a534066c7b97be003cc8f702ee9a7a59c92" -+"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" -+"checksum rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb02ba7748691403057542ee60a1e7688fdfb46bd3bee752b8977537ee003ae2" -+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -+"checksum sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" -+"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec" -+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" -+"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" -+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+"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-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 utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -+"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"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" -+"checksum winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef84b96d10db72dd980056666d7f1e7663ce93d82fa33b63e71c966f4cf5032" -diff --git a/Cargo.toml b/Cargo.toml -index d09a342..5377ed0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -2,10 +2,9 @@ - members = [ - "evcxr", - "evcxr_repl", -- "evcxr_jupyter", - "evcxr_runtime", - ] - - exclude = [ - "runtimes" --] -\ No newline at end of file -+] diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 2c30c0ca385f..84ebc49a2218 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,21 +1,20 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security }: +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, zeromq }: rustPlatform.buildRustPackage rec { - name = "evcxr-${version}"; - version = "0.3.3"; + pname = "evcxr"; + version = "0.4.3"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "ae07ccf08723b7aec0de57d540822b89088ca036"; - sha256 = "1apc93z9vvf6qks5x2pad45rnrj9kjl812rj78w5zmmizccp2fhf"; + rev = "v${version}"; + sha256 = "08zsdl6pkg6dx7k0ns8cd070v7ydsxkscd2ms8wh9r68c08vwzcp"; }; - cargoSha256 = "153pxqj4jhlbacr7607q9yfw6h96ns5igbvssis8j3gn0xp6ssg6"; - cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "1hqlagwl94xcybfqq5h2mrz9296mjns2l598d6jclls7ac5wsdfc"; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ cargo ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index efbd72dcefa8..d5635fc22327 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.7"; + version = "2.5.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1q69xg7p790dfk09wyijpx8y85n8g9lfd0fikl6qr73k9zz5v41x"; + sha256 = "0hl7m9fpmrn9ppxbb3pm68048xpzig7q6hqyg121gvcziywi9ys9"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 3bec73ea0369..56becd3d6c94 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/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 219b8e2758aa..197127d8b6d4 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0ncyg594fixvvkgk0k89b40v9hy36lcr2gniks3ac6cyqy2iixx5"; + sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 2e53ae1694f2..56c0f1f73e6c 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.2.7.0"; + version = "9.2.8.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "0j0k1vapxr9gx18sqjf0kqfgw22f55907jjbznxc0580x5f1lz6s"; + sha256 = "1fy717xy8csc89dnz3a8j96arq1s1vs8nakkkpcaqm1z1648didp"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 26db917c9002..fb0021cb709a 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -40,14 +40,17 @@ self = stdenv.mkDerivation rec { "PLAT=macosx" ] else [ "PLAT=linux" - ]) + ]) ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ + "CC=${stdenv.hostPlatform.config}-gcc" + "RANLIB=${stdenv.hostPlatform.config}-ranlib" + ] else []) ; configurePhase = '' runHook preConfigure makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) - makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}) + makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ea314789ce78..f65b4628e8c8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -17,7 +17,7 @@ let , withSystemd ? config.php.systemd or stdenv.isLinux , imapSupport ? config.php.imap or (!stdenv.isDarwin) , ldapSupport ? config.php.ldap or true - , mhashSupport ? config.php.mhash or true + , mhashSupport ? config.php.mhash or false , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true @@ -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/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index de980f1ca687..4e323898afbf 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,6 +79,12 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) + (fetchpatch { + url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch"; + name = "CVE-2018-20852.patch"; + sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb"; + }) + # Fix race-condition during pyc creation. Has a slight backwards # incompatible effect: pyc symlinks will now be overridden # (https://bugs.python.org/issue17222). Included in python >= 3.4, diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 2f398d8dccb0..60d067c1bf2c 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -21,6 +21,12 @@ , sha256 , passthruFun , bash +, stripConfig ? false +, stripIdlelib ? false +, stripTests ? false +, stripTkinter ? false +, rebuildBytecode ? true +, stripBytecode ? false }: assert x11Support -> tcl != null @@ -77,6 +83,8 @@ in with passthru; stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' + '' + optionalString (stdenv.isDarwin && x11Support) '' + substituteInPlace setup.py --replace /Library/Frameworks /no-such-path ''; patches = [ @@ -134,6 +142,7 @@ in with passthru; stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (openssl != null) [ "--with-openssl=${openssl.dev}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_buggy_getaddrinfo=no" @@ -221,8 +230,20 @@ in with passthru; stdenv.mkDerivation { find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + + '' + optionalString stripConfig '' + rm -R $out/bin/python*-config $out/lib/python*/config-* + '' + optionalString stripIdlelib '' + # Strip IDLE (and turtledemo, which uses it) + rm -R $out/bin/idle* $out/lib/python*/{idlelib,turtledemo} + '' + optionalString stripTkinter '' + rm -R $out/lib/python*/tkinter + '' + optionalString stripTests '' + # Strip tests + rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} + '' + '' # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + '' + optionalString rebuildBytecode '' # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails @@ -232,6 +253,8 @@ in with passthru; stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + '' + optionalString stripBytecode '' + find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" ''; preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -241,9 +264,9 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. - disallowedReferences = [ - openssl.dev - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + disallowedReferences = + stdenv.lib.optionals (openssl != null) [ openssl.dev ] + ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. pythonForBuild buildPackages.bash diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b3b506783cd2..bab7a047b15c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -111,29 +111,61 @@ in { inherit passthruFun; }; + # Minimal versions of Python (built without optional dependencies) + python3Minimal = (callPackage ./cpython { + self = python3Minimal; + sourceVersion = { + major = "3"; + minor = "7"; + patch = "4"; + suffix = ""; + }; + sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv"; + inherit (darwin) CF configd; + inherit passthruFun; + + # strip down that python version as much as possible + openssl = null; + readline = null; + ncurses = null; + gdbm = null; + sqlite = null; + stripConfig = true; + stripIdlelib = true; + stripTests = true; + stripTkinter = true; + rebuildBytecode = false; + stripBytecode = true; + }).overrideAttrs(old: { + pname = "python3-minimal"; + meta = old.meta // { + maintainers = []; + }; + }); + pypy27 = callPackage ./pypy { 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 +175,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 db7e51a51f32..3e86ddef4ed4 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, sqlite, openssl_1_0_2, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook # For the Python package set @@ -40,7 +40,7 @@ in with passthru; stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + bzip2 openssl_1_0_2 pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ lzma ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ @@ -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 1ac779ed25e3..af933f0a4bd0 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 d48cf841b048..2c45ba589767 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 1dfaf9a22860..518fc5f77b72 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 be5bd0ab3d3e..854798865704 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 33d00afd9e70..90fc38afa061 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/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix deleted file mode 100644 index 9e28bfd4fe2c..000000000000 --- a/pkgs/development/libraries/aacskeys/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{stdenv, fetchurl, openssl, jdk, premake3}: - -# Info on how to use / obtain aacs keys: -# http://vlc-bluray.whoknowsmy.name/ -# https://wiki.archlinux.org/index.php/BluRay - - -let baseName = "aacskeys"; - version = "0.4.0e"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; - - patchPhase = '' - substituteInPlace "premake.lua" \ - --replace "/usr/lib/jvm/java-6-sun/include" "${jdk}/include" - ''; - - src = fetchurl { - url = "http://deb-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz"; - sha256 = "0d3zvwixpkixfkkc16wj37h2xbcq5hsqqhqngzqr6pslmqr67vnr"; - }; - - buildInputs = [openssl jdk premake3]; - - installPhase = '' - mkdir -p $out/{bin,lib,share/${baseName}} - - # Install lib - install -Dm444 lib/linux/libaacskeys.so $out/lib - - # Install program - install -Dm555 bin/linux/aacskeys $out/bin - - # Install resources - install -Dm444 HostKeyCertificate.txt $out/share/${baseName} - install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName} - ''; - - meta = with stdenv.lib; { - homepage = http://forum.doom9.org/showthread.php?t=123311; - description = "A library and program to retrieve decryption keys for HD discs"; - platforms = platforms.linux; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index e0c46acb6303..75c942d4d487 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/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index 3ab4ed3e9623..e2d64841985c 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub }: agda.mkDerivation (self: rec { - version = "1.4.0"; + version = "1.5.0"; name = "agda-iowa-stdlib-${version}"; src = fetchFromGitHub { owner = "cedille"; repo = "ial"; rev = "v${version}"; - sha256 = "1gwxpybxwdj5ipbb3gapm7r5hfl3g6sj9kp13954pdmx8d5b0gma"; + sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g"; }; sourceDirectories = [ "./." ]; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index e3dcf765dfd4..a57ee6e08bae 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchgit }: agda.mkDerivation (self: rec { - version = "0dca24a81d417db2ae8fc871eccb7776f7eae952"; + version = "eacc961c2c312b7443109a7872f99d55557df317"; name = "agda-prelude-${version}"; src = fetchgit { url = "https://github.com/UlfNorell/agda-prelude.git"; rev = version; - sha256 = "0gwfgvj96i1mx5v01bi46h567d1q1fbgvzv6z8zv91l2jhybwff5"; + sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; }; topSourceDirectories = [ "src" ]; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index b6208eeeb510..4d071251ee8e 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "1.0.1"; + version = "1.1"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0ia7mgxs5g9849r26yrx07lrx65vhlrxqqh5b6d69gfi1pykb4j2"; + sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 9f8ca69a70f1..b267c62d6c70 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "allegro-${version}"; - version = "5.2.4.0"; + pname = "allegro"; + version = "5.2.5.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d"; + sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; }; buildInputs = [ @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { libpulseaudio libpthreadstubs ]; - patches = [ - # fix compilation with mesa 18.2.5 - (fetchpatch { - url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; - sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; - }) - ]; - postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f2b038aa3795..3b93a351f7f9 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 c4cbd970d411..7660ea81eaf8 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/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 6c3f3aa9fa29..2268d4389026 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2 - maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; + maintainers = gnome3.maintainers; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e5d5313eeb10..47c8c090d08f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2 - maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; + maintainers = gnome3.maintainers; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 0e1445ca9ee1..3552e335feda 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/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 76010dacc5e2..ee451818831c 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://avahi.org; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 globin ]; longDescription = '' Avahi is a system which facilitates service discovery on a local diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index eff6ff626325..d95797d5a5f6 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,15 +1,41 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, lcms2 +}: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.66"; + version = "0.1.72"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n"; + url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; }; - doCheck = true; + patches = [ + # Apple linker does not know --version-script flag + # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 + ./fix-darwin.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + ]; + + buildInputs = [ + lcms2 + ]; + + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "Image pixel format conversion library"; diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch new file mode 100644 index 000000000000..eaeff63689fc --- /dev/null +++ b/pkgs/development/libraries/babl/fix-darwin.patch @@ -0,0 +1,16 @@ +diff --git a/babl/meson.build b/babl/meson.build +index b551c9a..f452435 100644 +--- a/babl/meson.build ++++ b/babl/meson.build +@@ -24,9 +24,9 @@ + ] + + # Linker arguments +-babl_link_args = [ ++babl_link_args = cc.get_supported_link_arguments([ + '-Wl,--version-script,' + version_script, +-] ++]) + if platform_win32 + babl_link_args += '-Wl,--no-undefined' + endif diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 15744744067c..4a1ea3942077 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/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 2930ffa61e3c..832b070c8837 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { name = "cctz-${version}"; @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + installTargets = [ "install_hdrs" "install_shared_lib" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index bab0a84ca79a..3e6e62e5a967 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/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix new file mode 100644 index 000000000000..aaf409981024 --- /dev/null +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, boost } : + +stdenv.mkDerivation rec { + pname = "cm256cc"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "f4exb"; + repo = "cm256cc"; + rev = "v${version}"; + sha256 = "0d16y3lhdwr644am4sxqpshpbc3qik6dgr1w2c39vy75w9ff61a0"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + meta = with stdenv.lib; { + description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; + homepage = "https://github.com/f4exb/cm256cc"; + platforms = platforms.linux; + maintainers = with maintainers; [ alkeryn ]; + }; +} diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix new file mode 100644 index 000000000000..916ec5b703bb --- /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 74619cbaaaed..d8130d0b8f91 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/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 3d831efbcb7d..f7545bb03d56 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib +, libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: -let s = -rec { - version = "1.7.7"; - name="directfb-${version}"; - sha256 = "18r7h0pwbyyk8z3pgdv77nmma8lvr1si9gl1ghxgxf1ivhwcd1dp"; - url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz"; -} -; in -stdenv.mkDerivation { - inherit (s) name; - src = fetchurl { - inherit (s) url sha256; +stdenv.mkDerivation rec { + pname = "directfb"; + version = "1.7.7"; + + src = fetchFromGitHub { + owner = "deniskropp"; + repo = "DirectFB"; + rev = "DIRECTFB_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] - ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 (with xorg; [ + ++ lib.optional enableSDL SDL + ++ lib.optionals enableX11 (with xorg; [ xorgproto libX11 libXext libXrender ]); - NIX_LDFLAGS="-lgcc_s"; + NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ "--enable-sdl" @@ -35,14 +33,11 @@ stdenv.mkDerivation { "--enable-fbdev" "--enable-mmx" "--enable-sse" - #"--enable-sysfs" # not recognized "--with-software" "--with-smooth-scaling" - ] ++ stdenv.lib.optionals enableX11 [ - "--enable-x11" - ]; + ] ++ lib.optional enableX11 "--enable-x11"; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphics and input library designed with embedded systems in mind"; longDescription = '' DirectFB is a thin library that provides hardware graphics acceleration, @@ -54,7 +49,7 @@ stdenv.mkDerivation { power to embedded systems and sets a new standard for graphics under Linux. ''; - homepage = http://directfb.org/; + homepage = "https://github.com/deniskropp/DirectFB"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/directfb/default.upstream b/pkgs/development/libraries/directfb/default.upstream deleted file mode 100644 index ef4ed8e490d1..000000000000 --- a/pkgs/development/libraries/directfb/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url 'http://directfb.org/index.php?path=Main%2FDownloads' -version_link 'DirectFB-[0-9]' -minimize_overwrite diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 67a56855bb79..97d74e1ed3c8 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "19.16"; + version = "19.17"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; + sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029"; }; postPatch = '' diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2b..ec6f07f0953a 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -14,20 +14,15 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = version; - sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c"; + rev = "v${version}"; + sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; - patches = [ - # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments - ./fix-cmake.patch - ]; - cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { "doc" ]; - doCheck = stdenv.isLinux; + doCheck = true; # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. checkTarget = "tests"; @@ -72,6 +67,14 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString stdenv.isAarch64 '' rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} + + ${stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + # Removing tests depending on charset conversion + substituteInPlace ../test/Makefile --replace "conversions.sh" "" + rm -f ../tests/bugfixes/redmine/test_issue_460.py + rm -f ../tests/bugfixes/redmine/test_issue_662.py + ''} ''; postCheck = '' diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b904..000000000000 --- a/pkgs/development/libraries/exiv2/fix-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34087004..41b3a068 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -239,9 +239,9 @@ install(FILES - ${CMAKE_BINARY_DIR}/exiv2lib_export.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) - --install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - - # ****************************************************************************** - # exiv2 application diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 240f3c136ef5..332504e46b54 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, libosip, openssl, pkgconfig }: +{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { name = "libexosip2-${version}"; version = "4.1.0"; - + src = fetchurl { url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl ]; - + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch"; + sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6"; + }) + ]; + meta = with stdenv.lib; { license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; - platforms =platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index a37ebe7c5e06..77e26f6b5dc2 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-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 65a48890e496..28ab53feebdd 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -52,6 +52,7 @@ , bzip2 ? null , celt ? null # CELT decoder #, crystalhd ? null # Broadcom CrystalHD hardware acceleration +, dav1d ? null # AV1 decoder (focused on speed and correctness) #, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support , fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder #, flite ? null # Flite (voice synthesis) support @@ -97,7 +98,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder @@ -163,6 +164,9 @@ * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab * wavpack x265 xavs * + * Need fixes to support AArch64: + * libmfx(intel-media-sdk) nvenc + * * Not supported: * stagefright-h264(android only) * @@ -175,7 +179,7 @@ */ let - inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux; + inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; inherit (stdenv.lib) optional optionals optionalString enableFeature; in @@ -234,17 +238,14 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1.4"; + version = "4.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i"; + sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"; }; - patches = [(fetchpatch { # remove on update - name = "fix-hardcoded-tables.diff"; - url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; - sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; - })]; + + patches = [ ./prefer-libdav1d-over-libaom.patch ]; prePatch = '' patchShebangs . @@ -327,6 +328,7 @@ stdenv.mkDerivation rec { (enableFeature (bzip2 != null) "bzlib") (enableFeature (celt != null) "libcelt") #(enableFeature crystalhd "crystalhd") + (enableFeature (dav1d != null) "libdav1d") #(enableFeature decklinkExtlib "decklink") (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") #(enableFeature (flite != null) "libflite") @@ -351,7 +353,7 @@ stdenv.mkDerivation rec { (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (libiconv != null) "iconv") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - (enableFeature (if isLinux then libmfx != null else false) "libmfx") + (enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx") (enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") @@ -414,7 +416,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm + bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr @@ -424,7 +426,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] - ++ optional (isLinux && libmfx != null) libmfx + ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration diff --git a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch b/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch new file mode 100644 index 000000000000..789bfc2674fa --- /dev/null +++ b/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch @@ -0,0 +1,19 @@ +diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c +index d2f9a39ce5..2342399a8e 100644 +--- a/libavcodec/allcodecs.c ++++ b/libavcodec/allcodecs.c +@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder; + extern AVCodec ff_pcm_mulaw_at_decoder; + extern AVCodec ff_qdmc_at_decoder; + extern AVCodec ff_qdm2_at_decoder; ++extern AVCodec ff_libdav1d_decoder; + extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libaom_av1_encoder; + extern AVCodec ff_libaribb24_decoder; + extern AVCodec ff_libcelt_decoder; + extern AVCodec ff_libcodec2_encoder; + extern AVCodec ff_libcodec2_decoder; +-extern AVCodec ff_libdav1d_decoder; + extern AVCodec ff_libdavs2_decoder; + extern AVCodec ff_libfdk_aac_encoder; + extern AVCodec ff_libfdk_aac_decoder; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 3431943155e9..8fd2ce704982 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 79257fd6be50..407811736f83 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 4c4949b37be8..d29be4cb9304 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 49fcaa2b3f9b..746b4382864b 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 f987899e3bcb..85b222152d0a 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 0e259aebd8a5..4cee60be2d07 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 798e388b23c2..63ce0d12fe07 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 408198bda5cb..01363ffb7b34 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 5b8cc2d0383f..086114e11c30 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 3fba3db7a338..a2c3d41d35d1 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.07.22.00"; + version = "2019.08.05.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1vh5jrqz0lp6rc5fr6vk3yqss5vaycdsyap12mcr0cniv419fdxa"; + sha256 = "03arl9hg06rzbyaf3fzyk7q8d5mfbzfwmhqnfnvqcgzlqdj0gaa5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 1486b5bfc55a..909c504870f0 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 000000000000..347c57802403 --- /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 fca567d683dd..fa99dbe1d9fa 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/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix deleted file mode 100644 index 54ee7662d06e..000000000000 --- a/pkgs/development/libraries/gegl/3.0.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: - -stdenv.mkDerivation rec { - name = "gegl-0.3.34"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; - }; - - hardeningDisable = [ "format" ]; - - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 - ]; - - propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc - - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; - - meta = with stdenv.lib; { - description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; - license = licenses.gpl3; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 1bdcb7d8b28d..235cd1950713 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, librest +{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; - buildInputs = [ glib gnome3.gnome-online-accounts ]; + buildInputs = [ glib gnome-online-accounts ]; propagatedBuildInputs = [ libsoup json-glib librest ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 60778df663a0..d12b8a7c11d0 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/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 3ef279616f75..f01fb13c3c3e 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }: +{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { name = "globalplatform-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib openssl pcsclite ]; + buildInputs = [ zlib openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 10df82196c2e..87addaa99919 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }: +{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { name = "gppcscconnectionplugin-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ globalplatform openssl pcsclite ]; + buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 9ae4a572d93b..9ae4a572d93b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix new file mode 100644 index 000000000000..03799c1ef7c4 --- /dev/null +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, pkgconfig +, meson +, ninja +, gettext +, gnome3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-video-effects"; + version = "0.5.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; + }; + + patches = [ + # Fix effectsdir in .pc file + # https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14 + ./fix-pc-file.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "A collection of GStreamer effects to be used in different GNOME Modules"; + homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch new file mode 100644 index 000000000000..62b29e7d025a --- /dev/null +++ b/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -17,7 +17,7 @@ + # Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253 + conf = configuration_data() + conf.set('prefix', prefix) +-conf.set('datarootdir', pkgdatadir) ++conf.set('datarootdir', datadir) + conf.set('VERSION', meson.project_version()) + + pkg = configure_file(configuration: conf, diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e0a54052c23e..1b17f4c800f5 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 000000000000..7dd075e440e5 --- /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 44339c3dfedd..bc10c9f9bdd6 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/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 1072c8f2cbf0..3e21f3c229fa 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "graphene-hardened-malloc-${version}"; - version = "1"; + version = "2"; src = fetchurl { url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz"; - sha256 = "1z3kb9fr6w9fcdc42bh8k5b4r10sn5hrwwk4m691qjdgk5hlj3aa"; + sha256 = "0zsl4vl65ic6lw5rzcjzvcxg8makg683abnwvy60zfap8hvijvjb"; }; installPhase = '' diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch index d6a441e1577c..51bc206659d5 100644 --- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -1,34 +1,31 @@ -From c550bf4a41e9f86351b0a65ea3d6c9ab616e27c0 Mon Sep 17 00:00:00 2001 +From 2bf6614a6d7516e194e39eb691c05b486860153c Mon Sep 17 00:00:00 2001 From: worldofpeace <worldofpeace@protonmail.ch> Date: Thu, 16 May 2019 21:15:15 -0400 Subject: [PATCH] meson: add options for tests installation dirs --- - meson_options.txt | 6 ++++++ - src/tests/meson.build | 19 ++++++++++++++----- + meson_options.txt | 6 ++++++ + tests/meson.build | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index c938805..c1e9e95 100644 +index 578bdae..6f5fa23 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -19,6 +19,12 @@ option('arm_neon', type: 'boolean', - option('tests', type: 'boolean', +@@ -22,3 +22,9 @@ option('tests', type: 'boolean', + option('installed_tests', type: 'boolean', value: true, - description: 'Build the test suite (requires GObject)') + description: 'Install tests') +option('installed_test_datadir', type: 'string', + value: '', + description: 'Installation directory for data files in tests') +option('installed_test_bindir', type: 'string', + value: '', + description: 'Installation directory for binary files in tests') - option('benchmarks', type: 'boolean', - value: true, - description: 'Build the benchmarks suite (requires GObject)') -diff --git a/src/tests/meson.build b/src/tests/meson.build -index 62129c6..0186400 100644 ---- a/src/tests/meson.build -+++ b/src/tests/meson.build +diff --git a/tests/meson.build b/tests/meson.build +index 1f9bd0e..0253ac3 100644 +--- a/tests/meson.build ++++ b/tests/meson.build @@ -22,8 +22,17 @@ unit_tests = [ python = python3.find_python() gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') @@ -47,33 +44,33 @@ index 62129c6..0186400 100644 + test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix) +endif - foreach unit: unit_tests - wrapper = '@0@.test'.format(unit) -@@ -32,13 +41,13 @@ foreach unit: unit_tests - command: [ - python, - gen_installed_test, -- '--testdir=@0@'.format(installed_test_bindir), -+ '--testdir=@0@'.format(test_bindir), - '--testname=@0@'.format(unit), - '--outdir=@OUTDIR@', - '--outfile=@0@'.format(wrapper), - ], - install: true, -- install_dir: installed_test_datadir) -+ install_dir: test_datadir) - - exe = executable(unit, unit + '.c', - dependencies: graphene_dep, -@@ -50,7 +59,7 @@ foreach unit: unit_tests - '-DGLIB_DISABLE_DEPRECATION_WARNINGS', - ], - install: true, -- install_dir: installed_test_bindir) -+ install_dir: test_bindir) + # Make tests conditional on having mutest-1 installed system-wide, or + # available as a subproject +@@ -42,13 +51,13 @@ if mutest_dep.found() + command: [ + python, + gen_installed_test, +- '--testdir=@0@'.format(installed_test_bindir), ++ '--testdir=@0@'.format(test_bindir), + '--testname=@0@'.format(unit), + '--outdir=@OUTDIR@', + '--outfile=@0@'.format(wrapper), + ], + install: get_option('installed_tests'), +- install_dir: installed_test_datadir, ++ install_dir: test_datadir, + ) - test(unit, exe, args: [ '--tap', '-k' ]) - endforeach + test(unit, +@@ -57,7 +66,7 @@ if mutest_dep.found() + include_directories: graphene_inc, + c_args: common_cflags, + install: get_option('installed_tests'), +- install_dir: installed_test_bindir, ++ install_dir: test_bindir, + ), + env: ['MUTEST_OUTPUT=tap'], + protocol: 'tap', -- -2.21.0 +2.22.0 diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 253fce4ea0da..c439e763e73d 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -4,6 +4,8 @@ , meson , ninja , python3 +, mutest +, nixosTests , glib , gtk-doc , docbook_xsl @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.8.6"; + version = "1.9.6"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "1hdbdzcz86jrvsq5h954ph9q62m8jr2a5s5acklxhdkfqn5bkbv8"; + sha256 = "0hb7s6g00l7zlf4hlfda55krn0pls9ajz0hcqrh8m656zr18ddwa"; }; patches = [ @@ -41,17 +43,27 @@ stdenv.mkDerivation rec { meson ninja pkgconfig + gobject-introspection python3 ]; buildInputs = [ + glib gobject-introspection ]; checkInputs = [ - glib + mutest ]; + doCheck = true; + + passthru = { + tests = { + installedTests = nixosTests.graphene; + }; + }; + meta = with stdenv.lib; { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 118a910a1683..118a910a1683 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 33293f0b3cbd..b2a7f0bd5aef 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -48,7 +48,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/development/libraries/grilo/setup-hook.sh index 9337c520a207..9337c520a207 100644 --- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh +++ b/pkgs/development/libraries/grilo/setup-hook.sh diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 81e90154aa5b..78335e073edc 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.22.0"; + version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg"; + sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; - maintainers = [ maintainers.lnl7 ]; + maintainers = [ maintainers.lnl7 maintainers.marsam ]; homepage = https://grpc.io/; }; } diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix new file mode 100644 index 000000000000..6588b8ab4407 --- /dev/null +++ b/pkgs/development/libraries/gthree/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, ninja +, meson +, pkgconfig +, gobject-introspection +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, glib +, gtk3 +, graphene +, epoxy +, json-glib +}: + +stdenv.mkDerivation rec { + pname = "gthree"; + version = "unstable-2019-08-21"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "alexlarsson"; + repo = "gthree"; + rev = "dac46b0f35e29319c004c7e17b5f345ef4c04cb8"; + sha256 = "16ixis2g04000zffm44s7ir64vn3byz9a793g2s76aasqybl86i2"; + }; + + patches = [ + # correctly declare json-glib in .pc file + # https://github.com/alexlarsson/gthree/pull/61 + (fetchpatch { + url = https://github.com/alexlarsson/gthree/commit/784b1f20e0b6eb15f113a51f74c2cba871249861.patch; + sha256 = "07vxafaxris5a98w751aw04nlw0l45np1lba08xd16wdzmkadz0x"; + }) + ]; + + nativeBuildInputs = [ + ninja + meson + pkgconfig + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + ]; + + buildInputs = [ + epoxy + ]; + + propagatedBuildInputs = [ + glib + gtk3 + graphene + json-glib + ]; + + mesonFlags = [ + "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + ]; + + meta = with stdenv.lib; { + description = "GObject/GTK port of three.js"; + homepage = https://github.com/alexlarsson/gthree; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} 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 000000000000..4607f8b8ee09 --- /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 3728c05e516c..18e32585ce2a 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 b8de133f5025..4fa369e299d2 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,18 @@ in { }; }; + en-au = mkDictFromWordlist { + shortName = "en-au"; + shortDescription = "English (Australia)"; + dictFileName = "en_AU"; + src = fetchurl { + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip; + sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5"; + }; + }; + en_AU = en-au; + + en_GB-ise = en-gb-ise; en-gb-ise = mkDictFromWordlist { shortName = "en-gb-ise"; shortDescription = "English (United Kingdom, 'ise' ending)"; @@ -320,6 +334,7 @@ in { }; }; + en_GB-ize = en-gb-ize; en-gb-ize = mkDictFromWordlist { shortName = "en-gb-ize"; shortDescription = "English (United Kingdom, 'ize' ending)"; @@ -332,126 +347,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 +541,7 @@ in { /* ITALIAN */ + it_IT = it-it; it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; @@ -517,6 +554,7 @@ in { /* BASQUE */ + eu_ES = eu-es; eu-es = mkDictFromXuxen { shortName = "eu-es"; dictFileName = "eu_ES"; @@ -549,6 +587,7 @@ in { /* HUNGARIAN */ + hu_HU = hu-hu; hu-hu = mkDictFromLibreOffice { shortName = "hu-hu"; dictFileName = "hu_HU"; @@ -557,7 +596,8 @@ in { }; /* SWEDISH */ - + + sv_SE = sv-se; sv-se = mkDictFromDSSO rec { shortName = "sv-se"; dictFileName = "sv_SE"; @@ -565,26 +605,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,14 +637,15 @@ in { /* UKRAINIAN */ + uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; - version = "4.2.5"; - _version = "4-2.5"; + version = "4.6.3"; + _version = "4-6.3"; src = fetchurl { url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt"; - sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4"; + sha256 = "14rd07yx4fx2qxjr5xqc8qy151idd8k2hr5yi18d9r8gccnm9w50"; }; dictFileName = "uk_UA"; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 37d648bdf76b..1212d3817d4c 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 6e393ba02ce6..3577e7a8196d 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: stdenv.mkDerivation rec { - name = "itk-4.13.2"; + pname = "itk"; + version = "5.0.1"; - src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; - sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; + src = fetchFromGitHub { + owner = "InsightSoftwareConsortium"; + repo = "ITK"; + rev = "v${version}"; + sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; }; cmakeFlags = [ @@ -21,13 +24,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/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 95924050ff32..a085899d6e2b 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { - sha256 = "0n6vcbc43hdaxg5inl2b43bsksdkj3k0qxis6gkkclipivp8pz0p"; + sha256 = "0m2dm1gzwj0kwyl031bif89h3n4znml3m5n97hywlbra58ni8km1"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index f116360474e4..62d709733759 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libcacard-${version}"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; - sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2"; + sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 28d9152dcee7..f7e0a987b063 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.32.2"; + version = "3.32.3"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hgi7gnkna9n42nh7p81crrw0jjj22yr8acych60wxh6hzxqsgs1"; + sha256 = "1s37hv12ikfzhvh86qzgmfcjm3wvp12l2vsr0whl5xmm2harp3bc"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index db5448caa102..a5b178caf825 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdeflate-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "0kmp38s7vahvbgzzhs5v0bfyjgas1in7jn69gpyh70kl08279ly0"; + sha256 = "019xsz5dnbpxiz29j3zqsxyi4ksjkkygi6a2zyc8fxbm8lvaa9ar"; }; postPatch = '' diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index b09c2dd0f47e..6756a8dbc569 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 2a87994db5ef..9b6c1d505c1e 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.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk"; + sha256 = "15vzi95ibp6a9n4jjfs78z4b1iym8x1yv849gjipxzx64y5awyyb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 74b87a46ef0a..08ec1d84a3f0 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, libusb}: -stdenv.mkDerivation rec { +with stdenv; mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - configureFlags = [ "--with-async-mode" ]; + configureFlags = lib.optional (!isDarwin) [ "--with-async-mode" ]; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 48cfa098c9fa..f61283aec4a0 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -10,6 +10,7 @@ , glib , json-glib , gcr +, gnome-online-accounts , gobject-introspection , liboauth , gnome3 @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.gnome-online-accounts + gnome-online-accounts json-glib ]; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 08fce9c521ec..56f160838e66 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgig-${version}"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; - sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; + sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e87f535a1f74..0bb3af37eee1 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,23 +2,38 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.64.0"; - - name = "libgnurl-${version}"; + pname = "libgnurl"; + version = "7.65.3"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8"; + sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; - + buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; configureFlags = [ "--disable-ntlm-wb" "--without-ca-bundle" "--with-ca-fallback" + # below options will cause errors if enabled + "--disable-ftp" + "--disable-tftp" + "--disable-file" + "--disable-ldap" + "--disable-dict" + "--disable-rtsp" + "--disable-telnet" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--without-ssl" # disables only openssl, not ssl in general + "--without-libpsl" + "--without-librtmp" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 8616a0146755..cbedd97b2eec 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/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 5eac024f8315..23f46ad2a0cf 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "17qc2qbrnmaimxx9i3l30831hy890hp9s5a48iapni1dlr1z27p2"; + sha256 = "0x8ar31b0cp47dgmamxf6a54ixwrjgvs81zra8l9ws4szrzgrnbw"; }; buildInputs = [ kmod ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 83a500c13802..6464e4e58201 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 000000000000..32a2971b3e36 --- /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/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 9419046db4ed..51b2dd7c7bd6 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { notification facilities ''; license = licenses.zlib; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 371d7b838d40..191c375f3be8 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 b7d90100837c..767485a75154 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 313780a9f0f0..9870e024687c 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 46ea9fe6ee59..aba751bae5ce 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/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 182d642bc08d..e18de4127a4a 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmodbus-3.1.4"; + name = "libmodbus-3.1.6"; src = fetchurl { url = "http://libmodbus.org/releases/${name}.tar.gz"; - sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68"; + sha256 = "05kwz0n5gn9m33cflzv87lz3zp502yp8fpfzbx70knvfl6agmnfp"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix new file mode 100644 index 000000000000..bcd20c3b4076 --- /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 000000000000..174296375e08 --- /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 000000000000..ba77c7806b53 --- /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 000000000000..38ad5683692b --- /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 000000000000..a367872eec65 --- /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/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 222a0df055bb..38c6bb008634 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libndctl-${version}"; - version = "65"; + version = "66"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "0d8hzfvyxs2q8kgkwgdizlml41kin4mhx3vpdsjk34pfi7mqy69y"; + sha256 = "1pq1ss6b1lnyfnvdfhpi0x70jjrnm567fcyvkgvhmp2ndzsn393f"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index b971c8924f36..a040956f553c 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,44 +1,32 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl -, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl +, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll +, vala ? null }: stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz"; + sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala intltool gobject-introspection gtk-doc docbook_xsl + pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl ]; buildInputs = [ glib libsoup libxml2 libxslt ]; checkInputs = [ check curl perl ]; patches = [ - ./osinfo-db-data-dir.patch - # https://nvd.nist.gov/vuln/detail/CVE-2019-13313 - (fetchpatch { - url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch"; - name = "CVE-2019-13313-1.patch"; - sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn"; - }) - (fetchpatch { - url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch"; - name = "CVE-2019-13313-2.patch"; - sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z"; + (substituteAll { + src = ./osinfo-db-data-dir.patch; + osinfo_db_data_dir = "${osinfo-db}/share"; }) ]; - postPatch = '' - patchShebangs . - substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share" - ''; - configureFlags = [ "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch index 8d202a92d095..2197eca23d9d 100644 --- a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch +++ b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch @@ -5,7 +5,7 @@ path = g_getenv("OSINFO_SYSTEM_DIR"); if (!path) - path = DATA_DIR "/osinfo"; -+ path = "@OSINFO_DB_DATA_DIR@/osinfo"; ++ path = "@osinfo_db_data_dir@/osinfo"; file = g_file_new_for_path(path); } diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 791e4d890f93..885880c54c36 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libosmium-${version}"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "1v1m068lcjngxnwirpi0vqjhqnxn9gqvafjp3sy14vzmgl2sw2kr"; + sha256 = "1fh8wl4grs1c0g9whx90kd4jva3k9b6zbb1cl3isay489gwndgss"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 26694eb37770..bf516b33d02a 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/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index e68c5052beb8..34b396a71026 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 db8dfcf2eecb..3805965d11ca 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.25.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7"; + sha256 = "029qps0bbck0m2xj0mb5g3pgkk7a1zq8wcilfkvpx72sn7039xvw"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 82a71be52105..bcc3e16dae89 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/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index d710c41a97c1..7fbe25addc03 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -13,7 +13,15 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DENABLE_NC=ON" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DENABLE_NC=ON" + "-DBUILD_SHARED_LIBS=ON" + # Ensure that the output libraries do not require an executable stack. + # Without this define, assembly files in libcrypto do not include a + # .note.GNU-stack section, and if that section is missing from any object, + # the linker will make the stack executable. + "-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK" + ]; # The autoconf build is broken as of 2.9.1, resulting in the following error: # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'. @@ -41,7 +49,7 @@ let homepage = "https://www.libressl.org"; license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ]; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice fpletz globin ]; + maintainers = with maintainers; [ thoughtpolice fpletz ]; }; }; @@ -56,4 +64,9 @@ in { version = "2.9.2"; sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4"; }; + + libressl_3_0 = generic { + version = "3.0.0"; + sha256 = "0xiwri6xcnl3wb5nbc4aw8pv32s3hp13r9v465yr8wykaw211n81"; + }; } diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix new file mode 100644 index 000000000000..d4b112704284 --- /dev/null +++ b/pkgs/development/libraries/libspf2/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, autoreconfHook }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "libspf2"; + version = "1.2.10"; + + src = fetchurl { + url = "https://www.libspf2.org/spf/libspf2-${version}.tar.gz"; + sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr"; + }; + + patches = [ + (fetchurl { + name = "0001-gcc-variadic-macros.patch"; + url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; + sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk"; + }) + ]; + + postPatch = '' + # disable static bins compilation + sed -i \ + -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ + -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ + -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ + -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am + ''; + + # autoreconf necessary because we modified automake files + nativeBuildInputs = [ autoreconfHook ]; + + doCheck = true; + + meta = { + description = "Implementation of the Sender Policy Framework for SMTP authorization"; + homepage = https://www.libspf2.org; + license = with licenses; [ lgpl21Plus bsd2 ]; + maintainers = with maintainers; [ pacien ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix new file mode 100644 index 000000000000..ecfa3377c995 --- /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 5aa26a749e4f..6bfb694a41b7 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/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index ff88bdcaafd6..7d595db85dd1 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,16 +1,57 @@ { stdenv, fetchgit +, fetchpatch }: stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre156_${builtins.substring 0 7 src.rev}"; + version = "0.1"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "c31c7ec4bcd7bb0d7b28897d730431c02b9d4ea1"; - sha256 = "17d6s03fyajcrijca9d2d6llbf8cl8dyalpxnl39az3452p04s11"; + rev = "refs/tags/liburing-${version}"; + sha256 = "038iqsbm9bdmlwvmb899bc6g1rw5dalr990azynbvgn8qs5adysh"; }; + patches = [ + + # This patch re-introduces support for aarch64-linux, by adding the + # necessary memory barrier primitives for it to work. + # + # Already upstream: remove when moving to the next version + (fetchpatch { + url = "http://git.kernel.dk/cgit/liburing/patch/?id=0520db454c29f1d96cda6cf6cedeb93df65301e8"; + sha256 = "1i8133sb1imzxpplmhlhnaxkffgplhj40vanivc6clbibvhgwpq6"; + }) + + # This patch shuffles the name of the io_uring memory barrier primitives. + # They were using extremely common names by accident, which caused + # namespace conflicts with many other projects using the same names. Note: + # this does not change the user-visible API of liburing (liburing is + # designed exactly to hide the necessary memory barriers when using the + # io_uring syscall directly). It only changes the names of some internals. + # The only reason this caused problems at all is because memory barrier + # primitives are written as preprocessor defines, in a common header file, + # which get included unilaterally. + # + # Already upstream: remove when moving to the next version + (fetchpatch { + url = "http://git.kernel.dk/cgit/liburing/patch/?id=552c6a08d04c74d20eeaa86f535bfd553b352370"; + sha256 = "123d6jdqfy7b8aq9f6ax767n48hhbx6pln3nlrp623595i8zz3wf"; + }) + + # Finally, this patch fixes the aarch64-linux support introduced by the + # first patch, but which was _broken_ by the second patch, in a horrid + # twist of fate: it neglected to change the names of the aarch64 barriers + # appropriately. + # + # Already upstream: remove when moving to the next version + (fetchpatch { + url = "http://git.kernel.dk/cgit/liburing/patch/?id=6e9dd0c8c50b5988a0c77532c9c2bd6afd4790d2"; + sha256 = "11mqa1bp2pdfqh08gpcd98kg7lh3rrng41b4l1wvhxdbvg5rfw9c"; + }) + + ]; + separateDebugInfo = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 0ace54582ebc..3c7ed207703b 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/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 74c3d24560cd..9dd89133f4b9 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl , nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl -, xen, libapparmor, vala +, libapparmor, vala +, xenSupport ? false, xen ? null }: let @@ -19,7 +20,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libvirt glib libxml2 intltool libtool yajl nettle libgcrypt python pygobject2 gobject-introspection libcap_ng numactl libapparmor - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ stdenv.lib.optionals xenSupport [ xen ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c559d3f84071..125259a6bee9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation rec { binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace "$out/bin" '${gettext}/bin' \ --replace 'lock/subsys' 'lock' \ @@ -156,6 +157,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index a09e2cf2f72a..5cb1c673be50 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "libvisio-${version}"; - version = "0.1.6"; + version = "0.1.7"; outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; - sha256 = "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"; + sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; nativeBuildInputs = [ pkgconfig cppunit doxygen ]; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 7c1d58d2980f..144bde9a23a9 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; + sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; }; buildInputs = [ cmake openssl zlib libuv ]; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 9c35d3373505..29692c41c930 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 000000000000..42017a993b51 --- /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/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 9edb9b475e8a..4800a6c405c3 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,25 +1,65 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, docbook_xml_dtd_43 +, docbook_xsl +, glib +, gobject-introspection +, gtk-doc +, libuuid +, meson +, ninja +, pkgconfig +, python3 +, shared-mime-info +, nixosTests +}: stdenv.mkDerivation rec { - name = "libxmlb-${version}"; - version = "0.1.10"; + pname = "libxmlb"; + version = "0.1.11"; - outputs = [ "out" "lib" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; src = fetchFromGitHub { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd"; + sha256 = "1503v76w7543snqyjxykiqa5va62zb0ccn3jlw0gpdx8973v80mr"; }; - nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; + patches = [ + # Fix installed tests + # https://github.com/hughsie/libxmlb/pull/2 + (fetchpatch { + url = "https://github.com/hughsie/libxmlb/commit/78850c8b0f644f729fa21e2bf9ebed0d9d6010f3.diff"; + sha256 = "0zw7c6vy8hscln7za7ijqd9svirach3zdskvbzyxxcsm3xcwxpjm"; + }) - buildInputs = [ glib libuuid ]; + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gobject-introspection + gtk-doc + meson + ninja + pkgconfig + (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + shared-mime-info + ]; + + buildInputs = [ + glib + libuuid + ]; mesonFlags = [ "--libexecdir=${placeholder "out"}/libexec" "-Dgtkdoc=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; preCheck = '' @@ -28,6 +68,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + tests = { + installed-tests = nixosTests.libxmlb; + }; + }; + meta = with stdenv.lib; { description = "A library to help create and query binary XML blobs"; homepage = https://github.com/hughsie/libxmlb; diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch new file mode 100644 index 000000000000..ab36d9efad89 --- /dev/null +++ b/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index b064cb8..1a470cf 100644 +--- a/meson.build ++++ b/meson.build +@@ -103,8 +103,8 @@ + + libexecdir = join_paths(prefix, get_option('libexecdir')) + datadir = join_paths(prefix, get_option('datadir')) +-installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) +-installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) ++installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) ++installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + + gio = dependency('gio-2.0', version : '>= 2.45.8') + uuid = dependency('uuid') +diff --git a/meson_options.txt b/meson_options.txt +index 27e8cb6..74548ae 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,4 @@ + option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') + option('tests', type : 'boolean', value : true, description : 'enable tests') + option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 2ad017dc90be..215535fb8f13 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc + propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index bf5b7bb1d0da..ff77cd71265e 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.08.16"; 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 = "1y77dc5qxd731w96x707iibavmkfayy5s557d7lasg742h36lcqv"; }; postPatch = '' diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/pkgs/development/libraries/luaffi/darwin.patch deleted file mode 100644 index 50db81b776d7..000000000000 --- a/pkgs/development/libraries/luaffi/darwin.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Makefile b/Makefile -index b2b5f2c..b690a5d 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,10 +18,10 @@ test: - if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi - - macosx: -- $(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" -+ $(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" - - test_macosx: -- $(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" -+ $(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" - - posix: $(MODSO) test_cdecl.so - diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix deleted file mode 100644 index 065562ac82ec..000000000000 --- a/pkgs/development/libraries/luaffi/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, lua, pkgconfig }: - -stdenv.mkDerivation { - name = "luaffi-2013-11-08"; - src = fetchFromGitHub { - owner = "jmckaskill"; - repo = "luaffi"; - rev = "abc638c9341025580099dcf77795c4b320ba0e63"; - sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lua ]; - - patches = [ ./darwin.patch ./makefile-errors.patch ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - installPhase = '' - mkdir -p $out/lib - cp ffi.so $out/lib/ffi.so - ''; - - meta = with stdenv.lib; { - description = "Standalone FFI library for calling C functions from lua. Compatible with the luajit FFI interface."; - homepage = https://github.com/jmckaskill/luaffi; - maintainers = with maintainers; [ ma27 ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/luaffi/makefile-errors.patch b/pkgs/development/libraries/luaffi/makefile-errors.patch deleted file mode 100644 index 0ee6e6390068..000000000000 --- a/pkgs/development/libraries/luaffi/makefile-errors.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index b2b5f2c..49d4c99 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ LUA=lua - LUA_CFLAGS=`$(PKG_CONFIG) --cflags lua5.2 2>/dev/null || $(PKG_CONFIG) --cflags lua` - SOCFLAGS=-fPIC - SOCC=$(CC) -shared $(SOCFLAGS) --CFLAGS=-fPIC -g -Wall -Werror $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99 -+CFLAGS=-fPIC -g -Wall $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99 - - MODNAME=ffi - MODSO=$(MODNAME).so diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 16502ca4e612..cdc3dfa5ca0b 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"; + sha256 = "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l"; }; postInstall = '' diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix new file mode 100644 index 000000000000..423a93b69a80 --- /dev/null +++ b/pkgs/development/libraries/mutest/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "mutest"; + version = "unstable-2019-08-26"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "ebassi"; + repo = "mutest"; + rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a"; + sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q"; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://ebassi.github.io/mutest/mutest.md.html; + description = "A BDD testing framework for C, inspired by Mocha"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar worldofpeace ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b667dea8d49f..91318c802d8f 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/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 931ecc186be6..f3e8742bb207 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: -stdenv.mkDerivation rec { - name = "odpic-${version}"; - version = "3.1.0"; +let + version = "3.2.1"; + libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ]; - src = fetchurl { - url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz"; - sha256 = "0m6g7lbvfir4amf2cnap9wz9fmqrihqpihd84igrd7fp076894c0"; +in stdenv.mkDerivation { + inherit version; + + pname = "odpic"; + + src = fetchFromGitHub { + owner = "oracle"; + repo = "odpi"; + rev = "v${version}"; + sha256 = "1f9gznc7h73cgx32p55rkhzla6l7l9dg53ilwh6zdgdqlp7n018i"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -14,15 +21,12 @@ stdenv.mkDerivation rec { buildInputs = [ oracle-instantclient ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; - libPath = stdenv.lib.makeLibraryPath - [ oracle-instantclient ]; - dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; postFixup = '' ${stdenv.lib.optionalString (stdenv.isLinux) '' - patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} ${stdenv.lib.optionalString (stdenv.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index b54f34fbb2c3..e64d21c87ed0 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.9.2"; + version = "6.9.3"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "15asc9v6ylal8fwzlnrh673mp62wngxvv9jx7h86vhljjdap6yfc"; + sha256 = "0wzmqpjmxpryk83acbyhl9gwgm43ixbwraga2g5li9kx88mv4k0n"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 85bb2f1effd9..3fdc392e92b8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub +, fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -160,6 +160,14 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; + patches = [ + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/5691d998ead1d9b0542bcfced36c2dceb3a59023.patch"; + name = "CVE-2019-14493.patch"; + sha256 = "14qva9f5z10apz5q0skdyiclr9sgkhab4fzksy1w3b6j6hg4wm7m"; + }) + ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 3d110910b159..71885ba46f10 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter -, perl, makeWrapper }: +, autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { name = "opendkim-${version}"; @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ libbsd openssl libmilter perl ]; + patches = [ ./openssl-1.1.patch ]; + postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ --prefix PATH : ${openssl.bin}/bin diff --git a/pkgs/development/libraries/opendkim/openssl-1.1.patch b/pkgs/development/libraries/opendkim/openssl-1.1.patch new file mode 100644 index 000000000000..c36559cf16cd --- /dev/null +++ b/pkgs/development/libraries/opendkim/openssl-1.1.patch @@ -0,0 +1,81 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -864,26 +864,28 @@ + AC_SEARCH_LIBS([ERR_peek_error], [crypto], , + AC_MSG_ERROR([libcrypto not found])) + +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- [ +- if test x"$enable_shared" = x"yes" +- then +- AC_MSG_ERROR([Cannot build shared opendkim +- against static openssl libraries. +- Configure with --disable-shared +- to get this working or obtain a +- shared libssl library for +- opendkim to use.]) +- fi +- +- # avoid caching issue - last result of SSL_library_init +- # shouldn't be cached for this next check +- unset ac_cv_search_SSL_library_init +- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- AC_MSG_ERROR([libssl not found]), [-ldl]) +- ] +- ) ++ ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], ++ [[SSL_library_init();]])], ++ [od_have_ossl="yes";], ++ [od_have_ossl="no";]) ++ if test x"$od_have_ossl" = x"no" ++ then ++ if test x"$enable_shared" = x"yes" ++ then ++ AC_MSG_ERROR([Cannot build shared opendkim ++ against static openssl libraries. ++ Configure with --disable-shared ++ to get this working or obtain a ++ shared libssl library for ++ opendkim to use.]) ++ fi ++ ++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" ++ AC_SEARCH_LIBS([SSL_library_init], [ssl], , ++ AC_MSG_ERROR([libssl not found]), [-ldl]) ++ fi + + AC_CHECK_DECL([SHA256_DIGEST_LENGTH], + AC_DEFINE([HAVE_SHA256], 1, +--- a/opendkim/opendkim-crypto.c ++++ b/opendkim/opendkim-crypto.c +@@ -222,7 +222,11 @@ + { + assert(pthread_setspecific(id_key, ptr) == 0); + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ OPENSSL_thread_stop(); ++#else + ERR_remove_state(0); ++#endif + + free(ptr); + +@@ -392,11 +396,15 @@ + { + if (crypto_init_done) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ OPENSSL_thread_stop(); ++#else + CRYPTO_cleanup_all_ex_data(); + CONF_modules_free(); + EVP_cleanup(); + ERR_free_strings(); + ERR_remove_state(0); ++#endif + + if (nmutexes > 0) + { diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 659c4fb7cff6..9488ef484c6f 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig +, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib +}: stdenv.mkDerivation rec { name = "opensaml-cpp-${version}"; - version = "2.6.1"; + version = "3.0.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-opensaml.git"; rev = version; - sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx"; + sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; }; - buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; - nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix new file mode 100644 index 000000000000..d1a20552ff76 --- /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/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index fe260e0c2ad2..06b9e360d1a3 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,71 +1,126 @@ -{ stdenv, requireFile, autoPatchelfHook, fixDarwinDylibNames, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }: +{ stdenv +, fetchurl +, requireFile +, autoPatchelfHook +, fixDarwinDylibNames +, unzip +, libaio +, makeWrapper +, odbcSupport ? true +, unixODBC +}: assert odbcSupport -> unixODBC != null; let inherit (stdenv.lib) optional optionals optionalString; - baseVersion = "12.2"; - version = "${baseVersion}.0.1.0"; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - requireSource = component: arch: version: rel: hash: (requireFile rec { - name = "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + ".zip"; - url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html"; - sha256 = hash; - }); + # assemble list of components + components = [ "basic" "sdk" "sqlplus" ] ++ optional odbcSupport "odbc"; - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + # determine the version number, there might be different ones per architecture + version = { + "x86_64-linux" = "19.3.0.0.0"; + "x86_64-darwin" = "18.1.0.0.0"; + }."${stdenv.hostPlatform.system}" or throwSystem; + + # hashes per component and architecture + hashes = { + "x86_64-linux" = { + "basic" = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; + "sdk" = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; + "sqlplus" = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; + "odbc" = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; + }; + "x86_64-darwin" = { + "basic" = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0"; + "sdk" = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a"; + "sqlplus" = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b"; + "odbc" = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2"; + }; + }."${stdenv.hostPlatform.system}" or throwSystem; + + # rels per component and architecture, optional + rels = { + "x86_64-darwin" = { + "sdk" = "2"; + }; + }."${stdenv.hostPlatform.system}" or {}; + # convert platform to oracle architecture names arch = { "x86_64-linux" = "linux.x64"; "x86_64-darwin" = "macos.x64"; }."${stdenv.hostPlatform.system}" or throwSystem; - srcs = { - "x86_64-linux" = [ - (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194") - (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb") - (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ] - ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); - "x86_64-darwin" = [ - (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9") - (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b") - (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ] - ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); - }."${stdenv.hostPlatform.system}" or throwSystem; + # calculate the filename of a single zip file + srcFilename = component: arch: version: rel: + "instantclient-${component}-${arch}-${version}" + + (optionalString (rel != "") "-${rel}") + + (optionalString (arch == "linux.x64") "dbru") + # ¯\_(ツ)_/¯ + ".zip"; + + # fetcher for the clickthrough artifacts (requiring manual download) + fetchClickThrough = srcFilename: hash: (requireFile { + name = srcFilename; + url = "https://www.oracle.com/database/technologies/instant-client/downloads.html"; + sha256 = hash; + }); + # fetcher for the non clickthrough artifacts + fetchSimple = srcFilename: hash: fetchurl { + url = "https://download.oracle.com/otn_software/linux/instantclient/193000/${srcFilename}"; + sha256 = hash; + }; + + # pick the appropriate fetcher depending on the platform + fetcher = if stdenv.hostPlatform.system == "x86_64-linux" then fetchSimple else fetchClickThrough; + + # assemble srcs + srcs = map (component: + (fetcher (srcFilename component arch version rels."${component}" or "") hashes."${component}" or "")) + components; + + pname = "oracle-instantclient"; extLib = stdenv.hostPlatform.extensions.sharedLibrary; -in stdenv.mkDerivation rec { - inherit version srcs; - name = "oracle-instantclient-${version}"; +in stdenv.mkDerivation { + inherit pname version srcs; buildInputs = [ stdenv.cc.cc.lib ] - ++ optionals (stdenv.isLinux) [ libaio ] + ++ optional stdenv.isLinux libaio ++ optional odbcSupport unixODBC; nativeBuildInputs = [ makeWrapper unzip ] ++ optional stdenv.isLinux autoPatchelfHook ++ optional stdenv.isDarwin fixDarwinDylibNames; + outputs = [ "out" "dev" "lib"]; + unpackCmd = "unzip $curSrc"; installPhase = '' - mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} - install -Dm755 {sqlplus,adrci,genezi} $out/bin - ${optionalString stdenv.isDarwin '' - for exe in "$out/bin/"* ; do - install_name_tool -add_rpath "$out/lib" "$exe" - done - ''} - ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 - install -Dm644 *${extLib}* $out/lib + mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib + install -Dm755 {adrci,genezi,uidrvci,sqlplus} $out/bin + + # cp to preserve symlinks + cp -P *${extLib}* $lib/lib + install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include - install -Dm644 sdk/demo/* $out/share/${name}/demo + install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo + + # provide alias + ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 + ''; - # PECL::oci8 will not build without this - # this symlink only exists in dist zipfiles for some platforms - ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib} + postFixup = optionalString stdenv.isDarwin '' + for exe in "$out/bin/"* ; do + if [ ! -L "$exe" ]; then + install_name_tool -add_rpath "$lib/lib" "$exe" + fi + done ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 30b56afb8a95..d542c6cf1d77 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 b935a3d56ea9..d61a68ebe341 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 836a56558691..836a56558691 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 2e17e49dcdb1..e6b351c206df 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { name = "pythia-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { 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 c8dae0c2b51a..c068424e416e 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 046413c64f49..272761977bae 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 54a563c518fc..3f6a609121a1 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/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 68ddf5c91d17..e766657c19a4 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/protobuf/3.9.nix b/pkgs/development/libraries/protobuf/3.9.nix index 6652ba7648c5..a2f3e0e01646 100644 --- a/pkgs/development/libraries/protobuf/3.9.nix +++ b/pkgs/development/libraries/protobuf/3.9.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.9.0"; - sha256 = "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw"; + version = "3.9.1"; + sha256 = "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h"; } diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index a18d768c288c..25e0f14d026b 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "protozero-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "mapbox"; repo = "protozero"; rev = "v${version}"; - sha256 = "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3"; + sha256 = "1hfijpfylf1c71wa3mk70gjc88b6k1q7cxb87cwqdflw5q2x8ma6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index aa17771ec9f2..b4571d07fbf3 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 c315cb8f72b4..b2173ec21ee1 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/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index d1dcc5fdb97a..e7abedf31214 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; }) + (fetchpatch { + name = "openssl-1.1.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.patch?h=packages/ptlib&id=1dfa9f55e7e030d261228fca27dda82979ca7f30"; + sha256 = "11hdgyyibycg0wf5ls0wk9hksa4jd434i86xqiccbyg17n4l6lc1"; + }) ./ptlib-2.10.11-glibc-2.26.patch ]; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index ec32c44a91fc..885b7b378cc3 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt, darwin }: +{ stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { name = "qca-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt ] + buildInputs = [ openssl_1_0_2 qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; enableParallelBuilding = true; 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 de6457db98b2..8c1c76db8f47 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,14 @@ 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"; - }) + # Patches are 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 + ./qt4-openssl-1.1.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 000000000000..000e345cf132 --- /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-4.x/4.8/qt4-openssl-1.1.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch new file mode 100644 index 000000000000..1931ceb0c749 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch @@ -0,0 +1,398 @@ +--- a/src/network/ssl/qsslcertificate.cpp ++++ b/src/network/ssl/qsslcertificate.cpp +@@ -259,10 +259,10 @@ + QByteArray QSslCertificate::version() const + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); +- if (d->versionString.isEmpty() && d->x509) ++ if (d->versionString.isEmpty() && d->x509) { + d->versionString = +- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); +- ++ QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); ++ } + return d->versionString; + } + +@@ -276,7 +276,7 @@ + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); + if (d->serialNumberString.isEmpty() && d->x509) { +- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; ++ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); + // if we cannot convert to a long, just output the hexadecimal number + if (serialNumber->length > 4) { + QByteArray hexString; +@@ -489,24 +489,33 @@ + QSslKey key; + + key.d->type = QSsl::PublicKey; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + X509_PUBKEY *xkey = d->x509->cert_info->key; ++#else ++ X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509); ++#endif + EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); + Q_ASSERT(pkey); + +- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { ++ int key_id; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ key_id = q_EVP_PKEY_type(pkey->type); ++#else ++ key_id = q_EVP_PKEY_base_id(pkey); ++#endif ++ if (key_id == EVP_PKEY_RSA) { + key.d->rsa = q_EVP_PKEY_get1_RSA(pkey); + key.d->algorithm = QSsl::Rsa; + key.d->isNull = false; +- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { ++ } else if (key_id == EVP_PKEY_DSA) { + key.d->dsa = q_EVP_PKEY_get1_DSA(pkey); + key.d->algorithm = QSsl::Dsa; + key.d->isNull = false; +- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) { ++ } else if (key_id == EVP_PKEY_DH) { + // DH unsupported + } else { + // error? + } +- + q_EVP_PKEY_free(pkey); + return key; + } +--- a/src/network/ssl/qsslkey.cpp ++++ b/src/network/ssl/qsslkey.cpp +@@ -321,8 +321,19 @@ + { + if (d->isNull) + return -1; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + return (d->algorithm == QSsl::Rsa) + ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p); ++#else ++ if (d->algorithm == QSsl::Rsa) { ++ return q_RSA_bits(d->rsa); ++ }else{ ++ BIGNUM *p = NULL; ++ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); ++ return q_BN_num_bits(p); ++ } ++#endif ++ + } + + /*! +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -93,6 +93,7 @@ + bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; + bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* \internal + + From OpenSSL's thread(3) manual page: +@@ -174,6 +175,8 @@ + } + } // extern "C" + ++#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L ++ + QSslSocketBackendPrivate::QSslSocketBackendPrivate() + : ssl(0), + ctx(0), +@@ -222,9 +225,12 @@ + ciph.d->encryptionMethod = descriptionList.at(4).mid(4); + ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export")); + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ciph.d->bits = cipher->strength_bits; + ciph.d->supportedBits = cipher->alg_bits; +- ++#else ++ ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits); ++#endif + } + return ciph; + } +@@ -367,7 +373,7 @@ + // + // See also: QSslContext::fromConfiguration() + if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) { +- q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle()); ++ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle()); + } + } + +@@ -504,8 +510,10 @@ + */ + void QSslSocketPrivate::deinitialize() + { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + q_CRYPTO_set_id_callback(0); + q_CRYPTO_set_locking_callback(0); ++#endif + } + + /*! +@@ -526,13 +534,17 @@ + return false; + + // Check if the library itself needs to be initialized. ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + QMutexLocker locker(openssl_locks()->initLock()); ++#endif + if (!s_libraryLoaded) { + s_libraryLoaded = true; + + // Initialize OpenSSL. ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + q_CRYPTO_set_id_callback(id_function); + q_CRYPTO_set_locking_callback(locking_function); ++#endif + if (q_SSL_library_init() != 1) + return false; + q_SSL_load_error_strings(); +@@ -571,7 +583,9 @@ + + void QSslSocketPrivate::ensureCiphersAndCertsLoaded() + { +- QMutexLocker locker(openssl_locks()->initLock()); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ QMutexLocker locker(openssl_locks()->initLock()); ++#endif + if (s_loadedCiphersAndCerts) + return; + s_loadedCiphersAndCerts = true; +@@ -663,13 +677,18 @@ + STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl); + for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) { + if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) { +- if (cipher->valid) { ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ if (cipher->valid) { ++#endif + QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher); + if (!ciph.isNull()) { + if (!ciph.name().toLower().startsWith(QLatin1String("adh"))) + ciphers << ciph; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + } ++#endif + } + } + +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -290,6 +290,22 @@ + DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) + DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) + DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) ++DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return) ++ ++DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return) ++DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return) ++DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return) ++DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return) ++DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return) ++DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return) ++DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return) ++DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) ++DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return) ++#endif + + #ifdef Q_OS_SYMBIAN + #define RESOLVEFUNC(func, ordinal, lib) \ +@@ -801,6 +817,7 @@ + RESOLVEFUNC(SSL_CTX_use_PrivateKey) + RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) + RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) ++ RESOLVEFUNC(SSL_CTX_get_cert_store) + RESOLVEFUNC(SSL_accept) + RESOLVEFUNC(SSL_clear) + RESOLVEFUNC(SSL_connect) +@@ -823,6 +840,23 @@ + RESOLVEFUNC(SSL_set_connect_state) + RESOLVEFUNC(SSL_shutdown) + RESOLVEFUNC(SSL_write) ++ ++ RESOLVEFUNC(X509_get_serialNumber) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ RESOLVEFUNC(SSL_CTX_ctrl) ++ RESOLVEFUNC(EVP_PKEY_id) ++ RESOLVEFUNC(EVP_PKEY_base_id) ++ RESOLVEFUNC(SSL_CIPHER_get_bits) ++ RESOLVEFUNC(SSL_CTX_set_options) ++ RESOLVEFUNC(X509_get_version) ++ RESOLVEFUNC(X509_get_X509_PUBKEY) ++ RESOLVEFUNC(RSA_bits) ++ RESOLVEFUNC(DSA_security_bits) ++ RESOLVEFUNC(DSA_get0_pqg) ++ RESOLVEFUNC(X509_get_notAfter) ++ RESOLVEFUNC(X509_get_notBefore) ++#endif ++ + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) + #endif +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -399,7 +399,25 @@ + PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ + bp,(char *)x,enc,kstr,klen,cb,u) + #endif ++ ++X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx); ++ASN1_INTEGER * q_X509_get_serialNumber(X509 *x); ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) ++#define q_X509_get_version(x) X509_get_version(x) ++#else ++int q_EVP_PKEY_id(const EVP_PKEY *pkey); ++int q_EVP_PKEY_base_id(const EVP_PKEY *pkey); ++int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits); ++long q_SSL_CTX_set_options(SSL_CTX *ctx, long options); ++long q_X509_get_version(X509 *x); ++X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x); ++int q_RSA_bits(const RSA *rsa); ++int q_DSA_security_bits(const DSA *dsa); ++void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g); ++#endif ++ + #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) + #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) + #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) +@@ -410,8 +428,15 @@ + #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) + #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ + q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #define q_X509_get_notAfter(x) X509_get_notAfter(x) + #define q_X509_get_notBefore(x) X509_get_notBefore(x) ++#else ++ASN1_TIME *q_X509_get_notAfter(X509 *x); ++ASN1_TIME *q_X509_get_notBefore(X509 *x); ++#endif ++ + #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ + (char *)(rsa)) + #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp.omv~ 2017-03-15 02:27:18.143322736 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2017-03-15 02:29:56.215819741 +0100 +@@ -696,7 +696,7 @@ + unsigned char *data = 0; + int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); + info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size); +- q_CRYPTO_free(data); ++ q_OPENSSL_free(data); + } + return info; + } +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp.0131~ 2017-03-15 02:22:37.053244125 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2017-03-15 02:22:37.055244057 +0100 +@@ -328,7 +328,7 @@ + if (d->algorithm == QSsl::Rsa) { + return q_RSA_bits(d->rsa); + }else{ +- BIGNUM *p = NULL; ++ const BIGNUM *p = NULL; + q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); + return q_BN_num_bits(p); + } +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.0131~ 2017-03-15 02:22:37.054244091 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-03-15 02:29:41.155236836 +0100 +@@ -111,16 +111,16 @@ + DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); + DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) + DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) +-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) ++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) + DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) + DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) +-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) + DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) + DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) + DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) + DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) +-DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) ++DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG) + DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) + #if OPENSSL_VERSION_NUMBER < 0x00908000L + DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return) +@@ -300,7 +300,7 @@ + DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) + DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) + DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) +-DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return) ++DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return) + #endif + + #ifdef Q_OS_SYMBIAN +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h.0131~ 2017-03-15 02:22:37.054244091 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-03-15 02:29:50.192986268 +0100 +@@ -59,6 +59,9 @@ + QT_BEGIN_NAMESPACE + + #define DUMMYARG ++#ifndef OPENSSL_NO_SSL2 ++#define OPENSSL_NO_SSL2 1 ++#endif + + #if !defined QT_LINKED_OPENSSL + // **************** Shared declarations ****************** +@@ -207,16 +210,16 @@ + int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); + long q_BIO_ctrl(BIO *a, int b, long c, void *d); + int q_BIO_free(BIO *a); +-BIO *q_BIO_new(BIO_METHOD *a); ++BIO *q_BIO_new(const BIO_METHOD *a); + BIO *q_BIO_new_mem_buf(void *a, int b); + int q_BIO_read(BIO *a, void *b, int c); +-BIO_METHOD *q_BIO_s_mem(); ++const BIO_METHOD *q_BIO_s_mem(); + int q_BIO_write(BIO *a, const void *b, int c); + int q_BN_num_bits(const BIGNUM *a); + int q_CRYPTO_num_locks(); + void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); + void q_CRYPTO_set_id_callback(unsigned long (*a)()); +-void q_CRYPTO_free(void *a); ++void q_OPENSSL_free(void *a); + void q_DSA_free(DSA *a); + #if OPENSSL_VERSION_NUMBER >= 0x00908000L + // 0.9.8 broke SC and BC by changing this function's signature. +@@ -326,7 +329,6 @@ + void q_SSL_set_connect_state(SSL *a); + int q_SSL_shutdown(SSL *a); + #if OPENSSL_VERSION_NUMBER >= 0x10000000L +-const SSL_METHOD *q_SSLv2_client_method(); + const SSL_METHOD *q_SSLv3_client_method(); + const SSL_METHOD *q_SSLv23_client_method(); + const SSL_METHOD *q_TLSv1_client_method(); +@@ -335,7 +337,6 @@ + const SSL_METHOD *q_SSLv23_server_method(); + const SSL_METHOD *q_TLSv1_server_method(); + #else +-SSL_METHOD *q_SSLv2_client_method(); + SSL_METHOD *q_SSLv3_client_method(); + SSL_METHOD *q_SSLv23_client_method(); + SSL_METHOD *q_TLSv1_client_method(); +@@ -415,7 +416,7 @@ + X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x); + int q_RSA_bits(const RSA *rsa); + int q_DSA_security_bits(const DSA *dsa); +-void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g); ++void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); + #endif + + #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 67c5047e5078..7f0937db30f0 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 1fbf7b57289f..1bc63d0e2b9d 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 deleted file mode 100644 index 4f739b57ffec..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ /dev/null @@ -1,194 +0,0 @@ -/* - -# New packages - -READ THIS FIRST - -This module is for official packages in Qt 5. All available packages are listed -in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see below). - -IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. - -Many of the packages released upstream are not yet built in Nixpkgs due to lack -of demand. To add a Nixpkgs build for an upstream package, copy one of the -existing packages here and modify it as necessary. - -# Updates - -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. - -*/ - -{ - newScope, - stdenv, fetchurl, fetchpatch, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, libGL, perl, - gstreamer, gst-plugins-base, - - # options - developerBuild ? false, - decryptSslTraffic ? false, - debug ? false, -}: - -with stdenv.lib; - -let - - qtCompatVersion = "5.6"; - - mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; - - patches = { - qtbase = [ - ./qtbase.patch - ./qtbase-fixguicmake.patch - (fetchpatch { - name = "CVE-2018-15518.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=28a6e642af2ccb454dd019f551c2908753f76f08"; - sha256 = "0nyssg7d0br7qgzp481f1w8b4p1bj2ggv9iyfrm1mng5v9fypdd7"; - }) - (fetchpatch { - name = "CVE-2018-19873.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c9b9f663d7243988bcb5fee9180ea9cb3a321a86"; - sha256 = "1q01cafy92c1j8cgrv4sk133mi3d48x8kbg3glbnnbijpc4k6di5"; - }) - (fetchpatch { - name = "CVE-2018-19870.patch"; - url = "http://code.qt.io/cgit/qt/qtbase.git/patch/?id=ac0a910756f91726e03c0e6a89d213bdb4f48fec"; - sha256 = "00qb9yqwvwnp202am3lqirkjxln1cj8v4wvmlyqya6hna176lj2l"; - }) - ]; - qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ ./qtscript.patch ]; - qtserialport = [ ./qtserialport.patch ]; - qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-seccomp.patch ]; - qtwebkit = [ ./qtwebkit.patch ]; - qtvirtualkeyboard = [ - (fetchpatch { - name = "CVE-2018-19865-A.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c02115db1de1f3aba81e109043766d600f886522"; - sha256 = "0ncnyl8f3ypi1kcb9z2i8j33snix111h28njrx8rb49ny01ap8x2"; - }) - (fetchpatch { - name = "CVE-2018-19865-B.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=01fc537adc74d5e102c8cc93384cdf5cb08b4442"; - sha256 = "19z8kxqf2lpjqr8189ingrpadch4niviw3p5v93zgx24v7950q27"; - }) - (fetchpatch { - name = "CVE-2018-19865-C.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=993a21ba03534b172d5354405cc9d50a2a822e24"; - sha256 = "1bipqxr9bvy8z402pv9kj2w1yzcsj1v03l09pg5jyg1xh6jbgiky"; - }) - ]; - qtimageformats = [ - (fetchpatch { - name = "CVE-2018-19871.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtimageformats.git;a=patch;h=9299ab07df61c56b70e047f1fe5f06b6ff541aa3"; - sha256 = "0fd3mxdlc0s405j02bc0g72fvdfvpi31a837xfwf40m5j4jbyndr"; - }) - ]; - qtsvg = [ - (fetchpatch { - name = "CVE-2018-19869.patch"; - url = "http://code.qt.io/cgit/qt/qtsvg.git/patch/?id=c5f1dd14098d1cc2cb52448fb44f53966d331443"; - sha256 = "1kgyfsxw2f0qv5fx9y7wysjsvqikam0qc7wzhklf0406zz6rhxbl"; - }) - ]; - }; - - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit (stdenv) lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; - in { - - mkDerivationWith = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; - - mkDerivation = mkDerivationWith stdenv.mkDerivation; - - qtbase = callPackage ../modules/qtbase.nix { - inherit bison cups harfbuzz libGL; - inherit (srcs.qtbase) src version; - patches = patches.qtbase; - inherit developerBuild decryptSslTraffic; - }; - - /* qt3d = not packaged */ - /* qtactiveqt = not packaged */ - /* qtandroidextras = not packaged */ - /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; - qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; - qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix {}; - /* qtmacextras = not packaged */ - qtmultimedia = callPackage ../modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtquick1 = null; - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; - qtscript = callPackage ../modules/qtscript.nix {}; - qtsensors = callPackage ../modules/qtsensors.nix {}; - qtserialport = callPackage ../modules/qtserialport.nix {}; - qtsvg = callPackage ../modules/qtsvg.nix {}; - qttools = callPackage ../modules/qttools.nix {}; - qttranslations = callPackage ../modules/qttranslations.nix {}; - qtwayland = callPackage ../modules/qtwayland.nix {}; - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix {}; - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - /* qtwinextras = not packaged */ - qtx11extras = callPackage ../modules/qtx11extras.nix {}; - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats - qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns - ]; - - qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; - substitutions = { inherit (stdenv) isDarwin; }; - } ../hooks/qmake-hook.sh; - - wrapQtAppsHook = makeSetupHook { - deps = - [ self.qtbase.dev makeWrapper ] - ++ optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh deleted file mode 100644 index bb9eb66a01dc..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ /dev/null @@ -1,2 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.3/ ) diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch deleted file mode 100644 index 8b46d432812a..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 0bbc871..3673634 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 5baf0fd..3583745 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/pkgs/development/libraries/qt-5/5.6/qtbase.patch deleted file mode 100644 index d8322cbc1997..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtbase.patch +++ /dev/null @@ -1,795 +0,0 @@ -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 11fb52a0b1..614fdbb046 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) - # at cmake time whether package has been found via a symlink, and correct - # that to an absolute path. This is only done for installations to - # the /usr or / prefix. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR - - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -47,47 +47,22 @@ split_incpath { - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - - !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True - --win32:!wince:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -167,7 +142,7 @@ contains(CONFIG, plugin) { - cmake_target_file - - cmake_qt5_plugin_file.files = $$cmake_target_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) { - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # We are generating cmake files. Most developers of Qt are not aware of cmake, - # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358cae4b..61d8cc0471 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") -@@ -58,11 +34,7 @@ endmacro() - macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - ) - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -95,24 +63,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !no_module_headers - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -254,25 +210,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -291,25 +235,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -328,11 +260,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 47ebe78400..25aa2b93e7 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -17,10 +17,7 @@ fq_qml_files = $$_PRO_FILE_PWD_/qmldir - - for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) - --qml1_target: \ -- instbase = $$[QT_INSTALL_IMPORTS] --else: \ -- instbase = $$[QT_INSTALL_QML] -+instbase = $$NIX_OUTPUT_QML - - # Install rules - qmldir.base = $$_PRO_FILE_PWD_ -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index ebec1db8da..62ace84a6c 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -46,13 +46,8 @@ exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE - - load(qt_build_paths) - --qml1_target { -- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH -- instbase = $$[QT_INSTALL_IMPORTS] --} else { -- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -- instbase = $$[QT_INSTALL_QML] --} -+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -+instbase = $$NIX_OUTPUT_QML - - target.path = $$instbase/$$TARGETPATH - INSTALLS += target -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 46aca50cc2..4f4e634724 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -29,7 +29,7 @@ host_build:force_bootstrap { - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 1848f00e90..2af93675c5 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 08b3f3e5af..5ffeafd9d8 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -30,8 +30,8 @@ contains(TEMPLATE, .*lib) { - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] - qt_libdir = $$[QT_HOST_LIBS] - } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -+ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - } - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { - lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 183d0c9502..17982b04ec 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -41,7 +41,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR - - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) - !build_online_docs: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -60,8 +60,8 @@ DOC_INDEXES = - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - doc_command = $$QDOC $$QMAKE_DOCS - prepare_docs { -@@ -75,12 +75,12 @@ prepare_docs { - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 4c68cfd72f..f422f18266 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -70,7 +70,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) -- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 4a1d265a8b..d346424b5b 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -70,7 +70,7 @@ defineTest(qtHaveModule) { - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$system("command -v $$2") - exists($${cmd}.pl) { - cmd = perl -w $$system_path($${cmd}.pl) - } else: contains(QMAKE_HOST.os, Windows) { -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 3a5dbb6274..24f321bd82 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,33 +23,33 @@ - #headers - qt_install_headers { - class_headers.files = $$SYNCQT.HEADER_CLASSES -- class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += class_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES -- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private -+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 3cf6c7349c..83e68025a5 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -82,7 +82,7 @@ CONFIG(static, static|shared)|prefix_build { - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 91a4eb619a..08b533e69c 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index bd3c12ce97..a796775970 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index c13c9a5223..6936851511 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -64,7 +64,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -636,12 +640,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -2,11 +2,7 @@ - if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 584f0b0f0e..24d80063f2 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -83,7 +83,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); - if (!lib.load()) - return false; - } -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index dabf1913cc..53bb867e07 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -94,7 +94,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); - if (!lib.load()) - return false; - } -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index 68caaeb6dc..fef4a81474 100644 ---- a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -340,7 +340,7 @@ init_context: - - const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); - if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - // Set the curves to be used - if (q_SSLeay() >= 0x10002000L) { - // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -354,7 +354,7 @@ init_context: - return sslContext; - } - } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - { - // specific curves requested, but not possible to set -> error - sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index 338c7ca3be..dd52114bac 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -251,12 +251,9 @@ void TableGenerator::initPossibleLocations() - // the QTCOMPOSE environment variable - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); -+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); - } - - QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index c2b7a562a9..4fa5f6d6a5 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -570,7 +570,14 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () - #ifndef QT_NO_LIBRARY - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -+#ifdef NIXPKGS_MESA_GL -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL)); -+ } -+#endif // NIXPKGS_MESA_GL - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - #endif - } -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 4646ced954..ff3111f393 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index ca3e02ca06..28dd73d772 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h -@@ -38,10 +38,13 @@ - - QT_BEGIN_NAMESPACE - -- --#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) -- --#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (0) -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else -+#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -+#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch deleted file mode 100644 index dbddaa2a1d60..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index dfdf2edbe..7ee96049d 100644 ---- a/src/qml/qml/qqmlimport.cpp -+++ b/src/qml/qml/qqmlimport.cpp -@@ -1568,6 +1568,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add import paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); -+ } -+ } -+ - // env import paths - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); diff --git a/pkgs/development/libraries/qt-5/5.6/qtscript.patch b/pkgs/development/libraries/qt-5/5.6/qtscript.patch deleted file mode 100644 index 5508dec1280e..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include <pthread.h> - #elif PLATFORM(GTK) - #include <wtf/gtk/GOwnPtr.h> --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport.patch deleted file mode 100644 index b2cffbe4f39b..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtserialport.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index 6f2cabd..cd3c0ed 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+#endif - if (!udevLibrary->load()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+#endif - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.patch b/pkgs/development/libraries/qt-5/5.6/qttools.patch deleted file mode 100644 index dcb15e0e55a6..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qttools.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -index 5a5bd5ce..1c6727d4 100644 ---- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -@@ -2,14 +2,13 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES - IMPORTED_LOCATION ${imported_location} - ) --endif() -+endif() -\ No newline at end of file -diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16f..d60db4ff 100644 ---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,7 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +55,7 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +66,7 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch deleted file mode 100644 index bf6af8059823..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch +++ /dev/null @@ -1,24 +0,0 @@ -Backported to Qt 5.6 for epoll_pwait fix on newer glibc -Part of upstream Chromium's 4e8083b4ab953ba298aedfc4e79d464be15e4012 -Review URL: https://codereview.chromium.org/1613883002 ---- -diff --git a/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index 10278dc5fc9b..b30b3e6acef6 100644 ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { - case __NR_epoll_create: - case __NR_epoll_wait: - #endif -+ case __NR_epoll_pwait: - case __NR_epoll_create1: - case __NR_epoll_ctl: - return true; -@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { - #if defined(__x86_64__) - case __NR_epoll_ctl_old: - #endif -- case __NR_epoll_pwait: - #if defined(__x86_64__) - case __NR_epoll_wait_old: - #endif diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch deleted file mode 100644 index da1658554e44..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(chars, numChars).leakRef(); -+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); - } - - JSStringRef JSStringRetain(JSStringRef string) -@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) - - const JSChar* JSStringGetCharactersPtr(JSStringRef string) - { -- return string->characters(); -+ return reinterpret_cast<const JSChar*>(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f012d..05e27338b 100644 ---- a/Source/JavaScriptCore/runtime/DateConversion.cpp -+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp -@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as - #if OS(WINDOWS) - TIME_ZONE_INFORMATION timeZoneInformation; - GetTimeZoneInformation(&timeZoneInformation); -- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri -index 1f4866d66..bb61e4ba3 100644 ---- a/Source/WTF/WTF.pri -+++ b/Source/WTF/WTF.pri -@@ -12,7 +12,7 @@ mac { - # Mac OS does ship libicu but not the associated header files. - # Therefore WebKit provides adequate header files. - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH -- LIBS += -licucore -+ LIBS += /usr/lib/libicucore.dylib - } else:!use?(wchar_unicode): { - win32 { - CONFIG(static, static|shared) { -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95cf..f5d6121fd 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger<unsigned long> { static const bool value = true; }; - template<> struct IsInteger<long long> { static const bool value = true; }; - template<> struct IsInteger<unsigned long long> { static const bool value = true; }; -+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) -+ template<> struct IsInteger<char16_t> { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger<wchar_t> { static const bool value = true; }; - #endif -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49aa..46772a4bb 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -+#ifdef NIXPKGS_LIBGTK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0); -+#else - QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+#endif - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2fea..86fe39ef1 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,11 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -+#ifdef NIXPKGS_LIBGDK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); -+#else - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+#endif - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de65216b..38f5c05e5 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -+#ifdef NIXPKGS_LIBGTK2 -+ QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0); -+#else - QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+#endif - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); -diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp -index cbac67dd8..23400a64e 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.cpp -+++ b/Source/WebKit2/Shared/API/c/WKString.cpp -@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) - size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) - { - COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); -- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff684..0f6ff63d1 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,11 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -+#ifdef NIXPKGS_LIBGDK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); -+#else - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+#endif - if (!library.load()) - return 0; - diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix deleted file mode 100644 index 87d35a43d86b..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/srcs.nix +++ /dev/null @@ -1,309 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz"; - sha256 = "1zkzc3wh2i89nacb55mbgl09zhrjbrxg9ir626bsvz15x4q5ml0h"; - name = "qt3d-opensource-src-5.6.3.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtactiveqt-opensource-src-5.6.3.tar.xz"; - sha256 = "00qscqjpkv5ssrjdwwcjp9q1rqgp8lsdjjksjpyyg4v6knd74s0i"; - name = "qtactiveqt-opensource-src-5.6.3.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtandroidextras-opensource-src-5.6.3.tar.xz"; - sha256 = "1v19p1pqcdicylj3hd2lbm5swqddydlv9aqmws3qwsc2vwh15d4n"; - name = "qtandroidextras-opensource-src-5.6.3.tar.xz"; - }; - }; - qtbase = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz"; - sha256 = "18ad7cxln61276cm8h8hzm0y6svw6b5m5nbm1niif9pwlqlqbx7y"; - name = "qtbase-opensource-src-5.6.3.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz"; - sha256 = "1zsn3xbsqapivfg80cldjlh7z07nf88958a7g6dm7figkwahx7p9"; - name = "qtcanvas3d-opensource-src-5.6.3.tar.xz"; - }; - }; - qtcharts = { - version = "2.1.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz"; - sha256 = "0bvxmqx7094mq1svrv1i1jp6vl87r2mp7k9n3gqpixjmqaqsjdpn"; - name = "qtcharts-opensource-src-2.1.3.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz"; - sha256 = "1pnc0zmps5iw5yhn2w0wl8cnyxhcy88d3rnaiv62ljpsccynwh7s"; - name = "qtconnectivity-opensource-src-5.6.3.tar.xz"; - }; - }; - qtdatavis3d = { - version = "1.2.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtdatavis3d-opensource-src-1.2.3.tar.xz"; - sha256 = "0rqhr6s3fic91r6r1g2ws57j6ixvkh4zhcwh7savs1risx374vya"; - name = "qtdatavis3d-opensource-src-1.2.3.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz"; - sha256 = "1z4ih5jbydnk5dz0arhvwc54fjw7fynqx3rhm6f8lsyis19w0gzn"; - name = "qtdeclarative-opensource-src-5.6.3.tar.xz"; - }; - }; - qtdeclarative-render2d = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-render2d-opensource-src-5.6.3.tar.xz"; - sha256 = "0r2qn8l3wh73cj75rq34zmc6rgl7v11c31pjdcsybad76nw5wb2p"; - name = "qtdeclarative-render2d-opensource-src-5.6.3.tar.xz"; - }; - }; - qtdoc = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtdoc-opensource-src-5.6.3.tar.xz"; - sha256 = "11zhlry8hlql1q3pm4mf7qyky9i2irxqdrr9nr5m93wjyfsjbh7f"; - name = "qtdoc-opensource-src-5.6.3.tar.xz"; - }; - }; - qtenginio = { - version = "1.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtenginio-opensource-src-1.6.3.tar.xz"; - sha256 = "04ir5pa8wpkc7cq08s0b69a0vhkr7479ixn3m2vww4jm6l5hc1yr"; - name = "qtenginio-opensource-src-1.6.3.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz"; - sha256 = "1vcrm4jfmxjlw23dnwf45mzq2z5s4fz6j2znknr25ca5bqnmjhn7"; - name = "qtgraphicaleffects-opensource-src-5.6.3.tar.xz"; - }; - }; - qtimageformats = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz"; - sha256 = "1hs8b258xsbc4xb4844mas9ka54f5cfhhszblawwjxn9j0ydmr7g"; - name = "qtimageformats-opensource-src-5.6.3.tar.xz"; - }; - }; - qtlocation = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz"; - sha256 = "0rhlmyi5kkhl1bimaj1fmp36v7x5r79j3flgx9dv27rkric1ra5p"; - name = "qtlocation-opensource-src-5.6.3.tar.xz"; - }; - }; - qtmacextras = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtmacextras-opensource-src-5.6.3.tar.xz"; - sha256 = "10v2a058yv6k76gg9dgpy4fc0xd652dknzsw5432gm8d9391382i"; - name = "qtmacextras-opensource-src-5.6.3.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz"; - sha256 = "0ihvbv0ldravbrx6406ps0z8y6521iz6h58n5ws44xq3m2g06dmf"; - name = "qtmultimedia-opensource-src-5.6.3.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtpurchasing-opensource-src-5.6.3.tar.xz"; - sha256 = "0lf269jzd6y4x5bxjwgz9dpw7hxmc6sp39qpxwlswd505cf0wgd7"; - name = "qtpurchasing-opensource-src-5.6.3.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz"; - sha256 = "13nvn0d2i4lf4igc1xqf7m98n4j66az1bi02zzv5m18vyb40zfri"; - name = "qtquickcontrols-opensource-src-5.6.3.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz"; - sha256 = "1jw1zykrx8aa9p781hc74h9za7lnnm4ifpdyqa4ahbdy193phl7c"; - name = "qtquickcontrols2-opensource-src-5.6.3.tar.xz"; - }; - }; - qtscript = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz"; - sha256 = "12dkf2s1l9y9cwdyayg2mpnwvx14kq93pymp3iy3fw1s1vfj11zh"; - name = "qtscript-opensource-src-5.6.3.tar.xz"; - }; - }; - qtsensors = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz"; - sha256 = "0ws96fmk5zz9szrw9x1dwa6gnv9rpv1q0h9ax9z5m1kiapfd80km"; - name = "qtsensors-opensource-src-5.6.3.tar.xz"; - }; - }; - qtserialbus = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz"; - sha256 = "17lskz4r549hc02riv0a3jdjbyaq4y4a94xd3jhy454lhzirpj3i"; - name = "qtserialbus-opensource-src-5.6.3.tar.xz"; - }; - }; - qtserialport = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz"; - sha256 = "06mfkd88rcn4p8pfzsyqbfg956vwwcql0khchjgx3bh34zp1yb88"; - name = "qtserialport-opensource-src-5.6.3.tar.xz"; - }; - }; - qtsvg = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz"; - sha256 = "1v6wz8fcgsh4lfv68bhavms0l1z3mcn8vggakc3m8rdl2wsih3qh"; - name = "qtsvg-opensource-src-5.6.3.tar.xz"; - }; - }; - qttools = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz"; - sha256 = "09krlrgcglylsv7xx4r681v7zmyy6nr8j18482skrmsqh21vlqqs"; - name = "qttools-opensource-src-5.6.3.tar.xz"; - }; - }; - qttranslations = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qttranslations-opensource-src-5.6.3.tar.xz"; - sha256 = "1avcfymi9bxk02i1rqh89c6hnvf4bg9qry94z29g1r62c80lxvbd"; - name = "qttranslations-opensource-src-5.6.3.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "2.0"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz"; - sha256 = "1v0saqz76h9gnb13b8mri4jq93i7f1gr7hj81zj3vz433s2klm0x"; - name = "qtvirtualkeyboard-opensource-src-2.0.tar.xz"; - }; - }; - qtwayland = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz"; - sha256 = "18ys14fzjybx02aj85vyqzsp89ypv2c6vfpklxzslwyvn9w54iss"; - name = "qtwayland-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz"; - sha256 = "04q7wmdnv4pskah2s5nnrzbsb207fvkj333m69wkqrc64anb1ccf"; - name = "qtwebchannel-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebengine = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz"; - sha256 = "19xpvnjwrjpj6wx7sy1cs1r1ibnh5hqfk9w9rnqf5h7n77xnk780"; - name = "qtwebengine-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebkit = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz"; - sha256 = "15iqgaw3jznfq1mdg1mmr7pn8w3qhw964h5m36vg3ywqayr6p309"; - name = "qtwebkit-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz"; - sha256 = "17hnls8j4wz0kyzzq7m3105lqz71zsxr0hya7i23pl4qc8affv1d"; - name = "qtwebkit-examples-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz"; - sha256 = "1sr8q0wqw4xwcdl6nvnv04pcjxb0fbs4ywrkcghdz2bcc52r0hx2"; - name = "qtwebsockets-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwebview = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwebview-opensource-src-5.6.3.tar.xz"; - sha256 = "076q9g2ca41v8lyhn7354rs8w2ca0wp2hsxc76zprzghi5p4b2kn"; - name = "qtwebview-opensource-src-5.6.3.tar.xz"; - }; - }; - qtwinextras = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtwinextras-opensource-src-5.6.3.tar.xz"; - sha256 = "0nmhvd1g18w12q6i8s87aq7rwikcn1m8m9m0a02l3p22xvimkxzf"; - name = "qtwinextras-opensource-src-5.6.3.tar.xz"; - }; - }; - qtx11extras = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz"; - sha256 = "0zv70z5z48wlg0q2zd7nbp7i0wimdcalns6yg0mjp7v2w2b8wyhy"; - name = "qtx11extras-opensource-src-5.6.3.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.6.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz"; - sha256 = "1xjimf88j2s5jrqgr9ki82zmis8r979rrzq4k6dxw43k1ngzyqd4"; - name = "qtxmlpatterns-opensource-src-5.6.3.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index f36f86e26ffe..b27c5d3eb58c 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,13 +30,17 @@ with stdenv.lib; let - qtCompatVersion = "5.9"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ]; + qtbase = [ + ./qtbase.patch + ./qtbase-fixguicmake.patch + ./qtbase-openssl_1_1.patch + ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch new file mode 100644 index 000000000000..d5f4d7527cb4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch @@ -0,0 +1,3985 @@ +commit 2d88fc0ce4ac76924a65ffd797183de9422ba672 +Author: Andreas Rammhold <andreas@rammhold.de> +Date: Wed Mar 6 00:18:51 2019 +0100 + + openssl1.1 compat + +diff --git a/config.tests/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp +index 6c8a9e8f19..d33b62389c 100644 +--- a/config.tests/openssl/openssl.cpp ++++ b/config.tests/openssl/openssl.cpp +@@ -39,8 +39,8 @@ + + #include <openssl/opensslv.h> + +-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L +-# error "OpenSSL >= 0.9.7, and < 1.1.0 is required" ++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL ++# error "OpenSSL >= 0.9.7 is required" + #endif + + #include <openssl/ssl.h> +diff --git a/config.tests/openssl11/openssl.cpp b/config.tests/openssl11/openssl.cpp +new file mode 100644 +index 0000000000..c20cc59deb +--- /dev/null ++++ b/config.tests/openssl11/openssl.cpp +@@ -0,0 +1,48 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the config.tests of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include <openssl/opensslv.h> ++ ++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L ++# error "OpenSSL >= 1.1 is required" ++#endif ++ ++int main() ++{ ++} +diff --git a/config.tests/openssl11/openssl11.pro b/config.tests/openssl11/openssl11.pro +new file mode 100644 +index 0000000000..a023aee4aa +--- /dev/null ++++ b/config.tests/openssl11/openssl11.pro +@@ -0,0 +1,2 @@ ++SOURCES = openssl.cpp ++CONFIG -= x11 qt +diff --git a/src/network/configure.json b/src/network/configure.json +index 2cf90ed94b..a021c0734b 100644 +--- a/src/network/configure.json ++++ b/src/network/configure.json +@@ -77,6 +77,17 @@ + }, + { "libs": "-lssl -lcrypto", "condition": "!config.win32" } + ] ++ }, ++ "openssl11": { ++ "label": "OpenSSL v. 1.1 support", ++ "type": "compile", ++ "test": "openssl11", ++ "sources": [ ++ { ++ "comment": "placeholder for OPENSSL_PATH", ++ "libs": "" ++ } ++ ] + } + }, + +@@ -182,7 +193,7 @@ + "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", + "disable": "input.openssl == 'no' || input.ssl == 'no'", + "autoDetect": "!config.winrt", +- "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)", ++ "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers || feature.opensslv11)", + "output": [ + "privateFeature", + { "type": "publicQtConfig", "condition": "!features.openssl-linked" }, +@@ -193,7 +204,7 @@ + "label": " Qt directly linked to OpenSSL", + "enable": "input.openssl == 'linked'", + "disable": "input.openssl != 'linked'", +- "condition": "!features.securetransport && libs.openssl", ++ "condition": "!features.securetransport && (libs.openssl || feature.opensslv11)", + "output": [ + "privateFeature", + { "type": "define", "name": "QT_LINKED_OPENSSL" } +@@ -213,6 +224,11 @@ + "condition": "config.winrt || features.securetransport || features.openssl", + "output": [ "publicFeature", "feature" ] + }, ++ "opensslv11": { ++ "label": "OpenSSL v. 1.1", ++ "condition": "libs.openssl11", ++ "output": ["publicFeature", "feature"] ++ }, + "sctp": { + "label": "SCTP", + "autoDetect": false, +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index 28b7eda54a..71e514a025 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp ++++ b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -64,12 +65,14 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const + uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW + { + if (X509 * const x509 = key.d->x509) { +- (void)q_X509_cmp(x509, x509); // populate x509->sha1_hash +- // (if someone knows a better way...) +- return qHashBits(x509->sha1_hash, SHA_DIGEST_LENGTH, seed); +- } else { +- return seed; ++ const EVP_MD *sha1 = q_EVP_sha1(); ++ unsigned int len = 0; ++ unsigned char md[EVP_MAX_MD_SIZE]; ++ q_X509_digest(x509, sha1, md, &len); ++ return qHashBits(md, len, seed); + } ++ ++ return seed; + } + + bool QSslCertificate::isNull() const +@@ -89,8 +92,7 @@ QByteArray QSslCertificate::version() const + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); + if (d->versionString.isEmpty() && d->x509) +- d->versionString = +- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); ++ d->versionString = QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); + + return d->versionString; + } +@@ -99,7 +101,7 @@ QByteArray QSslCertificate::serialNumber() const + { + QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); + if (d->serialNumberString.isEmpty() && d->x509) { +- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; ++ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); + QByteArray hexString; + hexString.reserve(serialNumber->length * 3); + for (int a = 0; a < serialNumber->length; ++a) { +@@ -199,14 +201,15 @@ QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlter + continue; + } + +- const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5)); ++ const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(genName->d.ia5)); + const QString altName = QString::fromLatin1(altNameStr, len); + if (genName->type == GEN_DNS) + result.insert(QSsl::DnsEntry, altName); + else if (genName->type == GEN_EMAIL) + result.insert(QSsl::EmailEntry, altName); + } +- q_sk_pop_free((STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_sk_free)); ++ ++ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_OPENSSL_sk_free)); + } + + return result; +@@ -235,25 +238,26 @@ QSslKey QSslCertificate::publicKey() const + QSslKey key; + + key.d->type = QSsl::PublicKey; +- X509_PUBKEY *xkey = d->x509->cert_info->key; +- EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); ++ ++ EVP_PKEY *pkey = q_X509_get_pubkey(d->x509); + Q_ASSERT(pkey); ++ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); + +- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { ++ if (keyType == EVP_PKEY_RSA) { + key.d->rsa = q_EVP_PKEY_get1_RSA(pkey); + key.d->algorithm = QSsl::Rsa; + key.d->isNull = false; +- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { ++ } else if (keyType == EVP_PKEY_DSA) { + key.d->dsa = q_EVP_PKEY_get1_DSA(pkey); + key.d->algorithm = QSsl::Dsa; + key.d->isNull = false; + #ifndef OPENSSL_NO_EC +- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_EC) { ++ } else if (keyType == EVP_PKEY_EC) { + key.d->ec = q_EVP_PKEY_get1_EC_KEY(pkey); + key.d->algorithm = QSsl::Ec; + key.d->isNull = false; + #endif +- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) { ++ } else if (keyType == EVP_PKEY_DH) { + // DH unsupported + } else { + // error? +@@ -275,7 +279,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) + X509V3_EXT_METHOD *meth = const_cast<X509V3_EXT_METHOD *>(q_X509V3_EXT_get(ext)); + if (!meth) { + ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext); +- QByteArray result( reinterpret_cast<const char *>(q_ASN1_STRING_data(value)), ++ QByteArray result( reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(value)), + q_ASN1_STRING_length(value)); + return result; + } +@@ -371,7 +375,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) + continue; + } + +- const char *uriStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(name->d.uniformResourceIdentifier)); ++ const char *uriStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(name->d.uniformResourceIdentifier)); + const QString uri = QString::fromUtf8(uriStr, len); + + result[QString::fromUtf8(QSslCertificatePrivate::asn1ObjectName(ad->method))] = uri; +@@ -380,11 +384,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) + } + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- q_sk_pop_free((_STACK*)info, reinterpret_cast<void(*)(void*)>(q_sk_free)); +-#else +- q_sk_pop_free((STACK*)info, reinterpret_cast<void(*)(void*)>(q_sk_free)); +-#endif ++ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)info, reinterpret_cast<void(*)(void *)>(q_OPENSSL_sk_free)); + return result; + } + break; +@@ -607,7 +607,11 @@ static QMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = 0; + int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); + info.insertMulti(name, QString::fromUtf8((char*)data, size)); ++#if QT_CONFIG(opensslv11) ++ q_CRYPTO_free(data, 0, 0); ++#else + q_CRYPTO_free(data); ++#endif + } + + return info; +@@ -619,8 +623,9 @@ QSslCertificate QSslCertificatePrivate::QSslCertificate_from_X509(X509 *x509) + if (!x509 || !QSslSocket::supportsSsl()) + return certificate; + +- ASN1_TIME *nbef = q_X509_get_notBefore(x509); +- ASN1_TIME *naft = q_X509_get_notAfter(x509); ++ ASN1_TIME *nbef = q_X509_getm_notBefore(x509); ++ ASN1_TIME *naft = q_X509_getm_notAfter(x509); ++ + certificate.d->notValidBefore = q_getTimeFromASN1(nbef); + certificate.d->notValidAfter = q_getTimeFromASN1(naft); + certificate.d->null = false; +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index c92d8fc3f8..cef503710c 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp ++++ b/src/network/ssl/qsslcontext_openssl.cpp +@@ -1,6 +1,6 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. + ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. + ** Copyright (C) 2014 Governikus GmbH & Co. KG. + ** Contact: https://www.qt.io/licensing/ +@@ -41,22 +41,14 @@ + + + #include <QtNetwork/qsslsocket.h> +-#include <QtNetwork/qssldiffiehellmanparameters.h> +-#include <QtCore/qmutex.h> + + #include "private/qssl_p.h" + #include "private/qsslcontext_openssl_p.h" +-#include "private/qsslsocket_p.h" + #include "private/qsslsocket_openssl_p.h" + #include "private/qsslsocket_openssl_symbols_p.h" +-#include "private/qssldiffiehellmanparameters_p.h" + + QT_BEGIN_NAMESPACE + +-// defined in qsslsocket_openssl.cpp: +-extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); +-extern QString getErrorsFromOpenSsl(); +- + QSslContext::QSslContext() + : ctx(0), + pkey(0), +@@ -78,301 +70,6 @@ QSslContext::~QSslContext() + q_SSL_SESSION_free(session); + } + +-static inline QString msgErrorSettingEllipticCurves(const QString &why) +-{ +- return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); +-} +- +-// static +-void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) +-{ +- sslContext->sslConfiguration = configuration; +- sslContext->errorCode = QSslError::NoError; +- +- bool client = (mode == QSslSocket::SslClientMode); +- +- bool reinitialized = false; +- bool unsupportedProtocol = false; +-init_context: +- switch (sslContext->sslConfiguration.protocol()) { +- case QSsl::SslV2: +-#ifndef OPENSSL_NO_SSL2 +- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); +-#else +- // SSL 2 not supported by the system, but chosen deliberately -> error +- sslContext->ctx = 0; +- unsupportedProtocol = true; +-#endif +- break; +- case QSsl::SslV3: +-#ifndef OPENSSL_NO_SSL3_METHOD +- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); +-#else +- // SSL 3 not supported by the system, but chosen deliberately -> error +- sslContext->ctx = 0; +- unsupportedProtocol = true; +-#endif +- break; +- case QSsl::SecureProtocols: +- // SSLv2 and SSLv3 will be disabled by SSL options +- // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. +- case QSsl::TlsV1SslV3: +- // SSLv2 will will be disabled by SSL options +- case QSsl::AnyProtocol: +- default: +- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); +- break; +- case QSsl::TlsV1_0: +- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); +- break; +- case QSsl::TlsV1_1: +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); +-#else +- // TLS 1.1 not supported by the system, but chosen deliberately -> error +- sslContext->ctx = 0; +- unsupportedProtocol = true; +-#endif +- break; +- case QSsl::TlsV1_2: +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); +-#else +- // TLS 1.2 not supported by the system, but chosen deliberately -> error +- sslContext->ctx = 0; +- unsupportedProtocol = true; +-#endif +- break; +- case QSsl::TlsV1_0OrLater: +- // Specific protocols will be specified via SSL options. +- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); +- break; +- case QSsl::TlsV1_1OrLater: +- case QSsl::TlsV1_2OrLater: +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- // Specific protocols will be specified via SSL options. +- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); +-#else +- // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error +- sslContext->ctx = 0; +- unsupportedProtocol = true; +-#endif +- break; +- } +- +- if (!sslContext->ctx) { +- // After stopping Flash 10 the SSL library looses its ciphers. Try re-adding them +- // by re-initializing the library. +- if (!reinitialized) { +- reinitialized = true; +- if (q_SSL_library_init() == 1) +- goto init_context; +- } +- +- sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( +- unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() +- ); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- // Enable bug workarounds. +- long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); +- q_SSL_CTX_set_options(sslContext->ctx, options); +- +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- // Tell OpenSSL to release memory early +- // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html +- if (q_SSLeay() >= 0x10000000L) +- q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); +-#endif +- +- // Initialize ciphers +- QByteArray cipherString; +- bool first = true; +- QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); +- if (ciphers.isEmpty()) +- ciphers = QSslSocketPrivate::defaultCiphers(); +- for (const QSslCipher &cipher : qAsConst(ciphers)) { +- if (first) +- first = false; +- else +- cipherString.append(':'); +- cipherString.append(cipher.name().toLatin1()); +- } +- +- if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { +- sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- const QDateTime now = QDateTime::currentDateTimeUtc(); +- +- // Add all our CAs to this store. +- const auto caCertificates = sslContext->sslConfiguration.caCertificates(); +- for (const QSslCertificate &caCertificate : caCertificates) { +- // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: +- // +- // If several CA certificates matching the name, key identifier, and +- // serial number condition are available, only the first one will be +- // examined. This may lead to unexpected results if the same CA +- // certificate is available with different expiration dates. If a +- // ``certificate expired'' verification error occurs, no other +- // certificate will be searched. Make sure to not have expired +- // certificates mixed with valid ones. +- // +- // See also: QSslSocketBackendPrivate::verify() +- if (caCertificate.expiryDate() >= now) { +- q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); +- } +- } +- +- if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { +- // tell OpenSSL the directories where to look up the root certs on demand +- const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); +- for (const QByteArray &unixDir : unixDirs) +- q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); +- } +- +- if (!sslContext->sslConfiguration.localCertificate().isNull()) { +- // Require a private key as well. +- if (sslContext->sslConfiguration.privateKey().isNull()) { +- sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- // Load certificate +- if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { +- sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { +- sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); +- } else { +- // Load private key +- sslContext->pkey = q_EVP_PKEY_new(); +- // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. +- // this lead to a memory leak. Now we use the *_set1_* functions which do not +- // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. +- if (configuration.d->privateKey.algorithm() == QSsl::Rsa) +- q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); +- else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) +- q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); +-#ifndef OPENSSL_NO_EC +- else if (configuration.d->privateKey.algorithm() == QSsl::Ec) +- q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); +-#endif +- } +- +- if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { +- sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) +- sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey +- +- // Check if the certificate matches the private key. +- if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { +- sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- // If we have any intermediate certificates then we need to add them to our chain +- bool first = true; +- for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { +- if (first) { +- first = false; +- continue; +- } +- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, +- q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); +- } +- } +- +- // Initialize peer verification. +- if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { +- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); +- } else { +- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); +- } +- +- // Set verification depth. +- if (sslContext->sslConfiguration.peerVerifyDepth() != 0) +- q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); +- +- // set persisted session if the user set it +- if (!configuration.sessionTicket().isEmpty()) +- sslContext->setSessionASN1(configuration.sessionTicket()); +- +- // Set temp DH params +- QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); +- +- if (!dhparams.isValid()) { +- sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); +- sslContext->errorCode = QSslError::UnspecifiedError; +- return; +- } +- +- if (!dhparams.isEmpty()) { +- const QByteArray ¶ms = dhparams.d->derData; +- const char *ptr = params.constData(); +- DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); +- if (dh == NULL) +- qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); +- q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); +- q_DH_free(dh); +- } +- +-#ifndef OPENSSL_NO_EC +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (q_SSLeay() >= 0x10002000L) { +- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); +- } else +-#endif +- { +- // Set temp ECDH params +- EC_KEY *ecdh = 0; +- ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); +- q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); +- q_EC_KEY_free(ecdh); +- } +-#endif // OPENSSL_NO_EC +- +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) +- if (!client) +- q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); +-#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) +- +- const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); +- if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) +- // Set the curves to be used +- if (q_SSLeay() >= 0x10002000L) { +- // SSL_CTX_ctrl wants a non-const pointer as last argument, +- // but let's avoid a copy into a temporary array +- if (!q_SSL_CTX_ctrl(sslContext->ctx, +- SSL_CTRL_SET_CURVES, +- qcurves.size(), +- const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) { +- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); +- sslContext->errorCode = QSslError::UnspecifiedError; +- } +- } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) +- { +- // specific curves requested, but not possible to set -> error +- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); +- sslContext->errorCode = QSslError::UnspecifiedError; +- } +- } +-} +- + QSslContext* QSslContext::fromConfiguration(QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) + { + QSslContext *sslContext = new QSslContext(); +@@ -463,7 +160,7 @@ SSL* QSslContext::createSsl() + m_npnContext.len = m_supportedNPNVersions.count(); + m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone; + #if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (q_SSLeay() >= 0x10002000L) { ++ if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { + // Callback's type has a parameter 'const unsigned char ** out' + // since it was introduced in 1.0.2. Internally, OpenSSL's own code + // (tests/examples) cast it to unsigned char * (since it's 'out'). +@@ -508,7 +205,7 @@ bool QSslContext::cacheSession(SSL* ssl) + unsigned char *data = reinterpret_cast<unsigned char *>(m_sessionASN1.data()); + if (!q_i2d_SSL_SESSION(session, &data)) + qCWarning(lcSsl, "could not store persistent version of SSL session"); +- m_sessionTicketLifeTimeHint = session->tlsext_tick_lifetime_hint; ++ m_sessionTicketLifeTimeHint = q_SSL_SESSION_get_ticket_lifetime_hint(session); + } + } + +diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp +new file mode 100644 +index 0000000000..787b6ae3f5 +--- /dev/null ++++ b/src/network/ssl/qsslcontext_openssl11.cpp +@@ -0,0 +1,277 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2014 BlackBerry Limited. All rights reserved. ++** Copyright (C) 2014 Governikus GmbH & Co. KG. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtNetwork module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ ++#include <QtNetwork/qsslsocket.h> ++#include <QtNetwork/qssldiffiehellmanparameters.h> ++ ++#include "private/qssl_p.h" ++#include "private/qsslcontext_openssl_p.h" ++#include "private/qsslsocket_p.h" ++#include "private/qsslsocket_openssl_p.h" ++#include "private/qsslsocket_openssl_symbols_p.h" ++#include "private/qssldiffiehellmanparameters_p.h" ++ ++#include <vector> ++ ++QT_BEGIN_NAMESPACE ++ ++// defined in qsslsocket_openssl.cpp: ++extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); ++extern QString getErrorsFromOpenSsl(); ++ ++static inline QString msgErrorSettingEllipticCurves(const QString &why) ++{ ++ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); ++} ++ ++// static ++void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) ++{ ++ sslContext->sslConfiguration = configuration; ++ sslContext->errorCode = QSslError::NoError; ++ ++ bool client = (mode == QSslSocket::SslClientMode); ++ ++ bool reinitialized = false; ++ bool unsupportedProtocol = false; ++init_context: ++ if (sslContext->sslConfiguration.protocol() == QSsl::SslV2) { ++ // SSL 2 is no longer supported, but chosen deliberately -> error ++ sslContext->ctx = nullptr; ++ unsupportedProtocol = true; ++ } else { ++ // The ssl options will actually control the supported methods ++ sslContext->ctx = q_SSL_CTX_new(client ? q_TLS_client_method() : q_TLS_server_method()); ++ } ++ ++ if (!sslContext->ctx) { ++ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them ++ // by re-initializing the library. ++ if (!reinitialized) { ++ reinitialized = true; ++ if (q_OPENSSL_init_ssl(0, nullptr) == 1) ++ goto init_context; ++ } ++ ++ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( ++ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() ++ ); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // Enable bug workarounds. ++ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); ++ q_SSL_CTX_set_options(sslContext->ctx, options); ++ ++ // Tell OpenSSL to release memory early ++ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html ++ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); ++ ++ // Initialize ciphers ++ QByteArray cipherString; ++ bool first = true; ++ QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); ++ if (ciphers.isEmpty()) ++ ciphers = QSslSocketPrivate::defaultCiphers(); ++ for (const QSslCipher &cipher : qAsConst(ciphers)) { ++ if (first) ++ first = false; ++ else ++ cipherString.append(':'); ++ cipherString.append(cipher.name().toLatin1()); ++ } ++ ++ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { ++ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ const QDateTime now = QDateTime::currentDateTimeUtc(); ++ ++ // Add all our CAs to this store. ++ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); ++ for (const QSslCertificate &caCertificate : caCertificates) { ++ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: ++ // ++ // If several CA certificates matching the name, key identifier, and ++ // serial number condition are available, only the first one will be ++ // examined. This may lead to unexpected results if the same CA ++ // certificate is available with different expiration dates. If a ++ // ``certificate expired'' verification error occurs, no other ++ // certificate will be searched. Make sure to not have expired ++ // certificates mixed with valid ones. ++ // ++ // See also: QSslSocketBackendPrivate::verify() ++ if (caCertificate.expiryDate() >= now) { ++ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); ++ } ++ } ++ ++ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { ++ // tell OpenSSL the directories where to look up the root certs on demand ++ const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); ++ for (const QByteArray &unixDir : unixDirs) ++ q_SSL_CTX_load_verify_locations(sslContext->ctx, nullptr, unixDir.constData()); ++ } ++ ++ if (!sslContext->sslConfiguration.localCertificate().isNull()) { ++ // Require a private key as well. ++ if (sslContext->sslConfiguration.privateKey().isNull()) { ++ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // Load certificate ++ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { ++ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { ++ sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); ++ } else { ++ // Load private key ++ sslContext->pkey = q_EVP_PKEY_new(); ++ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. ++ // this lead to a memory leak. Now we use the *_set1_* functions which do not ++ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. ++ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) ++ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); ++ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) ++ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); ++#ifndef OPENSSL_NO_EC ++ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) ++ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); ++#endif ++ } ++ ++ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { ++ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) ++ sslContext->pkey = nullptr; // Don't free the private key, it belongs to QSslKey ++ ++ // Check if the certificate matches the private key. ++ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { ++ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // If we have any intermediate certificates then we need to add them to our chain ++ bool first = true; ++ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { ++ if (first) { ++ first = false; ++ continue; ++ } ++ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, ++ q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); ++ } ++ } ++ ++ // Initialize peer verification. ++ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { ++ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, nullptr); ++ } else { ++ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); ++ } ++ ++ // Set verification depth. ++ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) ++ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); ++ ++ // set persisted session if the user set it ++ if (!configuration.sessionTicket().isEmpty()) ++ sslContext->setSessionASN1(configuration.sessionTicket()); ++ ++ // Set temp DH params ++ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); ++ ++ if (!dhparams.isValid()) { ++ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ if (!dhparams.isEmpty()) { ++ const QByteArray ¶ms = dhparams.d->derData; ++ const char *ptr = params.constData(); ++ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); ++ if (dh == NULL) ++ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); ++ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); ++ q_DH_free(dh); ++ } ++ ++#ifndef OPENSSL_NO_PSK ++ if (!client) ++ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); ++#endif // !OPENSSL_NO_PSK ++ ++ const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); ++ if (!qcurves.isEmpty()) { ++#ifdef OPENSSL_NO_EC ++ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version with disabled elliptic curves")); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++#else ++ // Set the curves to be used. ++ std::vector<int> curves; ++ curves.reserve(qcurves.size()); ++ for (const auto &sslCurve : qcurves) ++ curves.push_back(sslCurve.id); ++ if (!q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_CURVES, long(curves.size()), &curves[0])) { ++ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ } ++#endif ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/network/ssl/qsslcontext_opensslpre11.cpp b/src/network/ssl/qsslcontext_opensslpre11.cpp +new file mode 100644 +index 0000000000..9c01c2f2dc +--- /dev/null ++++ b/src/network/ssl/qsslcontext_opensslpre11.cpp +@@ -0,0 +1,354 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2014 BlackBerry Limited. All rights reserved. ++** Copyright (C) 2014 Governikus GmbH & Co. KG. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtNetwork module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ ++#include <QtNetwork/qsslsocket.h> ++#include <QtNetwork/qssldiffiehellmanparameters.h> ++ ++#include "private/qssl_p.h" ++#include "private/qsslcontext_openssl_p.h" ++#include "private/qsslsocket_p.h" ++#include "private/qsslsocket_openssl_p.h" ++#include "private/qsslsocket_openssl_symbols_p.h" ++#include "private/qssldiffiehellmanparameters_p.h" ++ ++QT_BEGIN_NAMESPACE ++ ++// defined in qsslsocket_openssl.cpp: ++extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); ++extern QString getErrorsFromOpenSsl(); ++ ++static inline QString msgErrorSettingEllipticCurves(const QString &why) ++{ ++ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); ++} ++ ++// static ++void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) ++{ ++ sslContext->sslConfiguration = configuration; ++ sslContext->errorCode = QSslError::NoError; ++ ++ bool client = (mode == QSslSocket::SslClientMode); ++ ++ bool reinitialized = false; ++ bool unsupportedProtocol = false; ++init_context: ++ switch (sslContext->sslConfiguration.protocol()) { ++ case QSsl::SslV2: ++#ifndef OPENSSL_NO_SSL2 ++ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); ++#else ++ // SSL 2 not supported by the system, but chosen deliberately -> error ++ sslContext->ctx = 0; ++ unsupportedProtocol = true; ++#endif ++ break; ++ case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3_METHOD ++ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++#else ++ // SSL 3 not supported by the system, but chosen deliberately -> error ++ sslContext->ctx = 0; ++ unsupportedProtocol = true; ++#endif ++ break; ++ case QSsl::SecureProtocols: ++ // SSLv2 and SSLv3 will be disabled by SSL options ++ // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. ++ case QSsl::TlsV1SslV3: ++ // SSLv2 will will be disabled by SSL options ++ case QSsl::AnyProtocol: ++ default: ++ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); ++ break; ++ case QSsl::TlsV1_0: ++ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); ++ break; ++ case QSsl::TlsV1_1: ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); ++#else ++ // TLS 1.1 not supported by the system, but chosen deliberately -> error ++ sslContext->ctx = 0; ++ unsupportedProtocol = true; ++#endif ++ break; ++ case QSsl::TlsV1_2: ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); ++#else ++ // TLS 1.2 not supported by the system, but chosen deliberately -> error ++ sslContext->ctx = 0; ++ unsupportedProtocol = true; ++#endif ++ break; ++ case QSsl::TlsV1_0OrLater: ++ // Specific protocols will be specified via SSL options. ++ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); ++ break; ++ case QSsl::TlsV1_1OrLater: ++ case QSsl::TlsV1_2OrLater: ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ // Specific protocols will be specified via SSL options. ++ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); ++#else ++ // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error ++ sslContext->ctx = 0; ++ unsupportedProtocol = true; ++#endif ++ break; ++ } ++ ++ if (!sslContext->ctx) { ++ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them ++ // by re-initializing the library. ++ if (!reinitialized) { ++ reinitialized = true; ++ if (q_SSL_library_init() == 1) ++ goto init_context; ++ } ++ ++ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( ++ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() ++ ); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // Enable bug workarounds. ++ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); ++ q_SSL_CTX_set_options(sslContext->ctx, options); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ // Tell OpenSSL to release memory early ++ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html ++ if (q_SSLeay() >= 0x10000000L) ++ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); ++#endif ++ ++ // Initialize ciphers ++ QByteArray cipherString; ++ bool first = true; ++ QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); ++ if (ciphers.isEmpty()) ++ ciphers = QSslSocketPrivate::defaultCiphers(); ++ for (const QSslCipher &cipher : qAsConst(ciphers)) { ++ if (first) ++ first = false; ++ else ++ cipherString.append(':'); ++ cipherString.append(cipher.name().toLatin1()); ++ } ++ ++ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { ++ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ const QDateTime now = QDateTime::currentDateTimeUtc(); ++ ++ // Add all our CAs to this store. ++ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); ++ for (const QSslCertificate &caCertificate : caCertificates) { ++ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: ++ // ++ // If several CA certificates matching the name, key identifier, and ++ // serial number condition are available, only the first one will be ++ // examined. This may lead to unexpected results if the same CA ++ // certificate is available with different expiration dates. If a ++ // ``certificate expired'' verification error occurs, no other ++ // certificate will be searched. Make sure to not have expired ++ // certificates mixed with valid ones. ++ // ++ // See also: QSslSocketBackendPrivate::verify() ++ if (caCertificate.expiryDate() >= now) { ++ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); ++ } ++ } ++ ++ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { ++ // tell OpenSSL the directories where to look up the root certs on demand ++ const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); ++ for (const QByteArray &unixDir : unixDirs) ++ q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); ++ } ++ ++ if (!sslContext->sslConfiguration.localCertificate().isNull()) { ++ // Require a private key as well. ++ if (sslContext->sslConfiguration.privateKey().isNull()) { ++ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // Load certificate ++ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { ++ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { ++ sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); ++ } else { ++ // Load private key ++ sslContext->pkey = q_EVP_PKEY_new(); ++ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. ++ // this lead to a memory leak. Now we use the *_set1_* functions which do not ++ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. ++ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) ++ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); ++ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) ++ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); ++#ifndef OPENSSL_NO_EC ++ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) ++ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); ++#endif ++ } ++ ++ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { ++ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) ++ sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey ++ ++ // Check if the certificate matches the private key. ++ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { ++ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ // If we have any intermediate certificates then we need to add them to our chain ++ bool first = true; ++ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { ++ if (first) { ++ first = false; ++ continue; ++ } ++ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, ++ q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); ++ } ++ } ++ ++ // Initialize peer verification. ++ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { ++ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); ++ } else { ++ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); ++ } ++ ++ // Set verification depth. ++ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) ++ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); ++ ++ // set persisted session if the user set it ++ if (!configuration.sessionTicket().isEmpty()) ++ sslContext->setSessionASN1(configuration.sessionTicket()); ++ ++ // Set temp DH params ++ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); ++ ++ if (!dhparams.isValid()) { ++ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ return; ++ } ++ ++ if (!dhparams.isEmpty()) { ++ const QByteArray ¶ms = dhparams.d->derData; ++ const char *ptr = params.constData(); ++ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); ++ if (dh == NULL) ++ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); ++ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); ++ q_DH_free(dh); ++ } ++ ++#ifndef OPENSSL_NO_EC ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++ if (q_SSLeay() >= 0x10002000L) { ++ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); ++ } else ++#endif ++ { ++ // Set temp ECDH params ++ EC_KEY *ecdh = 0; ++ ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); ++ q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); ++ q_EC_KEY_free(ecdh); ++ } ++#endif // OPENSSL_NO_EC ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) ++ if (!client) ++ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); ++#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) ++ ++ const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); ++ if (!qcurves.isEmpty()) { ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++ // Set the curves to be used ++ if (q_SSLeay() >= 0x10002000L) { ++ // SSL_CTX_ctrl wants a non-const pointer as last argument, ++ // but let's avoid a copy into a temporary array ++ if (!q_SSL_CTX_ctrl(sslContext->ctx, ++ SSL_CTRL_SET_CURVES, ++ qcurves.size(), ++ const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) { ++ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ } ++ } else ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++ { ++ // specific curves requested, but not possible to set -> error ++ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); ++ sslContext->errorCode = QSslError::UnspecifiedError; ++ } ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp +index 90687b05c5..5ebad822f1 100644 +--- a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp ++++ b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** + ** Copyright (C) 2015 Mikkel Krautz <mikkel@krautz.dk> ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -50,8 +51,8 @@ + #include <QtCore/qdebug.h> + #endif + +-// For q_BN_is_word. + #include <openssl/bn.h> ++#include <openssl/dh.h> + + QT_BEGIN_NAMESPACE + +@@ -62,13 +63,6 @@ static bool isSafeDH(DH *dh) + + QSslSocketPrivate::ensureInitialized(); + +- // Mark p < 1024 bits as unsafe. +- if (q_BN_num_bits(dh->p) < 1024) { +- return false; +- } +- +- if (q_DH_check(dh, &status) != 1) +- return false; + + // From https://wiki.openssl.org/index.php/Diffie-Hellman_parameters: + // +@@ -81,11 +75,39 @@ static bool isSafeDH(DH *dh) + // Without the test, the IETF parameters would + // fail validation. For details, see Diffie-Hellman + // Parameter Check (when g = 2, must p mod 24 == 11?). ++#if QT_CONFIG(opensslv11) ++ // Mark p < 1024 bits as unsafe. ++ if (q_DH_bits(dh) < 1024) ++ return false; ++ ++ if (q_DH_check(dh, &status) != 1) ++ return false; ++ ++ const BIGNUM *p = nullptr; ++ const BIGNUM *q = nullptr; ++ const BIGNUM *g = nullptr; ++ q_DH_get0_pqg(dh, &p, &q, &g); ++ ++ if (q_BN_is_word(const_cast<BIGNUM *>(g), DH_GENERATOR_2)) { ++ long residue = q_BN_mod_word(p, 24); ++ if (residue == 11 || residue == 23) ++ status &= ~DH_NOT_SUITABLE_GENERATOR; ++ } ++ ++#else ++ // Mark p < 1024 bits as unsafe. ++ if (q_BN_num_bits(dh->p) < 1024) ++ return false; ++ ++ if (q_DH_check(dh, &status) != 1) ++ return false; ++ + if (q_BN_is_word(dh->g, DH_GENERATOR_2)) { + long residue = q_BN_mod_word(dh->p, 24); + if (residue == 11 || residue == 23) + status &= ~DH_NOT_SUITABLE_GENERATOR; + } ++#endif + + bad |= DH_CHECK_P_NOT_PRIME; + bad |= DH_CHECK_P_NOT_SAFE_PRIME; +diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h +index 231566063e..57dda19bad 100644 +--- a/src/network/ssl/qsslellipticcurve.h ++++ b/src/network/ssl/qsslellipticcurve.h +@@ -80,6 +80,7 @@ private: + friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW; + ++ friend class QSslContext; + friend class QSslSocketPrivate; + friend class QSslSocketBackendPrivate; + }; +diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp +index e18197b703..8cd14837f0 100644 +--- a/src/network/ssl/qsslellipticcurve_openssl.cpp ++++ b/src/network/ssl/qsslellipticcurve_openssl.cpp +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** + ** Copyright (C) 2014 Governikus GmbH & Co. KG. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -78,17 +79,18 @@ QSslEllipticCurve QSslEllipticCurve::fromShortName(const QString &name) + QSslEllipticCurve result; + + #ifndef OPENSSL_NO_EC +- const QByteArray curveNameLatin1 = name.toLatin1(); + ++ const QByteArray curveNameLatin1 = name.toLatin1(); + int nid = q_OBJ_sn2nid(curveNameLatin1.data()); + + #if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (nid == 0 && q_SSLeay() >= 0x10002000L) ++ if (nid == 0 && QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) + nid = q_EC_curve_nist2nid(curveNameLatin1.data()); + #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L + + result.id = nid; +-#endif ++ ++#endif // !OPENSSL_NO_EC + + return result; + } +diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp +index 26119023d1..2b03af9441 100644 +--- a/src/network/ssl/qsslkey_openssl.cpp ++++ b/src/network/ssl/qsslkey_openssl.cpp +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -87,33 +88,32 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey) + if (pkey == nullptr) + return false; + +- if (pkey->type == EVP_PKEY_RSA) { ++#if QT_CONFIG(opensslv11) ++ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); ++#else ++ const int keyType = pkey->type; ++#endif ++ if (keyType == EVP_PKEY_RSA) { + isNull = false; + algorithm = QSsl::Rsa; + type = QSsl::PrivateKey; + +- rsa = q_RSA_new(); +- memcpy(rsa, q_EVP_PKEY_get1_RSA(pkey), sizeof(RSA)); +- ++ rsa = q_EVP_PKEY_get1_RSA(pkey); + return true; +- } +- else if (pkey->type == EVP_PKEY_DSA) { ++ } else if (keyType == EVP_PKEY_DSA) { + isNull = false; + algorithm = QSsl::Dsa; + type = QSsl::PrivateKey; + +- dsa = q_DSA_new(); +- memcpy(dsa, q_EVP_PKEY_get1_DSA(pkey), sizeof(DSA)); +- ++ dsa = q_EVP_PKEY_get1_DSA(pkey); + return true; + } + #ifndef OPENSSL_NO_EC +- else if (pkey->type == EVP_PKEY_EC) { ++ else if (keyType == EVP_PKEY_EC) { + isNull = false; + algorithm = QSsl::Ec; + type = QSsl::PrivateKey; +- ec = q_EC_KEY_dup(q_EVP_PKEY_get1_EC_KEY(pkey)); +- ++ ec = q_EVP_PKEY_get1_EC_KEY(pkey); + return true; + } + #endif +@@ -181,8 +181,8 @@ int QSslKeyPrivate::length() const + return -1; + + switch (algorithm) { +- case QSsl::Rsa: return q_BN_num_bits(rsa->n); +- case QSsl::Dsa: return q_BN_num_bits(dsa->p); ++ case QSsl::Rsa: return q_RSA_bits(rsa); ++ case QSsl::Dsa: return q_DSA_bits(dsa); + #ifndef OPENSSL_NO_EC + case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec)); + #endif +@@ -276,7 +276,13 @@ Qt::HANDLE QSslKeyPrivate::handle() const + + static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv, int enc) + { +- EVP_CIPHER_CTX ctx; ++#if QT_CONFIG(opensslv11) ++ EVP_CIPHER_CTX *ctx = q_EVP_CIPHER_CTX_new(); ++#else ++ EVP_CIPHER_CTX evpCipherContext; ++ EVP_CIPHER_CTX *ctx = &evpCipherContext; ++#endif ++ + const EVP_CIPHER* type = 0; + int i = 0, len = 0; + +@@ -294,21 +300,44 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, + + QByteArray output; + output.resize(data.size() + EVP_MAX_BLOCK_LENGTH); +- q_EVP_CIPHER_CTX_init(&ctx); +- q_EVP_CipherInit(&ctx, type, NULL, NULL, enc); +- q_EVP_CIPHER_CTX_set_key_length(&ctx, key.size()); ++ ++#if QT_CONFIG(opensslv11) ++ q_EVP_CIPHER_CTX_reset(ctx); ++#else ++ q_EVP_CIPHER_CTX_init(ctx); ++#endif ++ ++ q_EVP_CipherInit(ctx, type, NULL, NULL, enc); ++ q_EVP_CIPHER_CTX_set_key_length(ctx, key.size()); + if (cipher == QSslKeyPrivate::Rc2Cbc) +- q_EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); +- q_EVP_CipherInit(&ctx, NULL, ++ q_EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); ++ ++#if QT_CONFIG(opensslv11) ++ // EVP_CipherInit in 1.1 resets the context thus making the calls above useless. ++ // We call EVP_CipherInit_ex instead. ++ q_EVP_CipherInit_ex(ctx, nullptr, nullptr, ++ reinterpret_cast<const unsigned char *>(key.constData()), ++ reinterpret_cast<const unsigned char *>(iv.constData()), ++ enc); ++#else ++ q_EVP_CipherInit(ctx, NULL, + reinterpret_cast<const unsigned char *>(key.constData()), + reinterpret_cast<const unsigned char *>(iv.constData()), enc); +- q_EVP_CipherUpdate(&ctx, ++#endif // opensslv11 ++ ++ q_EVP_CipherUpdate(ctx, + reinterpret_cast<unsigned char *>(output.data()), &len, + reinterpret_cast<const unsigned char *>(data.constData()), data.size()); +- q_EVP_CipherFinal(&ctx, ++ q_EVP_CipherFinal(ctx, + reinterpret_cast<unsigned char *>(output.data()) + len, &i); + len += i; +- q_EVP_CIPHER_CTX_cleanup(&ctx); ++ ++#if QT_CONFIG(opensslv11) ++ q_EVP_CIPHER_CTX_reset(ctx); ++ q_EVP_CIPHER_CTX_free(ctx); ++#else ++ q_EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + return output.left(len); + } +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index f5b493897e..45cea490fc 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -1,6 +1,6 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. + ** Copyright (C) 2014 Governikus GmbH & Co. KG + ** Contact: https://www.qt.io/licensing/ + ** +@@ -97,70 +97,6 @@ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; + int QSslSocketBackendPrivate::s_indexForSSLExtraData = -1; + #endif + +-/* \internal +- +- From OpenSSL's thread(3) manual page: +- +- OpenSSL can safely be used in multi-threaded applications provided that at +- least two callback functions are set. +- +- locking_function(int mode, int n, const char *file, int line) is needed to +- perform locking on shared data structures. (Note that OpenSSL uses a +- number of global data structures that will be implicitly shared +- whenever multiple threads use OpenSSL.) Multi-threaded +- applications will crash at random if it is not set. ... +- ... +- id_function(void) is a function that returns a thread ID. It is not +- needed on Windows nor on platforms where getpid() returns a different +- ID for each thread (most notably Linux) +-*/ +-class QOpenSslLocks +-{ +-public: +- inline QOpenSslLocks() +- : initLocker(QMutex::Recursive), +- locksLocker(QMutex::Recursive) +- { +- QMutexLocker locker(&locksLocker); +- int numLocks = q_CRYPTO_num_locks(); +- locks = new QMutex *[numLocks]; +- memset(locks, 0, numLocks * sizeof(QMutex *)); +- } +- inline ~QOpenSslLocks() +- { +- QMutexLocker locker(&locksLocker); +- for (int i = 0; i < q_CRYPTO_num_locks(); ++i) +- delete locks[i]; +- delete [] locks; +- +- QSslSocketPrivate::deinitialize(); +- } +- inline QMutex *lock(int num) +- { +- QMutexLocker locker(&locksLocker); +- QMutex *tmp = locks[num]; +- if (!tmp) +- tmp = locks[num] = new QMutex(QMutex::Recursive); +- return tmp; +- } +- +- QMutex *globalLock() +- { +- return &locksLocker; +- } +- +- QMutex *initLock() +- { +- return &initLocker; +- } +- +-private: +- QMutex initLocker; +- QMutex locksLocker; +- QMutex **locks; +-}; +-Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) +- + QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() + { + QString errorString; +@@ -175,20 +111,6 @@ QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() + } + + extern "C" { +-static void locking_function(int mode, int lockNumber, const char *, int) +-{ +- QMutex *mutex = openssl_locks()->lock(lockNumber); +- +- // Lock or unlock it +- if (mode & CRYPTO_LOCK) +- mutex->lock(); +- else +- mutex->unlock(); +-} +-static unsigned long id_function() +-{ +- return (quintptr)QThread::currentThreadId(); +-} + + #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) + static unsigned int q_ssl_psk_client_callback(SSL *ssl, +@@ -227,7 +149,7 @@ QSslSocketBackendPrivate::~QSslSocketBackendPrivate() + destroySslContext(); + } + +-QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher) ++QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher) + { + QSslCipher ciph; + +@@ -283,6 +205,7 @@ struct QSslErrorList + QMutex mutex; + QVector<QSslErrorEntry> errors; + }; ++ + Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList) + + int q_X509Callback(int ok, X509_STORE_CTX *ctx) +@@ -312,7 +235,7 @@ int q_X509Callback(int ok, X509_STORE_CTX *ctx) + } + #endif + } +- // Always return OK to allow verification to continue. We're handle the ++ // Always return OK to allow verification to continue. We handle the + // errors gracefully after collecting all errors, after verification has + // completed. + return 1; +@@ -397,7 +320,7 @@ bool QSslSocketBackendPrivate::initSslContext() + if (configuration.protocol != QSsl::SslV2 && + configuration.protocol != QSsl::SslV3 && + configuration.protocol != QSsl::UnknownProtocol && +- mode == QSslSocket::SslClientMode && q_SSLeay() >= 0x00090806fL) { ++ mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryVersionNumber() >= 0x00090806fL) { + // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format. + QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName; + if (tlsHostName.isEmpty()) +@@ -438,13 +361,13 @@ bool QSslSocketBackendPrivate::initSslContext() + + #if OPENSSL_VERSION_NUMBER >= 0x10001000L + // Save a pointer to this object into the SSL structure. +- if (q_SSLeay() >= 0x10001000L) ++ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) + q_SSL_set_ex_data(ssl, s_indexForSSLExtraData, this); + #endif + + #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) + // Set the client callback for PSK +- if (q_SSLeay() >= 0x10001000L) { ++ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) { + if (mode == QSslSocket::SslClientMode) + q_SSL_set_psk_client_callback(ssl, &q_ssl_psk_client_callback); + else if (mode == QSslSocket::SslServerMode) +@@ -464,16 +387,6 @@ void QSslSocketBackendPrivate::destroySslContext() + sslContextPointer.clear(); + } + +-/*! +- \internal +-*/ +-void QSslSocketPrivate::deinitialize() +-{ +- q_CRYPTO_set_id_callback(0); +- q_CRYPTO_set_locking_callback(0); +- q_ERR_free_strings(); +-} +- + /*! + \internal + +@@ -486,91 +399,6 @@ bool QSslSocketPrivate::supportsSsl() + return ensureLibraryLoaded(); + } + +-bool QSslSocketPrivate::ensureLibraryLoaded() +-{ +- if (!q_resolveOpenSslSymbols()) +- return false; +- +- // Check if the library itself needs to be initialized. +- QMutexLocker locker(openssl_locks()->initLock()); +- +- if (!s_libraryLoaded) { +- s_libraryLoaded = true; +- +- // Initialize OpenSSL. +- q_CRYPTO_set_id_callback(id_function); +- q_CRYPTO_set_locking_callback(locking_function); +- if (q_SSL_library_init() != 1) +- return false; +- q_SSL_load_error_strings(); +- q_OpenSSL_add_all_algorithms(); +- +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- if (q_SSLeay() >= 0x10001000L) +- QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); +-#endif +- +- // Initialize OpenSSL's random seed. +- if (!q_RAND_status()) { +- qWarning("Random number generator not seeded, disabling SSL support"); +- return false; +- } +- } +- return true; +-} +- +-void QSslSocketPrivate::ensureCiphersAndCertsLoaded() +-{ +- QMutexLocker locker(openssl_locks()->initLock()); +- if (s_loadedCiphersAndCerts) +- return; +- s_loadedCiphersAndCerts = true; +- +- resetDefaultCiphers(); +- resetDefaultEllipticCurves(); +- +-#if QT_CONFIG(library) +- //load symbols needed to receive certificates from system store +-#if defined(Q_OS_WIN) +- HINSTANCE hLib = LoadLibraryW(L"Crypt32"); +- if (hLib) { +- ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); +- ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); +- ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); +- if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) +- qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen +- } else { +- qCWarning(lcSsl, "could not load crypt32 library"); // should never happen +- } +-#elif defined(Q_OS_QNX) +- s_loadRootCertsOnDemand = true; +-#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +- // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) +- QList<QByteArray> dirs = unixRootCertDirectories(); +- QStringList symLinkFilter; +- symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); +- for (int a = 0; a < dirs.count(); ++a) { +- QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); +- if (iterator.hasNext()) { +- s_loadRootCertsOnDemand = true; +- break; +- } +- } +-#endif +-#endif // QT_CONFIG(library) +- // if on-demand loading was not enabled, load the certs now +- if (!s_loadRootCertsOnDemand) +- setDefaultCaCertificates(systemCaCertificates()); +-#ifdef Q_OS_WIN +- //Enabled for fetching additional root certs from windows update on windows 6+ +- //This flag is set false by setDefaultCaCertificates() indicating the app uses +- //its own cert bundle rather than the system one. +- //Same logic that disables the unix on demand cert loading. +- //Unlike unix, we do preload the certificates from the cert store. +- if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) +- s_loadRootCertsOnDemand = true; +-#endif +-} + + /*! + \internal +@@ -587,26 +415,6 @@ void QSslSocketPrivate::ensureInitialized() + ensureCiphersAndCertsLoaded(); + } + +-long QSslSocketPrivate::sslLibraryVersionNumber() +-{ +- if (!supportsSsl()) +- return 0; +- +- return q_SSLeay(); +-} +- +-QString QSslSocketPrivate::sslLibraryVersionString() +-{ +- if (!supportsSsl()) +- return QString(); +- +- const char *versionString = q_SSLeay_version(SSLEAY_VERSION); +- if (!versionString) +- return QString(); +- +- return QString::fromLatin1(versionString); +-} +- + long QSslSocketPrivate::sslLibraryBuildVersionNumber() + { + return OPENSSL_VERSION_NUMBER; +@@ -628,7 +436,11 @@ QString QSslSocketPrivate::sslLibraryBuildVersionString() + */ + void QSslSocketPrivate::resetDefaultCiphers() + { ++#if QT_CONFIG(opensslv11) ++ SSL_CTX *myCtx = q_SSL_CTX_new(q_TLS_client_method()); ++#else + SSL_CTX *myCtx = q_SSL_CTX_new(q_SSLv23_client_method()); ++#endif + SSL *mySsl = q_SSL_new(myCtx); + + QList<QSslCipher> ciphers; +@@ -664,7 +476,7 @@ void QSslSocketPrivate::resetDefaultEllipticCurves() + QVector<QSslEllipticCurve> curves; + + #ifndef OPENSSL_NO_EC +- const size_t curveCount = q_EC_get_builtin_curves(NULL, 0); ++ const size_t curveCount = q_EC_get_builtin_curves(nullptr, 0); + + QVarLengthArray<EC_builtin_curve> builtinCurves(static_cast<int>(curveCount)); + +@@ -698,13 +510,14 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() + if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) { + HCERTSTORE hSystemStore; + hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT"); +- if(hSystemStore) { +- PCCERT_CONTEXT pc = NULL; +- while(1) { +- pc = ptrCertFindCertificateInStore( hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, pc); +- if(!pc) ++ if (hSystemStore) { ++ PCCERT_CONTEXT pc = nullptr; ++ while (1) { ++ pc = ptrCertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc); ++ if (!pc) + break; +- QByteArray der((const char *)(pc->pbCertEncoded), static_cast<int>(pc->cbCertEncoded)); ++ QByteArray der(reinterpret_cast<const char *>(pc->pbCertEncoded), ++ static_cast<int>(pc->cbCertEncoded)); + QSslCertificate cert(der, QSsl::Der); + systemCerts.append(cert); + } +@@ -1504,14 +1317,8 @@ QSslCipher QSslSocketBackendPrivate::sessionCipher() const + { + if (!ssl) + return QSslCipher(); +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- // FIXME This is fairly evil, but needed to keep source level compatibility +- // with the OpenSSL 0.9.x implementation at maximum -- some other functions +- // don't take a const SSL_CIPHER* when they should +- SSL_CIPHER *sessionCipher = const_cast<SSL_CIPHER *>(q_SSL_get_current_cipher(ssl)); +-#else +- SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); +-#endif ++ ++ const SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); + return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher(); + } + +@@ -1537,112 +1344,6 @@ QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const + return QSsl::UnknownProtocol; + } + +-void QSslSocketBackendPrivate::continueHandshake() +-{ +- Q_Q(QSslSocket); +- // if we have a max read buffer size, reset the plain socket's to match +- if (readBufferMaxSize) +- plainSocket->setReadBufferSize(readBufferMaxSize); +- +- if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) +- configuration.peerSessionShared = true; +- +-#ifdef QT_DECRYPT_SSL_TRAFFIC +- if (ssl->session && ssl->s3) { +- const char *mk = reinterpret_cast<const char *>(ssl->session->master_key); +- QByteArray masterKey(mk, ssl->session->master_key_length); +- const char *random = reinterpret_cast<const char *>(ssl->s3->client_random); +- QByteArray clientRandom(random, SSL3_RANDOM_SIZE); +- +- // different format, needed for e.g. older Wireshark versions: +-// const char *sid = reinterpret_cast<const char *>(ssl->session->session_id); +-// QByteArray sessionID(sid, ssl->session->session_id_length); +-// QByteArray debugLineRSA("RSA Session-ID:"); +-// debugLineRSA.append(sessionID.toHex().toUpper()); +-// debugLineRSA.append(" Master-Key:"); +-// debugLineRSA.append(masterKey.toHex().toUpper()); +-// debugLineRSA.append("\n"); +- +- QByteArray debugLineClientRandom("CLIENT_RANDOM "); +- debugLineClientRandom.append(clientRandom.toHex().toUpper()); +- debugLineClientRandom.append(" "); +- debugLineClientRandom.append(masterKey.toHex().toUpper()); +- debugLineClientRandom.append("\n"); +- +- QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); +- QFile file(sslKeyFile); +- if (!file.open(QIODevice::Append)) +- qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; +- if (!file.write(debugLineClientRandom)) +- qCWarning(lcSsl) << "could not write to file" << sslKeyFile; +- file.close(); +- } else { +- qCWarning(lcSsl, "could not decrypt SSL traffic"); +- } +-#endif +- +- // Cache this SSL session inside the QSslContext +- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { +- if (!sslContextPointer->cacheSession(ssl)) { +- sslContextPointer.clear(); // we could not cache the session +- } else { +- // Cache the session for permanent usage as well +- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { +- if (!sslContextPointer->sessionASN1().isEmpty()) +- configuration.sslSession = sslContextPointer->sessionASN1(); +- configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); +- } +- } +- } +- +-#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) +- +- configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; +- if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { +- // we could not agree -> be conservative and use HTTP/1.1 +- configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); +- } else { +- const unsigned char *proto = 0; +- unsigned int proto_len = 0; +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (q_SSLeay() >= 0x10002000L) { +- q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); +- if (proto_len && mode == QSslSocket::SslClientMode) { +- // Client does not have a callback that sets it ... +- configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; +- } +- } +- +- if (!proto_len) { // Test if NPN was more lucky ... +-#else +- { +-#endif +- q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); +- } +- +- if (proto_len) +- configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); +- else +- configuration.nextNegotiatedProtocol.clear(); +- } +-#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... +- +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { +- EVP_PKEY *key; +- if (q_SSL_get_server_tmp_key(ssl, &key)) +- configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); +- } +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... +- +- connectionEncrypted = true; +- emit q->encrypted(); +- if (autoStartHandshake && pendingClose) { +- pendingClose = false; +- q->disconnectFromHost(); +- } +-} +- + QList<QSslCertificate> QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509) + { + ensureInitialized(); +@@ -1696,12 +1397,12 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & + QMutexLocker sslErrorListMutexLocker(&_q_sslErrorList()->mutex); + + // Register a custom callback to get all verification errors. +- X509_STORE_set_verify_cb_func(certStore, q_X509Callback); ++ q_X509_STORE_set_verify_cb(certStore, q_X509Callback); + + // Build the chain of intermediate certificates + STACK_OF(X509) *intermediates = 0; + if (certificateChain.length() > 1) { +- intermediates = (STACK_OF(X509) *) q_sk_new_null(); ++ intermediates = (STACK_OF(X509) *) q_OPENSSL_sk_new_null(); + + if (!intermediates) { + q_X509_STORE_free(certStore); +@@ -1715,11 +1416,8 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & + first = false; + continue; + } +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- q_sk_push( (_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); +-#else +- q_sk_push( (STACK *)intermediates, reinterpret_cast<char *>(cert.handle())); +-#endif ++ ++ q_OPENSSL_sk_push((OPENSSL_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); + } + } + +@@ -1743,11 +1441,7 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & + (void) q_X509_verify_cert(storeContext); + + q_X509_STORE_CTX_free(storeContext); +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- q_sk_free( (_STACK *) intermediates); +-#else +- q_sk_free( (STACK *) intermediates); +-#endif ++ q_OPENSSL_sk_free((OPENSSL_STACK *)intermediates); + + // Now process the errors + const auto errorList = std::move(_q_sslErrorList()->errors); +@@ -1821,7 +1515,8 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, + // Convert to Qt types + if (!key->d->fromEVP_PKEY(pkey)) { + qCWarning(lcSsl, "Unable to convert private key"); +- q_sk_pop_free(reinterpret_cast<STACK *>(ca), reinterpret_cast<void(*)(void*)>(q_sk_free)); ++ q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca), ++ reinterpret_cast<void (*)(void *)>(q_OPENSSL_sk_free)); + q_X509_free(x509); + q_EVP_PKEY_free(pkey); + q_PKCS12_free(p12); +@@ -1836,7 +1531,11 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, + *caCertificates = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(ca); + + // Clean up +- q_sk_pop_free(reinterpret_cast<STACK *>(ca), reinterpret_cast<void(*)(void*)>(q_sk_free)); ++ // TODO: verify ASAP, in the past we had sk_pop_free with q_OPENSSL_sk_free ++ // which seems to be blatantly wrong and even crashes with 1.1. ++ q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca), ++ reinterpret_cast<void (*)(void *)>(q_X509_free)); ++ + q_X509_free(x509); + q_EVP_PKEY_free(pkey); + q_PKCS12_free(p12); +diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp +new file mode 100644 +index 0000000000..b6d18943a5 +--- /dev/null ++++ b/src/network/ssl/qsslsocket_openssl11.cpp +@@ -0,0 +1,285 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2014 Governikus GmbH & Co. KG ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtNetwork module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++/**************************************************************************** ++** ++** In addition, as a special exception, the copyright holders listed above give ++** permission to link the code of its release of Qt with the OpenSSL project's ++** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the ++** same license as the original version), and distribute the linked executables. ++** ++** You must comply with the GNU General Public License version 2 in all ++** respects for all of the code used other than the "OpenSSL" code. If you ++** modify this file, you may extend this exception to your version of the file, ++** but you are not obligated to do so. If you do not wish to do so, delete ++** this exception statement from your version of this file. ++** ++****************************************************************************/ ++ ++//#define QT_DECRYPT_SSL_TRAFFIC ++ ++#include "qssl_p.h" ++#include "qsslsocket_openssl_p.h" ++#include "qsslsocket_openssl_symbols_p.h" ++#include "qsslsocket.h" ++#include "qsslkey.h" ++ ++#include <QtCore/qdebug.h> ++#include <QtCore/qdir.h> ++#include <QtCore/qdiriterator.h> ++#include <QtCore/qfile.h> ++#include <QtCore/qmutex.h> ++#include <QtCore/qlibrary.h> ++ ++QT_BEGIN_NAMESPACE ++ ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_opensslInitMutex, (QMutex::Recursive)) ++ ++/*! ++ \internal ++*/ ++void QSslSocketPrivate::deinitialize() ++{ ++ // This function exists only for compatibility with the pre-11 code, ++ // where deinitialize() actually does some cleanup. To be discarded ++ // once we retire < 1.1. ++} ++ ++bool QSslSocketPrivate::ensureLibraryLoaded() ++{ ++ if (!q_resolveOpenSslSymbols()) ++ return false; ++ ++ const QMutexLocker locker(qt_opensslInitMutex); ++ ++ if (!s_libraryLoaded) { ++ s_libraryLoaded = true; ++ ++ // Initialize OpenSSL. ++ if (q_OPENSSL_init_ssl(0, nullptr) != 1) ++ return false; ++ q_SSL_load_error_strings(); ++ q_OpenSSL_add_all_algorithms(); ++ ++ QSslSocketBackendPrivate::s_indexForSSLExtraData ++ = q_CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, 0L, nullptr, nullptr, ++ nullptr, nullptr); ++ ++ // Initialize OpenSSL's random seed. ++ if (!q_RAND_status()) { ++ qWarning("Random number generator not seeded, disabling SSL support"); ++ return false; ++ } ++ } ++ return true; ++} ++ ++void QSslSocketPrivate::ensureCiphersAndCertsLoaded() ++{ ++ const QMutexLocker locker(qt_opensslInitMutex); ++ ++ if (s_loadedCiphersAndCerts) ++ return; ++ s_loadedCiphersAndCerts = true; ++ ++ resetDefaultCiphers(); ++ resetDefaultEllipticCurves(); ++ ++#if QT_CONFIG(library) ++ //load symbols needed to receive certificates from system store ++#if defined(Q_OS_WIN) ++ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); ++ if (hLib) { ++ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); ++ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); ++ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); ++ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) ++ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen ++ } else { ++ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen ++ } ++#elif defined(Q_OS_QNX) ++ s_loadRootCertsOnDemand = true; ++#elif defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) ++ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) ++ QList<QByteArray> dirs = unixRootCertDirectories(); ++ QStringList symLinkFilter; ++ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); ++ for (int a = 0; a < dirs.count(); ++a) { ++ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); ++ if (iterator.hasNext()) { ++ s_loadRootCertsOnDemand = true; ++ break; ++ } ++ } ++#endif ++#endif // QT_CONFIG(library) ++ // if on-demand loading was not enabled, load the certs now ++ if (!s_loadRootCertsOnDemand) ++ setDefaultCaCertificates(systemCaCertificates()); ++#ifdef Q_OS_WIN ++ //Enabled for fetching additional root certs from windows update on windows 6+ ++ //This flag is set false by setDefaultCaCertificates() indicating the app uses ++ //its own cert bundle rather than the system one. ++ //Same logic that disables the unix on demand cert loading. ++ //Unlike unix, we do preload the certificates from the cert store. ++ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) ++ s_loadRootCertsOnDemand = true; ++#endif ++} ++ ++long QSslSocketPrivate::sslLibraryVersionNumber() ++{ ++ if (!supportsSsl()) ++ return 0; ++ ++ return q_OpenSSL_version_num(); ++} ++ ++QString QSslSocketPrivate::sslLibraryVersionString() ++{ ++ if (!supportsSsl()) ++ return QString(); ++ ++ const char *versionString = q_OpenSSL_version(OPENSSL_VERSION); ++ if (!versionString) ++ return QString(); ++ ++ return QString::fromLatin1(versionString); ++} ++ ++void QSslSocketBackendPrivate::continueHandshake() ++{ ++ Q_Q(QSslSocket); ++ // if we have a max read buffer size, reset the plain socket's to match ++ if (readBufferMaxSize) ++ plainSocket->setReadBufferSize(readBufferMaxSize); ++ ++ if (q_SSL_session_reused(ssl)) ++ configuration.peerSessionShared = true; ++ ++#ifdef QT_DECRYPT_SSL_TRAFFIC ++ if (q_SSL_get_session(ssl)) { ++ size_t master_key_len = q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), 0, 0); ++ size_t client_random_len = q_SSL_get_client_random(ssl, 0, 0); ++ QByteArray masterKey(int(master_key_len), 0); // Will not overflow ++ QByteArray clientRandom(int(client_random_len), 0); // Will not overflow ++ ++ q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), ++ reinterpret_cast<unsigned char*>(masterKey.data()), ++ masterKey.size()); ++ q_SSL_get_client_random(ssl, reinterpret_cast<unsigned char *>(clientRandom.data()), ++ clientRandom.size()); ++ ++ QByteArray debugLineClientRandom("CLIENT_RANDOM "); ++ debugLineClientRandom.append(clientRandom.toHex().toUpper()); ++ debugLineClientRandom.append(" "); ++ debugLineClientRandom.append(masterKey.toHex().toUpper()); ++ debugLineClientRandom.append("\n"); ++ ++ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); ++ QFile file(sslKeyFile); ++ if (!file.open(QIODevice::Append)) ++ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; ++ if (!file.write(debugLineClientRandom)) ++ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; ++ file.close(); ++ } else { ++ qCWarning(lcSsl, "could not decrypt SSL traffic"); ++ } ++#endif ++ ++ // Cache this SSL session inside the QSslContext ++ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { ++ if (!sslContextPointer->cacheSession(ssl)) { ++ sslContextPointer.clear(); // we could not cache the session ++ } else { ++ // Cache the session for permanent usage as well ++ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { ++ if (!sslContextPointer->sessionASN1().isEmpty()) ++ configuration.sslSession = sslContextPointer->sessionASN1(); ++ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); ++ } ++ } ++ } ++ ++#if !defined(OPENSSL_NO_NEXTPROTONEG) ++ ++ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; ++ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { ++ // we could not agree -> be conservative and use HTTP/1.1 ++ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); ++ } else { ++ const unsigned char *proto = 0; ++ unsigned int proto_len = 0; ++ ++ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); ++ if (proto_len && mode == QSslSocket::SslClientMode) { ++ // Client does not have a callback that sets it ... ++ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; ++ } ++ ++ if (!proto_len) { // Test if NPN was more lucky ... ++ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); ++ } ++ ++ if (proto_len) ++ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); ++ else ++ configuration.nextNegotiatedProtocol.clear(); ++ } ++#endif // !defined(OPENSSL_NO_NEXTPROTONEG) ++ ++ if (mode == QSslSocket::SslClientMode) { ++ EVP_PKEY *key; ++ if (q_SSL_get_server_tmp_key(ssl, &key)) ++ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); ++ } ++ ++ connectionEncrypted = true; ++ emit q->encrypted(); ++ if (autoStartHandshake && pendingClose) { ++ pendingClose = false; ++ q->disconnectFromHost(); ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h +new file mode 100644 +index 0000000000..2980b3d23e +--- /dev/null ++++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h +@@ -0,0 +1,132 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2014 BlackBerry Limited. All rights reserved. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtNetwork module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++/**************************************************************************** ++** ++** In addition, as a special exception, the copyright holders listed above give ++** permission to link the code of its release of Qt with the OpenSSL project's ++** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the ++** same license as the original version), and distribute the linked executables. ++** ++** You must comply with the GNU General Public License version 2 in all ++** respects for all of the code used other than the "OpenSSL" code. If you ++** modify this file, you may extend this exception to your version of the file, ++** but you are not obligated to do so. If you do not wish to do so, delete ++** this exception statement from your version of this file. ++** ++****************************************************************************/ ++ ++#ifndef QSSLSOCKET_OPENSSL11_SYMBOLS_P_H ++#define QSSLSOCKET_OPENSSL11_SYMBOLS_P_H ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists purely as an ++// implementation detail. This header file may change from version to ++// version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++// Note: this file does not have QT_BEGIN_NAMESPACE/QT_END_NAMESPACE, it's done ++// in qsslsocket_openssl_symbols_p.h. ++ ++#ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H ++#error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead" ++#endif ++ ++const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); ++ ++Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); ++Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); ++ ++int q_DSA_bits(DSA *a); ++int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); ++int q_EVP_PKEY_base_id(EVP_PKEY *a); ++int q_RSA_bits(RSA *a); ++int q_OPENSSL_sk_num(OPENSSL_STACK *a); ++void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); ++OPENSSL_STACK *q_OPENSSL_sk_new_null(); ++void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); ++void q_OPENSSL_sk_free(OPENSSL_STACK *a); ++void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); ++int q_SSL_session_reused(SSL *a); ++unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); ++int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); ++size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); ++size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); ++int q_CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); ++const SSL_METHOD *q_TLS_method(); ++const SSL_METHOD *q_TLS_client_method(); ++const SSL_METHOD *q_TLS_server_method(); ++ASN1_TIME *q_X509_getm_notBefore(X509 *a); ++ASN1_TIME *q_X509_getm_notAfter(X509 *a); ++ ++long q_X509_get_version(X509 *a); ++EVP_PKEY *q_X509_get_pubkey(X509 *a); ++void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb); ++STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx); ++void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); ++int q_DH_bits(DH *dh); ++ ++# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ ++ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) ++ ++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) ++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) ++ ++#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ ++ | OPENSSL_INIT_ADD_ALL_DIGESTS \ ++ | OPENSSL_INIT_LOAD_CONFIG, NULL) ++#define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ ++ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) ++ ++int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); ++void q_CRYPTO_free(void *str, const char *file, int line); ++ ++long q_OpenSSL_version_num(); ++const char *q_OpenSSL_version(int type); ++ ++unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session); ++ ++#endif +diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h +index b2adb3e547..7f9e884045 100644 +--- a/src/network/ssl/qsslsocket_openssl_p.h ++++ b/src/network/ssl/qsslsocket_openssl_p.h +@@ -1,6 +1,6 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -98,8 +98,8 @@ + #include <openssl/crypto.h> + #include <openssl/tls1.h> + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +-typedef _STACK STACK; ++#if QT_CONFIG(opensslv11) ++#include <openssl/dh.h> + #endif + + QT_BEGIN_NAMESPACE +@@ -151,7 +151,7 @@ public: + #endif + + Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); +- static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); ++ static QSslCipher QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher); + static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); + static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName); + static QString getErrorsFromOpenSsl(); +diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +index c344a94427..0ef8bf6b5e 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -1,7 +1,8 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. + ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. ++** Copyright (C) 2016 Richard J. Moore <rich@kde.org> + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtNetwork module of the Qt Toolkit. +@@ -136,49 +137,195 @@ void qsslSocketCannotResolveSymbolWarning(const char *functionName) + + #endif // QT_LINKED_OPENSSL + ++#if QT_CONFIG(opensslv11) ++ ++// Below are the functions first introduced in version 1.1: ++ ++DEFINEFUNC(const unsigned char *, ASN1_STRING_get0_data, const ASN1_STRING *a, a, return 0, return) ++DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) ++DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) ++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) ++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) ++DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) ++DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) ++DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) ++DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) ++DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) ++DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) ++DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) ++DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) ++DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return) ++DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) ++DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) ++DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) ++DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) ++DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) ++ ++DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return 0, return) ++DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return) ++DEFINEFUNC(EVP_PKEY *, X509_get_pubkey, X509 *a, a, return 0, return) ++DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_verify_cb verify_cb, verify_cb, return, DUMMYARG) ++DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return) ++DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) ++DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) ++DEFINEFUNC(const char *, OpenSSL_version, int a, a, return 0, return) ++DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) ++DEFINEFUNC4(void, DH_get0_pqg, const DH *dh, dh, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, DUMMYARG) ++DEFINEFUNC(int, DH_bits, DH *dh, dh, return 0, return) ++ ++#else // QT_CONFIG(opensslv11) ++ ++// Functions below are either deprecated or removed in OpenSSL >= 1.1: ++ ++DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) ++ + #ifdef SSLEAY_MACROS + DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return 0, return) + #endif ++DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return) ++DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) ++DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) ++DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) ++DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) ++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) ++DEFINEFUNC(unsigned long, ERR_peek_last_error, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) ++DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) ++DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) ++ ++#ifdef SSLEAY_MACROS ++DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) ++DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) ++#endif // SSLEAY_MACROS ++ ++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) ++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) ++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) ++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) ++#else ++DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) ++DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) ++DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10000000L ++ ++DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) ++DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#ifndef OPENSSL_NO_SSL2 ++DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#ifndef OPENSSL_NO_SSL2 ++DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#else ++#ifndef OPENSSL_NO_SSL2 ++DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#ifndef OPENSSL_NO_SSL2 ++DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif ++ ++DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) ++ ++#ifdef SSLEAY_MACROS ++DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) ++DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) ++#ifndef OPENSSL_NO_EC ++DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) ++#endif ++DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) ++DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) ++#ifndef OPENSSL_NO_EC ++DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) ++#endif ++#endif ++DEFINEFUNC(char *, CONF_get1_default_config_file, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) ++DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) ++DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) ++DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) ++ ++#endif // QT_CONFIG(opensslv11) ++ + DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return) +-DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) + DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) +-DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); ++DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) + DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) + DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) +-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) + DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) + DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) +-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++ + DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) + DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +-DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) +-#endif + DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return static_cast<BN_ULONG>(-1), return) + #ifndef OPENSSL_NO_EC + DEFINEFUNC(const EC_GROUP*, EC_KEY_get0_group, const EC_KEY* k, k, return 0, return) + DEFINEFUNC(int, EC_GROUP_get_degree, const EC_GROUP* g, g, return 0, return) + #endif +-DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) +-DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) +-DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) + DEFINEFUNC(DSA *, DSA_new, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) + DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, const unsigned char **b, b, long c, c, return 0, return) + DEFINEFUNC2(char *, ERR_error_string, unsigned long a, a, char *b, b, return 0, return) + DEFINEFUNC(unsigned long, ERR_get_error, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) +-DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) +-DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) +-DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return); ++DEFINEFUNC(EVP_CIPHER_CTX *, EVP_CIPHER_CTX_new, void, DUMMYARG, return 0, return) ++DEFINEFUNC(void, EVP_CIPHER_CTX_free, EVP_CIPHER_CTX *a, a, return, DUMMYARG) ++DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return) + DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int keylen, keylen, return 0, return) +-DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return); +-DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return); +-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return); ++DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) ++DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) ++DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) ++DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) + DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(const EVP_MD *, EVP_sha1, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC3(int, EVP_PKEY_assign, EVP_PKEY *a, a, int b, b, char *c, c, return -1, return) + DEFINEFUNC2(int, EVP_PKEY_set1_RSA, EVP_PKEY *a, a, RSA *b, b, return -1, return) + DEFINEFUNC2(int, EVP_PKEY_set1_DSA, EVP_PKEY *a, a, DSA *b, b, return -1, return) +@@ -202,10 +349,8 @@ DEFINEFUNC3(int, i2t_ASN1_OBJECT, char *a, a, int b, b, ASN1_OBJECT *c, c, retur + DEFINEFUNC4(int, OBJ_obj2txt, char *a, a, int b, b, ASN1_OBJECT *c, c, int d, d, return -1, return) + + DEFINEFUNC(int, OBJ_obj2nid, const ASN1_OBJECT *a, a, return NID_undef, return) +-#ifdef SSLEAY_MACROS +-DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) +-DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) +-#else ++ ++#ifndef SSLEAY_MACROS + DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PrivateKey, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) + DEFINEFUNC4(DSA *, PEM_read_bio_DSAPrivateKey, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) + DEFINEFUNC4(RSA *, PEM_read_bio_RSAPrivateKey, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) +@@ -218,7 +363,7 @@ DEFINEFUNC7(int, PEM_write_bio_RSAPrivateKey, BIO *a, a, RSA *b, b, const EVP_CI + #ifndef OPENSSL_NO_EC + DEFINEFUNC7(int, PEM_write_bio_ECPrivateKey, BIO *a, a, EC_KEY *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) + #endif +-#endif ++#endif // !SSLEAY_MACROS + DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PUBKEY, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) + DEFINEFUNC4(DSA *, PEM_read_bio_DSA_PUBKEY, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) + DEFINEFUNC4(RSA *, PEM_read_bio_RSA_PUBKEY, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) +@@ -234,23 +379,10 @@ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) + DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) + DEFINEFUNC(RSA *, RSA_new, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) +-DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) +-DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +-DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) +-DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) +-DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) +-#else +-DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) +-DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) +-DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) +-#endif + DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) + DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) +-DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) +-DEFINEFUNC2(int, SSL_CIPHER_get_bits, SSL_CIPHER *a, a, int *b, b, return 0, return) ++DEFINEFUNC3(char *, SSL_CIPHER_description, const SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) ++DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *a, a, int *b, b, return 0, return) + DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return) + DEFINEFUNC(int, SSL_CTX_check_private_key, const SSL_CTX *a, a, return -1, return) + DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) +@@ -287,8 +419,6 @@ DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return) + #else + DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) + #endif +-DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) +-DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) + DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) + DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) + DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) +@@ -301,7 +431,6 @@ DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) + DEFINEFUNC(SSL_SESSION*, SSL_get1_session, SSL *ssl, ssl, return 0, return) + DEFINEFUNC(SSL_SESSION*, SSL_get_session, const SSL *ssl, ssl, return 0, return) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L +-DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) + DEFINEFUNC3(int, SSL_set_ex_data, SSL *ssl, ssl, int idx, idx, void *arg, arg, return 0, return) + DEFINEFUNC2(void *, SSL_get_ex_data, const SSL *ssl, ssl, int idx, idx, return NULL, return) + #endif +@@ -310,51 +439,9 @@ DEFINEFUNC2(void, SSL_set_psk_client_callback, SSL* ssl, ssl, q_psk_client_callb + DEFINEFUNC2(void, SSL_set_psk_server_callback, SSL* ssl, ssl, q_psk_server_callback_t callback, callback, return, DUMMYARG) + DEFINEFUNC2(int, SSL_CTX_use_psk_identity_hint, SSL_CTX* ctx, ctx, const char *hint, hint, return 0, return) + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +-#ifndef OPENSSL_NO_SSL2 +-DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +-DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#ifndef OPENSSL_NO_SSL2 +-DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +-DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#else +-#ifndef OPENSSL_NO_SSL2 +-DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) +-#ifndef OPENSSL_NO_SSL2 +-DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif +-DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) +-#endif + DEFINEFUNC3(int, SSL_write, SSL *a, a, const void *b, b, int c, c, return -1, return) + DEFINEFUNC2(int, X509_cmp, X509 *a, a, X509 *b, b, return -1, return) ++DEFINEFUNC4(int, X509_digest, const X509 *x509, x509, const EVP_MD *type, type, unsigned char *md, md, unsigned int *len, len, return -1, return) + #ifndef SSLEAY_MACROS + DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return 0, return) + #endif +@@ -378,6 +465,7 @@ DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, ASN1_STRING *b, b, return 0, retu + DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) + DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return 0, return) + DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return 0, return) ++DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return 0, return) + DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) + DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return 0, return) +@@ -393,25 +481,8 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, ret + DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) +-DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) + DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) +-#ifdef SSLEAY_MACROS +-DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) +-DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) +-#ifndef OPENSSL_NO_EC +-DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) +-#endif +-DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) +-DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) +-#ifndef OPENSSL_NO_EC +-DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) +-#endif +-#endif +-DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) +-DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) + DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) +-DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) +-DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) + DEFINEFUNC2(int, i2d_SSL_SESSION, SSL_SESSION *in, in, unsigned char **pp, pp, return 0, return) + DEFINEFUNC3(SSL_SESSION *, d2i_SSL_SESSION, SSL_SESSION **a, a, const unsigned char **pp, pp, long length, length, return 0, return) + #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) +@@ -694,8 +765,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() + #ifndef Q_OS_DARWIN + // second attempt: find the development files libssl.so and libcrypto.so + // +- // disabled on OS X/iOS: +- // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third ++ // disabled on macOS/iOS: ++ // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third + // attempt, _after_ <bundle>/Contents/Frameworks has been searched. + // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. + libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +@@ -754,7 +825,11 @@ bool q_resolveOpenSslSymbols() + static bool symbolsResolved = false; + static bool triedToResolveSymbols = false; + #ifndef QT_NO_THREAD ++#if QT_CONFIG(opensslv11) ++ QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl)); ++#else + QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init)); ++#endif + #endif + if (symbolsResolved) + return true; +@@ -771,11 +846,145 @@ bool q_resolveOpenSslSymbols() + // failed to load them + return false; + ++#if QT_CONFIG(opensslv11) ++ ++ RESOLVEFUNC(OPENSSL_init_ssl) ++ RESOLVEFUNC(OPENSSL_init_crypto) ++ RESOLVEFUNC(ASN1_STRING_get0_data) ++ RESOLVEFUNC(EVP_CIPHER_CTX_reset) ++ RESOLVEFUNC(EVP_PKEY_base_id) ++ RESOLVEFUNC(RSA_bits) ++ RESOLVEFUNC(OPENSSL_sk_new_null) ++ RESOLVEFUNC(OPENSSL_sk_push) ++ RESOLVEFUNC(OPENSSL_sk_free) ++ RESOLVEFUNC(OPENSSL_sk_num) ++ RESOLVEFUNC(OPENSSL_sk_pop_free) ++ RESOLVEFUNC(OPENSSL_sk_value) ++ RESOLVEFUNC(DH_get0_pqg) ++ RESOLVEFUNC(SSL_CTX_set_options) ++ RESOLVEFUNC(SSL_get_client_random) ++ RESOLVEFUNC(SSL_SESSION_get_master_key) ++ RESOLVEFUNC(SSL_session_reused) ++ RESOLVEFUNC(SSL_get_session) ++ RESOLVEFUNC(CRYPTO_get_ex_new_index) ++ RESOLVEFUNC(TLS_method) ++ RESOLVEFUNC(TLS_client_method) ++ RESOLVEFUNC(TLS_server_method) ++ RESOLVEFUNC(X509_STORE_CTX_get0_chain) ++ RESOLVEFUNC(X509_getm_notBefore) ++ RESOLVEFUNC(X509_getm_notAfter) ++ RESOLVEFUNC(X509_get_version) ++ RESOLVEFUNC(X509_get_pubkey) ++ RESOLVEFUNC(X509_STORE_set_verify_cb) ++ RESOLVEFUNC(CRYPTO_free) ++ RESOLVEFUNC(OpenSSL_version_num) ++ RESOLVEFUNC(OpenSSL_version) ++ if (!_q_OpenSSL_version) { ++ // Apparently, we were built with OpenSSL 1.1 enabled but are now using ++ // a wrong library. ++ delete libs.first; ++ delete libs.second; ++ qCWarning(lcSsl, "Incompatible version of OpenSSL"); ++ return false; ++ } ++ ++ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) ++ RESOLVEFUNC(DH_bits) ++ RESOLVEFUNC(DSA_bits) ++ ++#else // !opensslv11 ++ ++ RESOLVEFUNC(ASN1_STRING_data) ++ + #ifdef SSLEAY_MACROS + RESOLVEFUNC(ASN1_dup) ++#endif // SSLEAY_MACROS ++ RESOLVEFUNC(BIO_new_file) ++ RESOLVEFUNC(ERR_clear_error) ++ RESOLVEFUNC(CRYPTO_free) ++ RESOLVEFUNC(CRYPTO_num_locks) ++ RESOLVEFUNC(CRYPTO_set_id_callback) ++ RESOLVEFUNC(CRYPTO_set_locking_callback) ++ RESOLVEFUNC(ERR_peek_last_error) ++ RESOLVEFUNC(ERR_free_strings) ++ RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) ++ RESOLVEFUNC(EVP_CIPHER_CTX_init) ++ ++#ifdef SSLEAY_MACROS // ### verify ++ RESOLVEFUNC(PEM_ASN1_read_bio) ++#endif // SSLEAY_MACROS ++ ++ RESOLVEFUNC(sk_new_null) ++ RESOLVEFUNC(sk_push) ++ RESOLVEFUNC(sk_free) ++ RESOLVEFUNC(sk_num) ++ RESOLVEFUNC(sk_pop_free) ++ RESOLVEFUNC(sk_value) ++ RESOLVEFUNC(SSL_library_init) ++ RESOLVEFUNC(SSL_load_error_strings) ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ RESOLVEFUNC(SSL_get_ex_new_index) ++#endif ++#ifndef OPENSSL_NO_SSL2 ++ RESOLVEFUNC(SSLv2_client_method) + #endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++ RESOLVEFUNC(SSLv3_client_method) ++#endif ++ RESOLVEFUNC(SSLv23_client_method) ++ RESOLVEFUNC(TLSv1_client_method) ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ RESOLVEFUNC(TLSv1_1_client_method) ++ RESOLVEFUNC(TLSv1_2_client_method) ++#endif ++#ifndef OPENSSL_NO_SSL2 ++ RESOLVEFUNC(SSLv2_server_method) ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++ RESOLVEFUNC(SSLv3_server_method) ++#endif ++ RESOLVEFUNC(SSLv23_server_method) ++ RESOLVEFUNC(TLSv1_server_method) ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ RESOLVEFUNC(TLSv1_1_server_method) ++ RESOLVEFUNC(TLSv1_2_server_method) ++#endif ++ RESOLVEFUNC(X509_STORE_CTX_get_chain) ++#ifdef SSLEAY_MACROS ++ RESOLVEFUNC(i2d_DSAPrivateKey) ++ RESOLVEFUNC(i2d_RSAPrivateKey) ++ RESOLVEFUNC(d2i_DSAPrivateKey) ++ RESOLVEFUNC(d2i_RSAPrivateKey) ++#endif ++ RESOLVEFUNC(CONF_get1_default_config_file) ++ RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) ++ RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) ++ RESOLVEFUNC(SSLeay) ++ ++ if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { ++ // OpenSSL 1.1 has deprecated and removed SSLeay. We consider a failure to ++ // resolve this symbol as a failure to resolve symbols. ++ // The right operand of '||' above is ... a bit of paranoia. ++ delete libs.first; ++ delete libs.second; ++ qCWarning(lcSsl, "Incompatible version of OpenSSL"); ++ return false; ++ } ++ ++ ++ RESOLVEFUNC(SSLeay_version) ++ ++#ifndef OPENSSL_NO_EC ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++ if (q_SSLeay() >= 0x10002000L) ++ RESOLVEFUNC(EC_curve_nist2nid) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ++#endif // OPENSSL_NO_EC ++ ++ ++#endif // !opensslv11 ++ + RESOLVEFUNC(ASN1_INTEGER_get) +- RESOLVEFUNC(ASN1_STRING_data) + RESOLVEFUNC(ASN1_STRING_length) + RESOLVEFUNC(ASN1_STRING_to_UTF8) + RESOLVEFUNC(BIO_ctrl) +@@ -794,25 +1003,22 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(BN_is_word) + #endif + RESOLVEFUNC(BN_mod_word) +- RESOLVEFUNC(CRYPTO_free) +- RESOLVEFUNC(CRYPTO_num_locks) +- RESOLVEFUNC(CRYPTO_set_id_callback) +- RESOLVEFUNC(CRYPTO_set_locking_callback) + RESOLVEFUNC(DSA_new) + RESOLVEFUNC(DSA_free) + RESOLVEFUNC(ERR_error_string) + RESOLVEFUNC(ERR_get_error) +- RESOLVEFUNC(ERR_free_strings) +- RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) +- RESOLVEFUNC(EVP_CIPHER_CTX_init) ++ RESOLVEFUNC(EVP_CIPHER_CTX_new) ++ RESOLVEFUNC(EVP_CIPHER_CTX_free) + RESOLVEFUNC(EVP_CIPHER_CTX_ctrl) + RESOLVEFUNC(EVP_CIPHER_CTX_set_key_length) + RESOLVEFUNC(EVP_CipherInit) ++ RESOLVEFUNC(EVP_CipherInit_ex) + RESOLVEFUNC(EVP_CipherUpdate) + RESOLVEFUNC(EVP_CipherFinal) + RESOLVEFUNC(EVP_des_cbc) + RESOLVEFUNC(EVP_des_ede3_cbc) + RESOLVEFUNC(EVP_rc2_cbc) ++ RESOLVEFUNC(EVP_sha1) + RESOLVEFUNC(EVP_PKEY_assign) + RESOLVEFUNC(EVP_PKEY_set1_RSA) + RESOLVEFUNC(EVP_PKEY_set1_DSA) +@@ -834,9 +1040,8 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(i2t_ASN1_OBJECT) + RESOLVEFUNC(OBJ_obj2txt) + RESOLVEFUNC(OBJ_obj2nid) +-#ifdef SSLEAY_MACROS // ### verify +- RESOLVEFUNC(PEM_ASN1_read_bio) +-#else ++ ++#ifndef SSLEAY_MACROS + RESOLVEFUNC(PEM_read_bio_PrivateKey) + RESOLVEFUNC(PEM_read_bio_DSAPrivateKey) + RESOLVEFUNC(PEM_read_bio_RSAPrivateKey) +@@ -849,7 +1054,8 @@ bool q_resolveOpenSslSymbols() + #ifndef OPENSSL_NO_EC + RESOLVEFUNC(PEM_write_bio_ECPrivateKey) + #endif +-#endif ++#endif // !SSLEAY_MACROS ++ + RESOLVEFUNC(PEM_read_bio_PUBKEY) + RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY) + RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY) +@@ -865,12 +1071,6 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(RAND_status) + RESOLVEFUNC(RSA_new) + RESOLVEFUNC(RSA_free) +- RESOLVEFUNC(sk_new_null) +- RESOLVEFUNC(sk_push) +- RESOLVEFUNC(sk_free) +- RESOLVEFUNC(sk_num) +- RESOLVEFUNC(sk_pop_free) +- RESOLVEFUNC(sk_value) + RESOLVEFUNC(SSL_CIPHER_description) + RESOLVEFUNC(SSL_CIPHER_get_bits) + RESOLVEFUNC(SSL_CTX_check_private_key) +@@ -898,8 +1098,6 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(SSL_get_peer_cert_chain) + RESOLVEFUNC(SSL_get_peer_certificate) + RESOLVEFUNC(SSL_get_verify_result) +- RESOLVEFUNC(SSL_library_init) +- RESOLVEFUNC(SSL_load_error_strings) + RESOLVEFUNC(SSL_new) + RESOLVEFUNC(SSL_ctrl) + RESOLVEFUNC(SSL_read) +@@ -912,7 +1110,6 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(SSL_get1_session) + RESOLVEFUNC(SSL_get_session) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L +- RESOLVEFUNC(SSL_get_ex_new_index) + RESOLVEFUNC(SSL_set_ex_data) + RESOLVEFUNC(SSL_get_ex_data) + #endif +@@ -922,30 +1119,6 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(SSL_CTX_use_psk_identity_hint) + #endif + RESOLVEFUNC(SSL_write) +-#ifndef OPENSSL_NO_SSL2 +- RESOLVEFUNC(SSLv2_client_method) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +- RESOLVEFUNC(SSLv3_client_method) +-#endif +- RESOLVEFUNC(SSLv23_client_method) +- RESOLVEFUNC(TLSv1_client_method) +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- RESOLVEFUNC(TLSv1_1_client_method) +- RESOLVEFUNC(TLSv1_2_client_method) +-#endif +-#ifndef OPENSSL_NO_SSL2 +- RESOLVEFUNC(SSLv2_server_method) +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +- RESOLVEFUNC(SSLv3_server_method) +-#endif +- RESOLVEFUNC(SSLv23_server_method) +- RESOLVEFUNC(TLSv1_server_method) +-#if OPENSSL_VERSION_NUMBER >= 0x10001000L +- RESOLVEFUNC(TLSv1_1_server_method) +- RESOLVEFUNC(TLSv1_2_server_method) +-#endif + RESOLVEFUNC(X509_NAME_entry_count) + RESOLVEFUNC(X509_NAME_get_entry) + RESOLVEFUNC(X509_NAME_ENTRY_get_data) +@@ -961,12 +1134,12 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(X509_STORE_CTX_get_error) + RESOLVEFUNC(X509_STORE_CTX_get_error_depth) + RESOLVEFUNC(X509_STORE_CTX_get_current_cert) +- RESOLVEFUNC(X509_STORE_CTX_get_chain) + RESOLVEFUNC(X509_cmp) + #ifndef SSLEAY_MACROS + RESOLVEFUNC(X509_dup) + #endif + RESOLVEFUNC(X509_print) ++ RESOLVEFUNC(X509_digest) + RESOLVEFUNC(X509_EXTENSION_get_object) + RESOLVEFUNC(X509_free) + RESOLVEFUNC(X509_get_ext) +@@ -982,20 +1155,11 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(X509_check_issued) + RESOLVEFUNC(X509_get_issuer_name) + RESOLVEFUNC(X509_get_subject_name) ++ RESOLVEFUNC(X509_get_serialNumber) + RESOLVEFUNC(X509_verify_cert) + RESOLVEFUNC(d2i_X509) + RESOLVEFUNC(i2d_X509) +-#ifdef SSLEAY_MACROS +- RESOLVEFUNC(i2d_DSAPrivateKey) +- RESOLVEFUNC(i2d_RSAPrivateKey) +- RESOLVEFUNC(d2i_DSAPrivateKey) +- RESOLVEFUNC(d2i_RSAPrivateKey) +-#endif +- RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) +- RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) + RESOLVEFUNC(SSL_CTX_load_verify_locations) +- RESOLVEFUNC(SSLeay) +- RESOLVEFUNC(SSLeay_version) + RESOLVEFUNC(i2d_SSL_SESSION) + RESOLVEFUNC(d2i_SSL_SESSION) + #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) +@@ -1019,27 +1183,14 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(EC_KEY_new_by_curve_name) + RESOLVEFUNC(EC_KEY_free) + RESOLVEFUNC(EC_get_builtin_curves) +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L +- if (q_SSLeay() >= 0x10002000L) +- RESOLVEFUNC(EC_curve_nist2nid) +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L + #endif // OPENSSL_NO_EC + RESOLVEFUNC(PKCS12_parse) + RESOLVEFUNC(d2i_PKCS12_bio) + RESOLVEFUNC(PKCS12_free) + ++ symbolsResolved = true; + delete libs.first; + delete libs.second; +- if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { +- // OpenSSL 1.1 deprecated and removed SSLeay. We consider a failure to +- // resolve this symbol as a failure to resolve symbols. +- // The right operand of '||' above ... a bit of paranoia. +- qCWarning(lcSsl, "Incompatible version of OpenSSL"); +- return false; +- } +- +- symbolsResolved = true; +- + return true; + } + #endif // QT_CONFIG(library) +diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h +index b35a895d38..796bf2d4f5 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -1,6 +1,6 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. ++** Copyright (C) 2017 The Qt Company Ltd. + ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. + ** Contact: https://www.qt.io/licensing/ + ** +@@ -56,6 +56,7 @@ + #ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H + #define QSSLSOCKET_OPENSSL_SYMBOLS_P_H + ++ + // + // W A R N I N G + // ------------- +@@ -215,17 +216,20 @@ QT_BEGIN_NAMESPACE + + #endif // !defined QT_LINKED_OPENSSL + ++#if QT_CONFIG(opensslv11) ++#include "qsslsocket_openssl11_symbols_p.h" ++#else ++#include "qsslsocket_opensslpre11_symbols_p.h" ++#endif // QT_CONFIG ++ + bool q_resolveOpenSslSymbols(); + long q_ASN1_INTEGER_get(ASN1_INTEGER *a); +-unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); + int q_ASN1_STRING_length(ASN1_STRING *a); + int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); + long q_BIO_ctrl(BIO *a, int b, long c, void *d); + Q_AUTOTEST_EXPORT int q_BIO_free(BIO *a); +-Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); + BIO *q_BIO_new_mem_buf(void *a, int b); + int q_BIO_read(BIO *a, void *b, int c); +-Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); + Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); + int q_BN_num_bits(const BIGNUM *a); + #if OPENSSL_VERSION_NUMBER >= 0x10100000L +@@ -247,26 +251,23 @@ BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); + const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); + int q_EC_GROUP_get_degree(const EC_GROUP* g); + #endif +-int q_CRYPTO_num_locks(); +-void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); +-void q_CRYPTO_set_id_callback(unsigned long (*a)()); +-void q_CRYPTO_free(void *a); + DSA *q_DSA_new(); + void q_DSA_free(DSA *a); + X509 *q_d2i_X509(X509 **a, const unsigned char **b, long c); + char *q_ERR_error_string(unsigned long a, char *b); + unsigned long q_ERR_get_error(); +-void q_ERR_free_strings(); +-void q_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); +-void q_EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); ++EVP_CIPHER_CTX *q_EVP_CIPHER_CTX_new(); ++void q_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a); + int q_EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); + int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen); + int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc); ++int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); + int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); + int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); + const EVP_CIPHER *q_EVP_des_cbc(); + const EVP_CIPHER *q_EVP_des_ede3_cbc(); + const EVP_CIPHER *q_EVP_rc2_cbc(); ++const EVP_MD *q_EVP_sha1(); + int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c); + Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b); + int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b); +@@ -310,7 +311,7 @@ int q_PEM_write_bio_RSAPrivateKey(BIO *a, RSA *b, const EVP_CIPHER *c, unsigned + int q_PEM_write_bio_ECPrivateKey(BIO *a, EC_KEY *b, const EVP_CIPHER *c, unsigned char *d, + int e, pem_password_cb *f, void *g); + #endif +-#endif ++#endif // SSLEAY_MACROS + Q_AUTOTEST_EXPORT EVP_PKEY *q_PEM_read_bio_PUBKEY(BIO *a, EVP_PKEY **b, pem_password_cb *c, void *d); + DSA *q_PEM_read_bio_DSA_PUBKEY(BIO *a, DSA **b, pem_password_cb *c, void *d); + RSA *q_PEM_read_bio_RSA_PUBKEY(BIO *a, RSA **b, pem_password_cb *c, void *d); +@@ -326,23 +327,10 @@ void q_RAND_seed(const void *a, int b); + int q_RAND_status(); + RSA *q_RSA_new(); + void q_RSA_free(RSA *a); +-int q_sk_num(STACK *a); +-void q_sk_pop_free(STACK *a, void (*b)(void *)); +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +-_STACK *q_sk_new_null(); +-void q_sk_push(_STACK *st, void *data); +-void q_sk_free(_STACK *a); +-void * q_sk_value(STACK *a, int b); +-#else +-STACK *q_sk_new_null(); +-void q_sk_push(STACK *st, char *data); +-void q_sk_free(STACK *a); +-char * q_sk_value(STACK *a, int b); +-#endif + int q_SSL_accept(SSL *a); + int q_SSL_clear(SSL *a); +-char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); +-int q_SSL_CIPHER_get_bits(SSL_CIPHER *a, int *b); ++char *q_SSL_CIPHER_description(const SSL_CIPHER *a, char *b, int c); ++int q_SSL_CIPHER_get_bits(const SSL_CIPHER *a, int *b); + int q_SSL_connect(SSL *a); + int q_SSL_CTX_check_private_key(const SSL_CTX *a); + long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); +@@ -374,8 +362,6 @@ int q_SSL_get_error(SSL *a, int b); + STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a); + X509 *q_SSL_get_peer_certificate(SSL *a); + long q_SSL_get_verify_result(const SSL *a); +-int q_SSL_library_init(); +-void q_SSL_load_error_strings(); + SSL *q_SSL_new(SSL_CTX *a); + long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); + int q_SSL_read(SSL *a, void *b, int c); +@@ -388,7 +374,6 @@ void q_SSL_SESSION_free(SSL_SESSION *ses); + SSL_SESSION *q_SSL_get1_session(SSL *ssl); + SSL_SESSION *q_SSL_get_session(const SSL *ssl); + #if OPENSSL_VERSION_NUMBER >= 0x10001000L +-int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); + int q_SSL_set_ex_data(SSL *ssl, int idx, void *arg); + void *q_SSL_get_ex_data(const SSL *ssl, int idx); + #endif +@@ -399,49 +384,6 @@ typedef unsigned int (*q_psk_server_callback_t)(SSL *ssl, const char *identity, + void q_SSL_set_psk_server_callback(SSL *ssl, q_psk_server_callback_t callback); + int q_SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *hint); + #endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +-#ifndef OPENSSL_NO_SSL2 +-const SSL_METHOD *q_SSLv2_client_method(); +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-const SSL_METHOD *q_SSLv3_client_method(); +-#endif +-const SSL_METHOD *q_SSLv23_client_method(); +-const SSL_METHOD *q_TLSv1_client_method(); +-const SSL_METHOD *q_TLSv1_1_client_method(); +-const SSL_METHOD *q_TLSv1_2_client_method(); +-#ifndef OPENSSL_NO_SSL2 +-const SSL_METHOD *q_SSLv2_server_method(); +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-const SSL_METHOD *q_SSLv3_server_method(); +-#endif +-const SSL_METHOD *q_SSLv23_server_method(); +-const SSL_METHOD *q_TLSv1_server_method(); +-const SSL_METHOD *q_TLSv1_1_server_method(); +-const SSL_METHOD *q_TLSv1_2_server_method(); +-#else +-#ifndef OPENSSL_NO_SSL2 +-SSL_METHOD *q_SSLv2_client_method(); +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-SSL_METHOD *q_SSLv3_client_method(); +-#endif +-SSL_METHOD *q_SSLv23_client_method(); +-SSL_METHOD *q_TLSv1_client_method(); +-SSL_METHOD *q_TLSv1_1_client_method(); +-SSL_METHOD *q_TLSv1_2_client_method(); +-#ifndef OPENSSL_NO_SSL2 +-SSL_METHOD *q_SSLv2_server_method(); +-#endif +-#ifndef OPENSSL_NO_SSL3_METHOD +-SSL_METHOD *q_SSLv3_server_method(); +-#endif +-SSL_METHOD *q_SSLv23_server_method(); +-SSL_METHOD *q_TLSv1_server_method(); +-SSL_METHOD *q_TLSv1_1_server_method(); +-SSL_METHOD *q_TLSv1_2_server_method(); +-#endif + int q_SSL_write(SSL *a, const void *b, int c); + int q_X509_cmp(X509 *a, X509 *b); + #ifdef SSLEAY_MACROS +@@ -452,6 +394,7 @@ void *q_ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x); + X509 *q_X509_dup(X509 *a); + #endif + void q_X509_print(BIO *a, X509*b); ++int q_X509_digest(const X509 *x509, const EVP_MD *type, unsigned char *md, unsigned int *len); + ASN1_OBJECT *q_X509_EXTENSION_get_object(X509_EXTENSION *a); + void q_X509_free(X509 *a); + X509_EXTENSION *q_X509_get_ext(X509 *a, int b); +@@ -471,6 +414,7 @@ int q_ASN1_STRING_print(BIO *a, ASN1_STRING *b); + int q_X509_check_issued(X509 *a, X509 *b); + X509_NAME *q_X509_get_issuer_name(X509 *a); + X509_NAME *q_X509_get_subject_name(X509 *a); ++ASN1_INTEGER *q_X509_get_serialNumber(X509 *a); + int q_X509_verify_cert(X509_STORE_CTX *ctx); + int q_X509_NAME_entry_count(X509_NAME *a); + X509_NAME_ENTRY *q_X509_NAME_get_entry(X509_NAME *a,int b); +@@ -488,7 +432,6 @@ int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); + int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); + int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); + X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); +-STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); + + // Diffie-Hellman support + DH *q_DH_new(); +@@ -522,34 +465,9 @@ int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, + PKCS12 *q_d2i_PKCS12_bio(BIO *bio, PKCS12 **pkcs12); + void q_PKCS12_free(PKCS12 *pkcs12); + +- + #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) + #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) +-#ifdef SSLEAY_MACROS +-int q_i2d_DSAPrivateKey(const DSA *a, unsigned char **pp); +-int q_i2d_RSAPrivateKey(const RSA *a, unsigned char **pp); +-RSA *q_d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length); +-DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); +-#define q_PEM_read_bio_RSAPrivateKey(bp, x, cb, u) \ +- (RSA *)q_PEM_ASN1_read_bio( \ +- (void *(*)(void**, const unsigned char**, long int))q_d2i_RSAPrivateKey, PEM_STRING_RSA, bp, (void **)x, cb, u) +-#define q_PEM_read_bio_DSAPrivateKey(bp, x, cb, u) \ +- (DSA *)q_PEM_ASN1_read_bio( \ +- (void *(*)(void**, const unsigned char**, long int))q_d2i_DSAPrivateKey, PEM_STRING_DSA, bp, (void **)x, cb, u) +-#define q_PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ +- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_RSAPrivateKey,PEM_STRING_RSA,\ +- bp,(char *)x,enc,kstr,klen,cb,u) +-#define q_PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ +- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ +- bp,(char *)x,enc,kstr,klen,cb,u) +-#define q_PEM_read_bio_DHparams(bp, dh, cb, u) \ +- (DH *)q_PEM_ASN1_read_bio( \ +- (void *(*)(void**, const unsigned char**, long int))q_d2i_DHparams, PEM_STRING_DHPARAMS, bp, (void **)x, cb, u) +-#endif +-#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) + #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) +-#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) +-#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) + #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) + #define q_sk_GENERAL_NAME_value(st, i) q_SKM_sk_value(GENERAL_NAME, (st), (i)) + #define q_sk_X509_num(st) q_SKM_sk_num(X509, (st)) +@@ -558,18 +476,12 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); + #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) + #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ + q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) +-#define q_X509_get_notAfter(x) X509_get_notAfter(x) +-#define q_X509_get_notBefore(x) X509_get_notBefore(x) + #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ + (char *)(rsa)) + #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ + (char *)(dsa)) + #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_conf() +-void q_OPENSSL_add_all_algorithms_noconf(); +-void q_OPENSSL_add_all_algorithms_conf(); + int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); +-long q_SSLeay(); +-const char *q_SSLeay_version(int type); + int q_i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); + SSL_SESSION *q_d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length); + +diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp +new file mode 100644 +index 0000000000..e51888c5f2 +--- /dev/null ++++ b/src/network/ssl/qsslsocket_opensslpre11.cpp +@@ -0,0 +1,424 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Copyright (C) 2014 Governikus GmbH & Co. KG ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtNetwork module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++/**************************************************************************** ++** ++** In addition, as a special exception, the copyright holders listed above give ++** permission to link the code of its release of Qt with the OpenSSL project's ++** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the ++** same license as the original version), and distribute the linked executables. ++** ++** You must comply with the GNU General Public License version 2 in all ++** respects for all of the code used other than the "OpenSSL" code. If you ++** modify this file, you may extend this exception to your version of the file, ++** but you are not obligated to do so. If you do not wish to do so, delete ++** this exception statement from your version of this file. ++** ++****************************************************************************/ ++ ++//#define QT_DECRYPT_SSL_TRAFFIC ++ ++#include "qssl_p.h" ++#include "qsslsocket_openssl_p.h" ++#include "qsslsocket_openssl_symbols_p.h" ++#include "qsslsocket.h" ++#include "qsslkey.h" ++ ++#include <QtCore/qdebug.h> ++#include <QtCore/qdir.h> ++#include <QtCore/qdiriterator.h> ++#include <QtCore/qthread.h> ++#include <QtCore/qfile.h> ++#include <QtCore/qmutex.h> ++#include <QtCore/qlibrary.h> ++ ++QT_BEGIN_NAMESPACE ++ ++/* \internal ++ ++ From OpenSSL's thread(3) manual page: ++ ++ OpenSSL can safely be used in multi-threaded applications provided that at ++ least two callback functions are set. ++ ++ locking_function(int mode, int n, const char *file, int line) is needed to ++ perform locking on shared data structures. (Note that OpenSSL uses a ++ number of global data structures that will be implicitly shared ++ whenever multiple threads use OpenSSL.) Multi-threaded ++ applications will crash at random if it is not set. ... ++ ... ++ id_function(void) is a function that returns a thread ID. It is not ++ needed on Windows nor on platforms where getpid() returns a different ++ ID for each thread (most notably Linux) ++*/ ++ ++class QOpenSslLocks ++{ ++public: ++ QOpenSslLocks() ++ : initLocker(QMutex::Recursive), ++ locksLocker(QMutex::Recursive) ++ { ++ QMutexLocker locker(&locksLocker); ++ int numLocks = q_CRYPTO_num_locks(); ++ locks = new QMutex *[numLocks]; ++ memset(locks, 0, numLocks * sizeof(QMutex *)); ++ } ++ ~QOpenSslLocks() ++ { ++ QMutexLocker locker(&locksLocker); ++ for (int i = 0; i < q_CRYPTO_num_locks(); ++i) ++ delete locks[i]; ++ delete [] locks; ++ ++ QSslSocketPrivate::deinitialize(); ++ } ++ QMutex *lock(int num) ++ { ++ QMutexLocker locker(&locksLocker); ++ QMutex *tmp = locks[num]; ++ if (!tmp) ++ tmp = locks[num] = new QMutex(QMutex::Recursive); ++ return tmp; ++ } ++ ++ QMutex *globalLock() ++ { ++ return &locksLocker; ++ } ++ ++ QMutex *initLock() ++ { ++ return &initLocker; ++ } ++ ++private: ++ QMutex initLocker; ++ QMutex locksLocker; ++ QMutex **locks; ++}; ++ ++Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) ++ ++extern "C" { ++static void locking_function(int mode, int lockNumber, const char *, int) ++{ ++ QMutex *mutex = openssl_locks()->lock(lockNumber); ++ ++ // Lock or unlock it ++ if (mode & CRYPTO_LOCK) ++ mutex->lock(); ++ else ++ mutex->unlock(); ++} ++static unsigned long id_function() ++{ ++ return (quintptr)QThread::currentThreadId(); ++} ++ ++} // extern "C" ++ ++static void q_OpenSSL_add_all_algorithms_safe() ++{ ++#ifdef Q_OS_WIN ++ // Prior to version 1.0.1m an attempt to call OpenSSL_add_all_algorithms on ++ // Windows could result in 'exit' call from OPENSSL_config (QTBUG-43843). ++ // We can predict this and avoid OPENSSL_add_all_algorithms call. ++ // From OpenSSL docs: ++ // "An application does not need to add algorithms to use them explicitly, ++ // for example by EVP_sha1(). It just needs to add them if it (or any of ++ // the functions it calls) needs to lookup algorithms. ++ // The cipher and digest lookup functions are used in many parts of the ++ // library. If the table is not initialized several functions will ++ // misbehave and complain they cannot find algorithms. This includes the ++ // PEM, PKCS#12, SSL and S/MIME libraries. This is a common query in ++ // the OpenSSL mailing lists." ++ // ++ // Anyway, as a result, we chose not to call this function if it would exit. ++ ++ if (q_SSLeay() < 0x100010DFL) ++ { ++ // Now, before we try to call it, check if an attempt to open config file ++ // will result in exit: ++ if (char *confFileName = q_CONF_get1_default_config_file()) { ++ BIO *confFile = q_BIO_new_file(confFileName, "r"); ++ const auto lastError = q_ERR_peek_last_error(); ++ q_CRYPTO_free(confFileName); ++ if (confFile) { ++ q_BIO_free(confFile); ++ } else { ++ q_ERR_clear_error(); ++ if (ERR_GET_REASON(lastError) == ERR_R_SYS_LIB) { ++ qCWarning(lcSsl, "failed to open openssl.conf file"); ++ return; ++ } ++ } ++ } ++ } ++#endif // Q_OS_WIN ++ ++ q_OpenSSL_add_all_algorithms(); ++} ++ ++ ++/*! ++ \internal ++*/ ++void QSslSocketPrivate::deinitialize() ++{ ++ q_CRYPTO_set_id_callback(0); ++ q_CRYPTO_set_locking_callback(0); ++ q_ERR_free_strings(); ++} ++ ++ ++bool QSslSocketPrivate::ensureLibraryLoaded() ++{ ++ if (!q_resolveOpenSslSymbols()) ++ return false; ++ ++ // Check if the library itself needs to be initialized. ++ QMutexLocker locker(openssl_locks()->initLock()); ++ ++ if (!s_libraryLoaded) { ++ s_libraryLoaded = true; ++ ++ // Initialize OpenSSL. ++ q_CRYPTO_set_id_callback(id_function); ++ q_CRYPTO_set_locking_callback(locking_function); ++ if (q_SSL_library_init() != 1) ++ return false; ++ q_SSL_load_error_strings(); ++ q_OpenSSL_add_all_algorithms_safe(); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10001000L ++ if (q_SSLeay() >= 0x10001000L) ++ QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); ++#endif ++ ++ // Initialize OpenSSL's random seed. ++ if (!q_RAND_status()) { ++ qWarning("Random number generator not seeded, disabling SSL support"); ++ return false; ++ } ++ } ++ return true; ++} ++ ++void QSslSocketPrivate::ensureCiphersAndCertsLoaded() ++{ ++ QMutexLocker locker(openssl_locks()->initLock()); ++ if (s_loadedCiphersAndCerts) ++ return; ++ s_loadedCiphersAndCerts = true; ++ ++ resetDefaultCiphers(); ++ resetDefaultEllipticCurves(); ++ ++#if QT_CONFIG(library) ++ //load symbols needed to receive certificates from system store ++#if defined(Q_OS_WIN) ++ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); ++ if (hLib) { ++ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); ++ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); ++ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); ++ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) ++ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen ++ } else { ++ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen ++ } ++#elif defined(Q_OS_QNX) ++ s_loadRootCertsOnDemand = true; ++#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) ++ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) ++ QList<QByteArray> dirs = unixRootCertDirectories(); ++ QStringList symLinkFilter; ++ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); ++ for (int a = 0; a < dirs.count(); ++a) { ++ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); ++ if (iterator.hasNext()) { ++ s_loadRootCertsOnDemand = true; ++ break; ++ } ++ } ++#endif ++#endif // QT_CONFIG(library) ++ // if on-demand loading was not enabled, load the certs now ++ if (!s_loadRootCertsOnDemand) ++ setDefaultCaCertificates(systemCaCertificates()); ++#ifdef Q_OS_WIN ++ //Enabled for fetching additional root certs from windows update on windows 6+ ++ //This flag is set false by setDefaultCaCertificates() indicating the app uses ++ //its own cert bundle rather than the system one. ++ //Same logic that disables the unix on demand cert loading. ++ //Unlike unix, we do preload the certificates from the cert store. ++ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) ++ s_loadRootCertsOnDemand = true; ++#endif ++} ++ ++long QSslSocketPrivate::sslLibraryVersionNumber() ++{ ++ if (!supportsSsl()) ++ return 0; ++ ++ return q_SSLeay(); ++} ++ ++QString QSslSocketPrivate::sslLibraryVersionString() ++{ ++ if (!supportsSsl()) ++ return QString(); ++ ++ const char *versionString = q_SSLeay_version(SSLEAY_VERSION); ++ if (!versionString) ++ return QString(); ++ ++ return QString::fromLatin1(versionString); ++} ++ ++void QSslSocketBackendPrivate::continueHandshake() ++{ ++ Q_Q(QSslSocket); ++ // if we have a max read buffer size, reset the plain socket's to match ++ if (readBufferMaxSize) ++ plainSocket->setReadBufferSize(readBufferMaxSize); ++ ++ if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) ++ configuration.peerSessionShared = true; ++ ++#ifdef QT_DECRYPT_SSL_TRAFFIC ++ if (ssl->session && ssl->s3) { ++ const char *mk = reinterpret_cast<const char *>(ssl->session->master_key); ++ QByteArray masterKey(mk, ssl->session->master_key_length); ++ const char *random = reinterpret_cast<const char *>(ssl->s3->client_random); ++ QByteArray clientRandom(random, SSL3_RANDOM_SIZE); ++ ++ // different format, needed for e.g. older Wireshark versions: ++// const char *sid = reinterpret_cast<const char *>(ssl->session->session_id); ++// QByteArray sessionID(sid, ssl->session->session_id_length); ++// QByteArray debugLineRSA("RSA Session-ID:"); ++// debugLineRSA.append(sessionID.toHex().toUpper()); ++// debugLineRSA.append(" Master-Key:"); ++// debugLineRSA.append(masterKey.toHex().toUpper()); ++// debugLineRSA.append("\n"); ++ ++ QByteArray debugLineClientRandom("CLIENT_RANDOM "); ++ debugLineClientRandom.append(clientRandom.toHex().toUpper()); ++ debugLineClientRandom.append(" "); ++ debugLineClientRandom.append(masterKey.toHex().toUpper()); ++ debugLineClientRandom.append("\n"); ++ ++ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); ++ QFile file(sslKeyFile); ++ if (!file.open(QIODevice::Append)) ++ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; ++ if (!file.write(debugLineClientRandom)) ++ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; ++ file.close(); ++ } else { ++ qCWarning(lcSsl, "could not decrypt SSL traffic"); ++ } ++#endif ++ ++ // Cache this SSL session inside the QSslContext ++ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { ++ if (!sslContextPointer->cacheSession(ssl)) { ++ sslContextPointer.clear(); // we could not cache the session ++ } else { ++ // Cache the session for permanent usage as well ++ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { ++ if (!sslContextPointer->sessionASN1().isEmpty()) ++ configuration.sslSession = sslContextPointer->sessionASN1(); ++ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); ++ } ++ } ++ } ++ ++#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) ++ ++ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; ++ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { ++ // we could not agree -> be conservative and use HTTP/1.1 ++ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); ++ } else { ++ const unsigned char *proto = 0; ++ unsigned int proto_len = 0; ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++ if (q_SSLeay() >= 0x10002000L) { ++ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); ++ if (proto_len && mode == QSslSocket::SslClientMode) { ++ // Client does not have a callback that sets it ... ++ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; ++ } ++ } ++ ++ if (!proto_len) { // Test if NPN was more lucky ... ++#else ++ { ++#endif ++ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); ++ } ++ ++ if (proto_len) ++ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); ++ else ++ configuration.nextNegotiatedProtocol.clear(); ++ } ++#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++ if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { ++ EVP_PKEY *key; ++ if (q_SSL_get_server_tmp_key(ssl, &key)) ++ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); ++ } ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... ++ ++ connectionEncrypted = true; ++ emit q->encrypted(); ++ if (autoStartHandshake && pendingClose) { ++ pendingClose = false; ++ q->disconnectFromHost(); ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri +index d2b0c2d60d..2783effaf1 100644 +--- a/src/network/ssl/ssl.pri ++++ b/src/network/ssl/ssl.pri +@@ -60,13 +60,25 @@ qtConfig(ssl) { + HEADERS += ssl/qsslcontext_openssl_p.h \ + ssl/qsslsocket_openssl_p.h \ + ssl/qsslsocket_openssl_symbols_p.h +- SOURCES += ssl/qsslcertificate_openssl.cpp \ +- ssl/qsslcontext_openssl.cpp \ ++ SOURCES += ssl/qsslsocket_openssl_symbols.cpp \ + ssl/qssldiffiehellmanparameters_openssl.cpp \ ++ ssl/qsslcertificate_openssl.cpp \ + ssl/qsslellipticcurve_openssl.cpp \ + ssl/qsslkey_openssl.cpp \ + ssl/qsslsocket_openssl.cpp \ +- ssl/qsslsocket_openssl_symbols.cpp ++ ssl/qsslcontext_openssl.cpp ++ ++ qtConfig(opensslv11) { ++ HEADERS += ssl/qsslsocket_openssl11_symbols_p.h ++ SOURCES += ssl/qsslsocket_openssl11.cpp \ ++ ssl/qsslcontext_openssl11.cpp ++ ++ QMAKE_CXXFLAGS += -DOPENSSL_API_COMPAT=0x10100000L ++ } else { ++ HEADERS += ssl/qsslsocket_opensslpre11_symbols_p.h ++ SOURCES += ssl/qsslsocket_opensslpre11.cpp \ ++ ssl/qsslcontext_opensslpre11.cpp ++ } + + darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp + diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 086ddf4fe3e7..f87c508a3800 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase.patch @@ -994,28 +994,6 @@ index 9a24938284..74962b4ae2 100644 if (!lib.load()) return false; } -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index c92d8fc3f8..6008063bcf 100644 ---- a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -351,7 +351,7 @@ init_context: - - const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); - if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - // Set the curves to be used - if (q_SSLeay() >= 0x10002000L) { - // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -364,7 +364,7 @@ init_context: - sslContext->errorCode = QSslError::UnspecifiedError; - } - } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - { - // specific curves requested, but not possible to set -> error - sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 07fd048d6538..357c81fa4f61 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,8 +20,6 @@ with stdenv.lib; -let qt56 = qtCompatVersion == "5.6"; in - qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; @@ -48,9 +46,9 @@ qtModule { # Patch Chromium build files + optionalString (lib.versionOlder qtCompatVersion "5.12") '' substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \ + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/standalone.gypi \ + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo '' # Patch library paths in Qt sources @@ -219,7 +217,6 @@ EOF description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; - broken = qt56; # 2018-09-13, no successful build since 2018-04-25 }; } diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index b94cdd22f7f0..dd50e6ec0398 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix index b8019fb33502..433da83dab95 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 000000000000..953f5a70b8aa --- /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 000000000000..c0c93c9365c9 --- /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 fd9285ebf790..2e543abd411b 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - version = "2.023.4"; + version = "2.023.5"; name = "sympow-${version}"; src = fetchFromGitLab { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "0j2qdw9csbr081h8arhlx1z7ibgi5am4ndmvyc8y4hccfa8n4w1y"; + sha256 = "1c5a2pizgqsf3pjkf7rfj20022ym4ixhrddp8ivs2nbzxwz6qvv9"; }; postUnpack = '' diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix new file mode 100644 index 000000000000..11f9d3013471 --- /dev/null +++ b/pkgs/development/libraries/serialdv/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "serialdv"; + version ="1.1.1"; + + src = fetchFromGitHub { + owner = "f4exb"; + repo = "serialdv"; + rev = "v${version}"; + sha256 = "0swalyp8cbs7if6gxbcl7wf83ml8ch3k7ww4hws89rzpjvf070fr"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link."; + homepage = "https://github.com/f4exb/serialdv"; + platforms = platforms.linux; + maintainers = with maintainers; [ alkeryn ]; + }; +} + diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 74f861297d1a..dd9b01a0a01e 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "shibboleth-sp-${version}"; - version = "2.6.1"; + version = "3.0.4.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-sp.git"; rev = version; - sha256 = "01q13p7gc0janjfml6zs46na8qnval8hc833fk2wrnmi4w9xw4fd"; + sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 90dfe8ebfab8..1cf40c92db66 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, cmake, git, swig, lua, itk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: stdenv.mkDerivation rec { - pname = "simpleitk"; - version = "1.2.0"; - name = "${pname}-${version}"; + pname = "simpleitk"; + version = "1.2.2"; - src = fetchurl { - url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; - sha256 = "10lxsr0144li6bmfgs646cvczczqkgmvvs3ndds66q8lg9zwbnky"; + src = fetchFromGitHub { + owner = "SimpleITK"; + repo = "SimpleITK"; + rev = "v${version}"; + sha256 = "1cgq9cxxplv6bkm2zfvcc0lgyh5zw1hbry30k1429n9737wnadaw"; }; nativeBuildInputs = [ cmake git swig ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.simpleitk.org; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix new file mode 100644 index 000000000000..d626673a227a --- /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/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index eaa3ab3c089b..9f31e70ad531 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit (gnome3) tracker; + inherit tracker; }) # https://bugzilla.gnome.org/show_bug.cgi?id=795576 (fetchurl { diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch index 724c51cb56f8..724c51cb56f8 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 397184f798a8..397184f798a8 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch index f5c13c3fcdaf..f5c13c3fcdaf 100644 --- a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch +++ b/pkgs/development/libraries/tracker/fix-paths.patch diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index bd9fb796247d..8a79dab45b2a 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/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 07892e970875..6a2285563064 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,30 +1,48 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gobject-introspection -, pkgconfig, glib, systemd, libgudev, vala }: +{ stdenv, fetchurl, fetchpatch, pkgconfig +, gobject-introspection, glib, systemd, libgudev, vala +, usbutils, which, python3 }: stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.12.1"; + version = "0.13.1"; outputs = [ "bin" "out" "dev" "doc" ]; - src = fetchFromGitHub { - owner = "martinpitt"; - repo = "umockdev"; - rev = version; - sha256 = "0wnmz4jh04mvqzjnqvxrah969gg4x4v8d6ip61zc7jpbwnqb2fpg"; + src = fetchurl { + url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz"; + sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; }; + patches = [ + ./fix-test-paths.patch + # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461 + ./disable-failed-test.patch + # https://github.com/martinpitt/umockdev/pull/93 + (fetchpatch { + url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch"; + sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx"; + }) + ]; + # autoreconfHook complains if we try to build the documentation postPatch = '' echo 'EXTRA_DIST =' > docs/gtk-doc.make ''; + preCheck = '' + patchShebangs tests/test-static-code + ''; + buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ autoreconfHook pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig vala gobject-introspection ]; + + checkInputs = [ python3 which usbutils ]; enableParallelBuilding = true; + doCheck = true; + meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/umockdev/disable-failed-test.patch b/pkgs/development/libraries/umockdev/disable-failed-test.patch new file mode 100644 index 000000000000..69e74dd38b8d --- /dev/null +++ b/pkgs/development/libraries/umockdev/disable-failed-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test-umockdev-vala.vala b/tests/test-umockdev-vala.vala +index 8b104b2..d9889b8 100644 +--- a/tests/test-umockdev-vala.vala ++++ b/tests/test-umockdev-vala.vala +@@ -668,7 +668,7 @@ main (string[] args) + + /* tests for mocking ioctls */ + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_static", t_usbfs_ioctl_static); +- Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); ++ /* Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); */ + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_with_default_device", t_usbfs_ioctl_tree_with_default_device); + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_override_default_device", t_usbfs_ioctl_tree_override_default_device); + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_xz", t_usbfs_ioctl_tree_xz); diff --git a/pkgs/development/libraries/umockdev/fix-test-paths.patch b/pkgs/development/libraries/umockdev/fix-test-paths.patch new file mode 100644 index 000000000000..53015d662684 --- /dev/null +++ b/pkgs/development/libraries/umockdev/fix-test-paths.patch @@ -0,0 +1,12 @@ +diff -ru3 umockdev-0.13.1/tests/test-umockdev.c umockdev-0.13.1-new/tests/test-umockdev.c +--- umockdev-0.13.1/tests/test-umockdev.c 2019-08-18 20:39:39.708262517 +0300 ++++ umockdev-0.13.1-new/tests/test-umockdev.c 2019-08-18 21:04:27.688761503 +0300 +@@ -1084,7 +1084,7 @@ + + /* sys/ in other dir should not be trapped */ + errno = 0; +- dirfd = open("/run", O_RDONLY | O_DIRECTORY); ++ dirfd = open("/tmp", O_RDONLY | O_DIRECTORY); + g_assert_cmpint(openat(dirfd, "sys", O_RDONLY), <, 0); + g_assert_cmpint(errno, ==, ENOENT); + g_assert_cmpint(openat64(dirfd, "sys", O_RDONLY), <, 0); diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 65132806d883..53d70f4d369d 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R46"; + version = "R47.2"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1xbwva12l68awplardf47ydlx904wifw468npaxa9cx9dvd5mv13"; + sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index adfce3ea50b7..8af33c10319c 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/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 44e6370e6408..5f9015fa9609 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "6.3"; + version = "6.4"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc"; + sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k"; }; prePatch = '' diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c45f521dcbb0..bccf4f69e9d2 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { name = "wiredtiger-${version}"; - version = "2.6.1"; + version = "3.2.0"; src = fetchFromGitHub { repo = "wiredtiger"; owner = "wiredtiger"; rev = version; - sha256 = "1nj319w3hvkq3za2dz9m0p1w683gycdb392v1jb910bhzpsq30pd"; + sha256 = "1s27l51p2p3kbdjmccvlg43i7zx84hhchs3779w9giab4nvd0y19"; }; nativeBuildInputs = [ automake autoconf libtool ]; @@ -58,17 +58,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace api/leveldb/leveldb_wt.h --replace \ - '#include "wiredtiger.h"' \ - ''$'#include "wiredtiger.h"\n#include "pthread.h"' - ''; - meta = { homepage = http://wiredtiger.com/; description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; - broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9. }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index b85616842ea6..4d820bd95198 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,18 +6,17 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; + sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a"; }; - # $out for the library, $bin for rootston, and $examples for the example - # programs (in examples) AND rootston - outputs = [ "out" "bin" "examples" ]; + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -32,31 +31,13 @@ stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; - postPatch = '' - # It happens from time to time that the version wasn't updated: - sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build - ''; - postInstall = '' - # Copy the library to $bin and $examples - for output in "$bin" "$examples"; do - mkdir -p $output/lib - cp -P libwlroots* $output/lib/ - done + # Copy the library to $examples + mkdir -p $examples/lib + cp -P libwlroots* $examples/lib/ ''; postFixup = '' - # Install rootston (the reference compositor) to $bin and $examples (this - # has to be done after the fixup phase to prevent broken binaries): - for output in "$bin" "$examples"; do - mkdir -p $output/bin - cp rootston/rootston $output/bin/ - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ - $output/bin/rootston - mkdir $output/etc - cp ../rootston/rootston.ini.example $output/etc/rootston.ini - done # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle # screenshot output-layout multi-pointer rotation tablet touch pointer @@ -65,9 +46,6 @@ stdenv.mkDerivation rec { cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do cp "$binary" "$examples/bin/wlroots-$binary" - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ - "$examples/bin/wlroots-$binary" done ''; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index e7feaabc739a..549e492e944c 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/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 2aa28a2ccf43..ce8e3f0f677c 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.19"; + version = "1.5.20"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "17hgaqxf2y44j1d9z11p107sk7n7m1f9nkaz7z6450pan4zphy1z"; + sha256 = "17j5j61l5mv7x0ncsm1kv3k5mmjqyxfpddjn7j84wdgrj62xldhm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b8cf86999e0b..9b0316023710 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 3f02946c7704..4be7bd1474cf 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 f884899ecd19..d970f5636ae4 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/xml-security-c/cxx11.patch b/pkgs/development/libraries/xml-security-c/cxx11.patch deleted file mode 100644 index bc87d4c1411e..000000000000 --- a/pkgs/development/libraries/xml-security-c/cxx11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig 2016-02-02 23:57:26.204655144 +0000 -+++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp 2016-02-02 23:57:35.796692305 +0000 -@@ -645,7 +645,7 @@ - - } - -- return false; -+ return NULL; - - } - diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index fec4bbe8efe2..35ae93e79392 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -2,20 +2,13 @@ stdenv.mkDerivation rec { name = "xml-security-c-${version}"; - version = "1.7.3"; + version = "2.0.2"; src = fetchurl { url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; - sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; + sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3"; }; - patches = [ ./cxx11.patch ]; - - postPatch = '' - mkdir -p xsec/yes/lib - sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure - ''; - configureFlags = [ "--with-openssl" "--with-xerces" diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8e1d71fab3fa..fbe515f6217f 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, autoreconfHook, boost, curl, openssl, log4shib, xercesc, xml-security-c }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig +, boost, curl, openssl, log4shib, xercesc, xml-security-c +}: stdenv.mkDerivation rec { name = "xml-tooling-c-${version}"; - version = "1.6.3"; + version = "3.0.4"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; rev = version; - sha256 = "09z2pp3yy3kqx22vwgxyi3s0vlpdv9camw8dpi3q8piff6zxak3q"; + sha256 = "0frj4w70l06nva6dvdcivgm1ax69rqbjdzzbgp0sxhiqhddslbas"; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 9f2b83d7597c..70701f2d070e 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xxHash-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "19iyr7x0s7in9kp9wrj4iimdx58nv6jndz9x5ndnl07gd90y7jxb"; + sha256 = "0hh1ypwk86m3b0x4433k95f94b48kvl7s79dml0f3g0cv8jdvkgw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 7fb5be1c3434..592abea4ea04 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/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index b0e97038b7b2..083398029504 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt"; - sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd"; + url = "https://beta.quicklisp.org/dist/quicklisp/2019-07-11/distinfo.txt"; + sha256 = "0r7ga5gkiy6va1v7a01fnj1yp97pifl9v8fnqpvbiv33dwdvbx2w"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index 1af0947627f5..a7d22ac129b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; description = ''The CFFI Groveller''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi-grovel"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.20.0 SIBLINGS + VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index c440c72788fe..3d2463806073 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-toolchain''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; description = ''The CFFI toolchain''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi-toolchain"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 001c7d9a5450..b83b14611978 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.20.0''; + version = ''cffi_0.20.1''; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; - sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; + url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; + sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; }; packageName = "cffi"; @@ -20,15 +20,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL - http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 - 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS + 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL + http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 + b8a8337465a7b4c1be05270b777ce14f NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.20.0 SIBLINGS + VERSION cffi_0.20.1 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index a9808173b626..c30c68e53c8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chipz''; - version = ''20180328-git''; + version = ''20190202-git''; description = ''A library for decompressing deflate, zlib, and gzip data''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz''; - sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7''; + url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz''; + sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a''; }; packageName = "chipz"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 - 0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL - http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz - MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL - DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */ + 1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a URL + http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz + MD5 e3533408ca6899fe996eede390e820c7 NAME chipz FILENAME chipz DEPS NIL + DEPENDENCIES NIL VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d678fd8e9424..d84233c43424 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20190107-git''; + version = ''cl-async-20190307-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20190107-git SIBLINGS + VERSION cl-async-20190307-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 722e05ed09c2..c13b8b70647d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20190107-git''; + version = ''cl-async-20190307-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -40,5 +40,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20190107-git SIBLINGS + VERSION cl-async-20190307-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index edb4b01b0d1d..363227534a8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20190107-git''; + version = ''20190307-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; - sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz''; + sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL - http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz - MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS + 1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL + http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz + MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -37,5 +37,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20190307-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index a1da44a6b896..bdc5fe920cf6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20190107-git''; + version = ''20190521-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20190107-git SIBLINGS + VERSION 20190521-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 78f70be2f1fe..1510495a4cbc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-emb''; - version = ''20180228-git''; + version = ''20190521-git''; description = ''A templating system for Common Lisp''; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz''; - sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw''; + url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz''; + sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d''; }; packageName = "cl-emb"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 - 0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL - http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz - MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS + 1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d URL + http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz + MD5 b27bbe8de2206ab7c461700b58d4d527 NAME cl-emb FILENAME cl-emb DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION - 20180228-git SIBLINGS NIL PARASITES NIL) */ + 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index c33efa2eb08a..6a40d0fa8c92 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fuse-meta-fs''; - version = ''20150608-git''; + version = ''20190710-git''; description = ''CFFI bindings to FUSE (Filesystem in user space)''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz''; - sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2''; + url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz''; + sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7''; }; packageName = "cl-fuse-meta-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 - 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL - http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz - MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs FILENAME + 1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7 URL + http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz + MD5 461f7023274fb273e6c759e881bdd636 NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,4 +37,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index d41fe76ca232..de71e2e299ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fuse''; - version = ''20160318-git''; + version = ''20190710-git''; description = ''CFFI bindings to FUSE (Filesystem in user space)''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; - sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6''; + url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz''; + sha256 = ''1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li''; }; packageName = "cl-fuse"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) - SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL - http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz - MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse FILENAME cl-fuse DEPS + SHA256 1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li URL + http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz + MD5 5f267e59eb2358b1b6e4e735fb408e6a NAME cl-fuse FILENAME cl-fuse DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8) - VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index d1ce782e7f84..dde2cc31dd05 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-html5-parser''; - version = ''20171019-git''; + version = ''20190521-git''; description = ''A HTML5 parser for Common Lisp''; deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; - sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz''; + sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p''; }; packageName = "cl-html5-parser"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 - 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL - http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz - MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + 055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p URL + http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz + MD5 149e5609d0a96c867fac6c22693c5e30 NAME cl-html5-parser FILENAME cl-html5-parser DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME string-case FILENAME string-case) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) - VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + VERSION 20190521-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 1f58be6c09e9..b0be8c775a37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -5,7 +5,7 @@ rec { parasites = [ "cl-interpol-test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; @@ -19,7 +19,7 @@ rec { asdFilesToKeep = ["cl-interpol.asd"]; overrides = x: x; } -/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 +/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 8967b0970c56..b1916c27bfdd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -3,7 +3,7 @@ rec { baseName = ''cl-markup''; version = ''20131003-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["cl-markup.asd"]; overrides = x: x; } -/* (SYSTEM cl-markup DESCRIPTION NIL SHA256 +/* (SYSTEM cl-markup DESCRIPTION System lacks description SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 08b6a492e766..2fad295c7ee5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20190107-git''; + version = ''postmodern-20190521-git''; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; - sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz''; + sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5''; }; packageName = "cl-postgres"; @@ -20,14 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL - http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz - MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres + SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL + http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz + MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) - VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date) + VERSION postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date) PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index e65c0a03ddc5..27887f12497e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20180831-git''; + version = ''cl-ppcre-20190521-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; - sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; + sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL - http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz - MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME + 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL + http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz + MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20190521-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 3f56cf3dfaee..8bb8fb2478d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''20180831-git''; + version = ''20190521-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz''; - sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; + sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL - http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz - MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS + SHA256 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL + http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz + MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20190521-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 15fd56107c82..496a0bd4e567 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20180831-git''; + version = ''20190521-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz''; - sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s''; + url = ''http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz''; + sha256 = ''1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL - http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz - MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project + 1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf URL + http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz + MD5 1468189ff8880f43034c44adc317274f NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20190521-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 3ca67723925e..0d58e11b4d26 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-smtp''; - version = ''20180131-git''; + version = ''20190710-git''; description = ''Common Lisp smtp client.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; - sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61''; + url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz''; + sha256 = ''1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r''; }; packageName = "cl-smtp"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 - 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL - http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz - MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS + 1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r URL + http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz + MD5 f55956a4708d0b4fc2ba181063b73e92 NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) @@ -35,4 +35,4 @@ rec { (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index cec8cc2865c2..7849acb57c0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''20180328-git''; + version = ''20190521-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz''; - sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz''; + sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL - http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz - MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode + 0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc URL + http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz + MD5 04009a1266edbdda4d38902907caba25 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20190521-git SIBLINGS NIL PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 575e05aa074d..3be45384d418 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-who''; - version = ''20171130-git''; + version = ''20190710-git''; parasites = [ "cl-who-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz''; - sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw''; + url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz''; + sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir''; }; packageName = "cl-who"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 - 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL - http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz - MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS + 0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir URL + http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz + MD5 e5bb2856ed62d76528e4cef7b5e701c0 NAME cl-who FILENAME cl-who DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */ + VERSION 20190710-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index f329437a75af..f344dbfa2fe8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,17 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20181018-git''; - - parasites = [ "openssl-1.1.0" ]; + version = ''cl+ssl-20190710-git''; description = ''Common Lisp interface to OpenSSL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz''; - sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz''; + sha256 = ''0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv''; }; packageName = "cl+ssl"; @@ -20,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL - http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz - MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv URL + http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz + MD5 fae6e01902964d010ad2565a61a6af2a NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +31,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES - (openssl-1.1.0)) */ + VERSION cl+ssl-20190710-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 6de9d3f8fc9e..6cfd7842409c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-handler-hunchentoot''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''Clack handler for Hunchentoot.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-handler-hunchentoot"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot + SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -42,7 +42,7 @@ rec { cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 745b87a65764..1ac6ccc329c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index c1c80e48cbdb..1792d79f1d89 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-test''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''Testing Clack Applications.''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-test"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -71,7 +71,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 5477fc5cd027..749fce006e4e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20181018-git''; + version = ''clack-20190710-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack-v1-compat"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -73,7 +73,7 @@ rec { rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) - VERSION clack-20181018-git SIBLINGS + VERSION clack-20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 612e6b5c066e..1813844e85fd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20181018-git''; + version = ''20190710-git''; description = ''Web application environment for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; - sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; + url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz''; + sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k''; }; packageName = "clack"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL - http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz - MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS + 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL + http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz + MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) @@ -31,7 +31,7 @@ rec { DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component lack-middleware-backtrace lack-util nibbles uiop) - VERSION 20181018-git SIBLINGS + VERSION 20190710-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ce078c3196af..ca03207fabd8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz''; - sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz''; + sha256 = ''0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL - http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz - MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx URL + http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz + MD5 5ebb554f9f7ba7f0d9dc6584806c8a0e NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index 3866dd6f4594..c1b36b6b653c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -3,7 +3,7 @@ rec { baseName = ''closure-common''; version = ''20181018-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["closure-common.asd"]; overrides = x: x; } -/* (SYSTEM closure-common DESCRIPTION NIL SHA256 +/* (SYSTEM closure-common DESCRIPTION System lacks description SHA256 18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 3f6d6ae32ac6..2f07706a9129 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A DOM tree searching engine based on CSS selectors.''; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz''; - sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd''; + url = ''http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz''; + sha256 = ''1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs''; }; packageName = "clss"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL - http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5 - 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS + SHA256 1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs URL + http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz MD5 + c5a918fe272b71af7c4b6e71a7faad46 NAME clss FILENAME clss DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION - 20180831-git SIBLINGS NIL PARASITES NIL) */ + 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 6f570ce5c8f0..6b99f99b7ab8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20181210-git''; + version = ''20190521-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz''; - sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6''; + url = ''http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz''; + sha256 = ''0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL - http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5 - d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git + 0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs URL + http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz MD5 + afcd581193237d3202a4fbcc1f0622c3 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20190521-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index e1fb59658528..1d81acba2dc6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''command-line-arguments''; - version = ''20151218-git''; + version = ''20190710-git''; description = ''small library to deal with command-line arguments''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz''; - sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh''; + url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz''; + sha256 = ''1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733''; }; packageName = "command-line-arguments"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 - 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL - http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz - MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME command-line-arguments FILENAME - command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git + 1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733 URL + http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz + MD5 77b361a7f4b3b73a88c3a95c7bbffa98 NAME command-line-arguments FILENAME + command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 74648ba66a8c..ebae32962f10 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml-stp''; - version = ''20181018-git''; + version = ''20190521-git''; - parasites = [ "cxml-stp-test" ]; + parasites = [ "cxml-stp/test" ]; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz''; - sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77''; + url = ''http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz''; + sha256 = ''1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21''; }; packageName = "cxml-stp"; @@ -19,10 +19,10 @@ rec { asdFilesToKeep = ["cxml-stp.asd"]; overrides = x: x; } -/* (SYSTEM cxml-stp DESCRIPTION NIL SHA256 - 0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL - http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz - MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS +/* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256 + 1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21 URL + http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz + MD5 9e0c99bd2b547e07b23305a5ff72aff6 NAME cxml-stp FILENAME cxml-stp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre closure-common cxml parse-number puri rt trivial-features trivial-gray-streams xpath xpath/test yacc) - VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ + VERSION 20190521-git SIBLINGS NIL PARASITES (cxml-stp/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 2f863a627bbc..173a31e9f31d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20190107-git SIBLINGS + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index f76f5e7e561d..6668cd4f762b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,5 +37,5 @@ rec { (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage trivial-types usocket) - VERSION cl-dbi-20190107-git SIBLINGS + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 01acb76767ea..9b6fde0ea94b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20190107-git''; + version = ''cl-dbi-20190521-git''; description = ''Database driver for SQLite3.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -33,10 +33,11 @@ rec { (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite - trivial-features trivial-types uiop) - VERSION cl-dbi-20190107-git SIBLINGS + trivial-features trivial-garbage trivial-types uiop) + VERSION cl-dbi-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 382143eb8fb3..26c5306c06a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20190107-git''; + version = ''cl-20190521-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; - sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz''; + sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz - MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS + SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL + http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz + MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20190107-git SIBLINGS + VERSION cl-20190521-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index c47d9f1a1aad..4d5bc0a22175 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20181018-git''; + version = ''20190521-git''; description = ''Yet another HTTP client for Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz''; - sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc''; + url = ''http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz''; + sha256 = ''15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk''; }; packageName = "dexador"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL - http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz - MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS + 15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk URL + http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz + MD5 4e405ba1b7721c2d62bc315ec31af0fe NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -48,4 +48,4 @@ rec { fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20190521-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 541f1c6a169d..7c25ed9a0377 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz''; - sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz''; + sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL - http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz - MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME + 1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3 URL + http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz + MD5 4f45f511ac55008b8b8aa04f7feaa2d4 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS + DEPENDENCIES (trivial-indent) VERSION 20190710-git SIBLINGS (multilang-documentation-utils) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 95162ffc99a3..aa97f8f7cbe3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''v2.0.4''; + version = ''v2.0.5''; description = ''Full-featured http/https client based on usocket''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; - sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga''; + url = ''http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz''; + sha256 = ''14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj''; }; packageName = "drakma"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL - http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5 - 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS + SHA256 14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj URL + http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz MD5 + 85316671dd8ada170b85af82ed97ce8e NAME drakma FILENAME drakma DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) @@ -36,4 +36,4 @@ rec { (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */ + VERSION v2.0.5 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 3b2d0225ff92..a024ad3907a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20190107-git''; + version = ''20190521-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz''; - sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs''; + url = ''http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz''; + sha256 = ''0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL - http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz - MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS + 0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q URL + http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz + MD5 401362d64d644f02824de03697435883 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20190521-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index cec236dc5565..0e7f5b79160b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''external-program''; - version = ''20160825-git''; + version = ''20190307-git''; parasites = [ "external-program-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz''; - sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13''; + url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz''; + sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz''; }; packageName = "external-program"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM external-program DESCRIPTION NIL SHA256 - 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL - http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz - MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program FILENAME + 1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL + http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz + MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME external-program DEPS ((NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (fiveam trivial-features) VERSION 20160825-git SIBLINGS NIL + DEPENDENCIES (fiveam trivial-features) VERSION 20190307-git SIBLINGS NIL PARASITES (external-program-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 87d9fe983ec3..39f2af5430fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20181210-git''; + version = ''20190307-git''; parasites = [ "fiasco-self-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz''; - sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y''; + url = ''http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz''; + sha256 = ''0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3''; }; packageName = "fiasco"; @@ -21,10 +21,10 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL - http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz - MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS + SHA256 0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3 URL + http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz + MD5 7cc0c66f865d44974c8d682346b5f6d5 NAME fiasco FILENAME fiasco DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git + DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20190307-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 4a23cbf51ee7..90ce8b83dde6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''A collection of utilities to destructure lambda forms.''; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz''; - sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz''; + sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl''; }; packageName = "form-fiddle"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL - http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz - MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle + 12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl URL + http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz + MD5 2576065de1e3c95751285fb155f5bcf6 NAME form-fiddle FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index a74f24f8642f..1f2700608e37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20180228-darcs''; + version = ''20190521-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz''; - sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz''; + sha256 = ''0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn''; }; packageName = "hu.dwim.asdf"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. - SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL - http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz - MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME + SHA256 0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn URL + http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz + MD5 b359bf05f587196eba172803b5594318 NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ + VERSION 20190521-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 4c3bcbb42b06..2c56b5964f97 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.44''; + version = ''v0.46''; parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ args."nibbles" args."rt" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz''; - sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y''; + url = ''http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz''; + sha256 = ''1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2''; }; packageName = "ironclad"; @@ -21,9 +21,11 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL - http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz - MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES - (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES - (ironclad/tests)) */ + 1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2 URL + http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz + MD5 23f67c2312723bdaf1ff78898d2354c7 NAME ironclad FILENAME ironclad DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) + DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.46 + SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 81493865b864..702eb2d05b55 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20181210-git''; + version = ''20190202-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz''; - sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh''; + url = ''http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz''; + sha256 = ''1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl''; }; packageName = "jonathan"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL - http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz - MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS + SHA256 1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl URL + http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz + MD5 bf340574fc901706ba2dcdc57e1e78ad NAME jonathan FILENAME jonathan DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -39,4 +39,4 @@ rec { (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io named-readtables proc-parse static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */ + VERSION 20190202-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e5cbad3e9e83..e44004a9cf7e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -3,7 +3,7 @@ rec { baseName = ''kmrcl''; version = ''20150923-git''; - description = ''''; + description = ''System lacks description''; deps = [ ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["kmrcl.asd"]; overrides = x: x; } -/* (SYSTEM kmrcl DESCRIPTION NIL SHA256 +/* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256 0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS NIL diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index b99f7867a7ac..96a831147bba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20190521-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 7cce4b212941..610633e9af25 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20181210-git SIBLINGS + (uiop) VERSION lack-20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 6da62f22f65f..3607cbedf44f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20181210-git''; + version = ''lack-20190521-git''; description = ''''; - deps = [ args."ironclad" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack-util"; @@ -18,11 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS - ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) + DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION + lack-20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index c8ef9a7f6708..08095979989b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20181210-git''; + version = ''20190521-git''; description = ''A minimal Clack''; - deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; - sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; + url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz''; + sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593''; }; packageName = "lack"; @@ -18,14 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL - http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 - b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS - ((NAME ironclad FILENAME ironclad) + 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL + http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5 + 7d7321550f0795e998c7afe4498e7a40 NAME lack FILENAME lack DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20181210-git SIBLINGS + DEPENDENCIES + (alexandria bordeaux-threads ironclad lack-component lack-util nibbles) + VERSION 20190521-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index a3ddc2fd953e..1edb65596a6c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lift''; - version = ''20151031-git''; + version = ''20190521-git''; description = ''LIsp Framework for Testing''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz''; - sha256 = ''1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46''; + url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz''; + sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9''; }; packageName = "lift"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256 - 1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46 URL - http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz MD5 - b92e97b3d337607743f47bde0889f3ee NAME lift FILENAME lift DEPS NIL - DEPENDENCIES NIL VERSION 20151031-git SIBLINGS + 0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9 URL + http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz MD5 + c03d3fa715792440c7b51a852ad581e3 NAME lift FILENAME lift DEPS NIL + DEPENDENCIES NIL VERSION 20190521-git SIBLINGS (lift-documentation lift-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 1a94c643d8af..5ffa27fcca53 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20181210-git''; + version = ''20190710-git''; parasites = [ "local-time/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz''; - sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s''; + url = ''http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz''; + sha256 = ''1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk''; }; packageName = "local-time"; @@ -21,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL - http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz - MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time + SHA256 1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk URL + http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz + MD5 ff315f40d1f955210c78aa0804a117f2 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + 20190710-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 19382889315a..f64e9ee6a330 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz''; - sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r''; + url = ''http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz''; + sha256 = ''17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL - http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz - MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS + 17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw URL + http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz + MD5 987e9e505ff230c7bfc425bdf58fb717 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) (NAME documentation-utils FILENAME documentation-utils) (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20190710-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index db25e6ae5347..8187c99f94a4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''map-set''; - version = ''20160628-hg''; + version = ''20190307-hg''; description = ''Set-like data structure.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz''; - sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v''; + url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz''; + sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9''; }; packageName = "map-set"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 - 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL - http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz - MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set FILENAME map-set DEPS NIL - DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL PARASITES NIL) */ + 1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9 URL + http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz + MD5 866dba36cdf060c943267cb79ccc0532 NAME map-set FILENAME map-set DEPS NIL + DEPENDENCIES NIL VERSION 20190307-hg SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index 93890afd3004..fe9ccae2886a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -3,7 +3,7 @@ rec { baseName = ''pcall-queue''; version = ''pcall-0.3''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."bordeaux-threads" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["pcall-queue.asd"]; overrides = x: x; } -/* (SYSTEM pcall-queue DESCRIPTION NIL SHA256 +/* (SYSTEM pcall-queue DESCRIPTION System lacks description SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 9f36a6717659..8757c704c8f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz''; - sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3''; + url = ''http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz''; + sha256 = ''1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL - http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz - MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS + 1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi URL + http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz + MD5 e3276779e368758274156c9477f0b22a NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20190710-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 589f69178991..3666dda9bf87 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''query-fs''; - version = ''20190107-git''; + version = ''20190521-git''; description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz''; - sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4''; + url = ''http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz''; + sha256 = ''1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39''; }; packageName = "query-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL - http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz - MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS + SHA256 1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39 URL + http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz + MD5 1108c91b69007c6ab35b42d70d4dd7a2 NAME query-fs FILENAME query-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -40,4 +40,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 2f30db52448c..f6022cb2a1f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''quri''; - version = ''20181210-git''; + version = ''20190521-git''; description = ''Yet another URI library for Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz''; - sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4''; + url = ''http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz''; + sha256 = ''1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2''; }; packageName = "quri"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL - http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5 - 94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS + 1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2 URL + http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz MD5 + c2e37013c3b8e109aeb009719e9492ac NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20181210-git SIBLINGS (quri-test) PARASITES NIL) */ + 20190521-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 86890d60dc5e..33847198bdd9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20190107-git''; + version = ''postmodern-20190521-git''; parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; - sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz''; + sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL - http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz - MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date + 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL + http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz + MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION - postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + postmodern-20190521-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index f0a21983f16f..a22076facd39 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''split-sequence''; - version = ''v1.5.0''; + version = ''v2.0.0''; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz''; - sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g''; + url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz''; + sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba''; }; packageName = "split-sequence"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences delimited by objects satisfying a test. - SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL - http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz - MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME + SHA256 09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba URL + http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz + MD5 88aadc6c9da23663ebbb39d546991df4 NAME split-sequence FILENAME split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ + VERSION v2.0.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 991791b57d02..57dec7c93cac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -3,7 +3,7 @@ rec { baseName = ''sqlite''; version = ''cl-20130615-git''; - description = ''''; + description = ''System lacks description''; deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; @@ -17,7 +17,7 @@ rec { asdFilesToKeep = ["sqlite.asd"]; overrides = x: x; } -/* (SYSTEM sqlite DESCRIPTION NIL SHA256 +/* (SYSTEM sqlite DESCRIPTION System lacks description SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index e75cb087f38d..e89eb1971d60 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20190107-git''; + version = ''20190710-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz''; - sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz''; + sha256 = ''10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL - http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz - MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS + 10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w URL + http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz + MD5 7956cf3486c586f137b75f8b8c0e677c NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190710-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 301b12a8998e..50b815425dc6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.23''; + version = ''slime-v2.24''; - description = ''''; + description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz''; - sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky''; + url = ''http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz''; + sha256 = ''0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6''; }; packageName = "swank"; @@ -17,8 +17,8 @@ rec { asdFilesToKeep = ["swank.asd"]; overrides = x: x; } -/* (SYSTEM swank DESCRIPTION NIL SHA256 - 1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL - http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5 - 726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */ +/* (SYSTEM swank DESCRIPTION System lacks description SHA256 + 0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6 URL + http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz MD5 + 05f421f7a9dffa4ba206c548524ef1c0 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.24 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 9a4afce3280f..683f87357f56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-backtrace''; - version = ''20160531-git''; + version = ''20190710-git''; description = ''trivial-backtrace''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz''; - sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx''; + url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz''; + sha256 = ''01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x''; }; packageName = "trivial-backtrace"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 - 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL - http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz - MD5 a3b41b4ae24e3fde303a2623201aac4d NAME trivial-backtrace FILENAME - trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS + 01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x URL + http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz + MD5 e9035ed00321b24278cbf5449a1aebed NAME trivial-backtrace FILENAME + trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (trivial-backtrace-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 1a562c2288bb..82d0e4513ab1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-features''; - version = ''20161204-git''; + version = ''20190710-git''; description = ''Ensures consistent *FEATURES* across multiple CLs.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz''; - sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2''; + url = ''http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz''; + sha256 = ''04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy''; }; packageName = "trivial-features"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 - 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL - http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz - MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS + 04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy URL + http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz + MD5 3907b044e00a812ebae989134fe57c55 NAME trivial-features FILENAME + trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (trivial-features-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 5c3c486fb0ff..c629bb3548d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-garbage''; - version = ''20181018-git''; + version = ''20190521-git''; - parasites = [ "trivial-garbage-tests" ]; + parasites = [ "trivial-garbage/tests" ]; description = ''Portable finalizers, weak hash-tables and weak pointers.''; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz''; - sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl''; + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz''; + sha256 = ''0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl''; }; packageName = "trivial-garbage"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 - 0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL - http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz - MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME + 0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl URL + http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz + MD5 38fb70797069d4402c6b0fe91f4ca5a8 NAME trivial-garbage FILENAME trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ + 20190521-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index d34913b1656c..33eedbaa8184 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20181018-git''; + version = ''20190710-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz''; - sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz''; + sha256 = ''00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL - http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz - MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL + 00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx URL + http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz + MD5 a5026ac3d68e02fce100761e546a0d77 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f06c0d7ebf57..f02d9e0dc2c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20180831-git''; + version = ''20190710-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz''; - sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz''; + sha256 = ''0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL - http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz - MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL + 0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn URL + http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz + MD5 b7fa1cb9382a2a562343c6ca87b1b4ac NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index fdaa07109b49..18f1b74edbd3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.3.2''; + version = ''3.3.3''; - description = ''''; + description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz''; - sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5''; + url = ''http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz''; + sha256 = ''1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm''; }; packageName = "uiop"; @@ -17,8 +17,8 @@ rec { asdFilesToKeep = ["uiop.asd"]; overrides = x: x; } -/* (SYSTEM uiop DESCRIPTION NIL SHA256 - 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL - http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5 - 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */ +/* (SYSTEM uiop DESCRIPTION System lacks description SHA256 + 1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm URL + http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz MD5 + 64d561117f048ad8621eff7a6173d65e NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.3 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 6d02b9764701..c3928cf0e4cc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''usocket''; - version = ''0.7.1''; + version = ''0.8.2''; description = ''Universal socket library for Common Lisp''; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz''; - sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw''; + url = ''http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz''; + sha256 = ''0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm''; }; packageName = "usocket"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 - 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL - http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5 - fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS + 0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm URL + http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz MD5 + 0218443cd70b675d9b09c1bf09cd9da4 NAME usocket FILENAME usocket DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test) + (split-sequence) VERSION 0.8.2 SIBLINGS (usocket-server usocket-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 0d8822c2f4fe..59a41a7cf9ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20181210-git''; + version = ''20190710-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz''; - sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms''; + url = ''http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz''; + sha256 = ''16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL - http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5 - ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS + SHA256 16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5 URL + http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz MD5 + f35b65dec09276f08c4ca532d077a7a9 NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -43,4 +43,4 @@ rec { cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) - VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20190710-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 4c88e839bdab..9854567fd5bf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''xembed''; - version = ''clx-20120909-git''; + version = ''clx-20190307-git''; - description = ''''; + description = ''An implementation of the XEMBED protocol that integrates with CLX.''; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz''; - sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb''; + url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz''; + sha256 = ''1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j''; }; packageName = "xembed"; @@ -17,9 +17,10 @@ rec { asdFilesToKeep = ["xembed.asd"]; overrides = x: x; } -/* (SYSTEM xembed DESCRIPTION NIL SHA256 - 06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL - http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz - MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS - ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git +/* (SYSTEM xembed DESCRIPTION + An implementation of the XEMBED protocol that integrates with CLX. SHA256 + 1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j URL + http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz + MD5 04304f828ea8970b6f5301fe78ed8e10 NAME xembed FILENAME xembed DEPS + ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20190307-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index ad90b8552181..3e14a5ba9f06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''xpath''; - version = ''plexippus-20181210-git''; + version = ''plexippus-20190521-git''; parasites = [ "xpath/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz''; - sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn''; + url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz''; + sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa''; }; packageName = "xpath"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM xpath DESCRIPTION An implementation of the XML Path Language (XPath) Version 1.0 SHA256 - 1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL - http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz - MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS + 15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa URL + http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz + MD5 eb9a4c39a7c37aa0338c401713b3f944 NAME xpath FILENAME xpath DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre closure-common cxml parse-number puri trivial-features trivial-gray-streams yacc) - VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */ + VERSION plexippus-20190521-git SIBLINGS NIL PARASITES (xpath/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 3343f22b7b0b..2e4ceda31c81 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -165,4 +165,11 @@ $out/lib/common-lisp/query-fs" meta.broken = true; # 2018-04-10 }; }; + split-sequence = x: { + overrides = y: (x.overrides y) // { + preConfigure = '' + sed -i -e '/:components/i:serial t' split-sequence.asd + ''; + }; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 0de50a17ad66..2e71e0174f62 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -590,6 +590,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lack-util" or (x: {})) (import ./quicklisp-to-nix-output/lack-util.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "nibbles" = quicklisp-to-nix-packages."nibbles"; })); @@ -1352,6 +1354,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lack" or (x: {})) (import ./quicklisp-to-nix-output/lack.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-util" = quicklisp-to-nix-packages."lack-util"; @@ -1372,6 +1376,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ironclad" or (x: {})) (import ./quicklisp-to-nix-output/ironclad.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "nibbles" = quicklisp-to-nix-packages."nibbles"; "rt" = quicklisp-to-nix-packages."rt"; })); @@ -1683,6 +1689,7 @@ let quicklisp-to-nix-packages = rec { "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "sqlite" = quicklisp-to-nix-packages."sqlite"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; "uiop" = quicklisp-to-nix-packages."uiop"; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp index 9dd82ce2b2d6..6a4c2b4ad1a2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp @@ -352,7 +352,10 @@ quicklisp-to-nix." (remove name (mapcar 'name ql-sibling-systems) :test 'equal)) (dependencies raw-dependencies) - (description (asdf:system-description (asdf:find-system system))) + (description + (or + (ignore-errors (asdf:system-description (asdf:find-system system))) + "System lacks description")) (release-name (short-description ql-release))) (list :system system diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index dce179cd6409..348f5ef7529e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -10,6 +10,26 @@ self: super: with self; { +alt-getopt = buildLuarocksPackage { + pname = "alt-getopt"; + version = "0.8.0-1"; + + src = fetchurl { + url = https://luarocks.org/alt-getopt-0.8.0-1.src.rock; + sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cheusov/lua-alt-getopt"; + description = "Process application arguments the same way as getopt_long"; + maintainers = with maintainers; [ arobyn ]; + license = { + fullName = "MIT/X11"; + }; + }; +}; ansicolors = buildLuarocksPackage { pname = "ansicolors"; version = "1.0.2-3"; @@ -1190,6 +1210,26 @@ mpack = buildLuarocksPackage { }; }; }; +moonscript = buildLuarocksPackage { + pname = "moonscript"; + version = "0.5.0-1"; + + src = fetchurl { + url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock; + sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; + + meta = with stdenv.lib; { + homepage = "http://moonscript.org"; + description = "A programmer friendly language that compiles to Lua"; + maintainers = with maintainers; [ arobyn ]; + license = { + fullName = "MIT"; + }; + }; +}; nvim-client = buildLuarocksPackage { pname = "nvim-client"; version = "0.2.0-1"; diff --git a/pkgs/development/misc/google-clasp/README.md b/pkgs/development/misc/google-clasp/README.md new file mode 100644 index 000000000000..9adf2255380e --- /dev/null +++ b/pkgs/development/misc/google-clasp/README.md @@ -0,0 +1,6 @@ +## How to update + +1. bump version of `@google/clasp` in [node-packages.json](./node-packages.json) +2. run [generate.sh](./generate.sh) +3. set the same version in [default.nix](./default.nix) +4. build and test it diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix new file mode 100644 index 000000000000..105104ebd721 --- /dev/null +++ b/pkgs/development/misc/google-clasp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, pkgs }: +let + version = "2.2.1"; +in +(import ./google-clasp.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; +})."@google/clasp-${version}".override rec { + preRebuild = '' + patch -p1 <<<"${builtins.readFile ./dotf.patch}" + ''; + meta = { + description = "Command Line tool for Google Apps Script Projects"; + homepage = https://developers.google.com/apps-script/guides/clasp; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.michojel ]; + priority = 100; + }; +} diff --git a/pkgs/development/misc/google-clasp/dotf.patch b/pkgs/development/misc/google-clasp/dotf.patch new file mode 100644 index 000000000000..0d59cae6125c --- /dev/null +++ b/pkgs/development/misc/google-clasp/dotf.patch @@ -0,0 +1,13 @@ +Index: nodejs/tmp/xcindf87mmqyp0x5blima5q2m9fw3dx3-node__at_google_slash_clasp-2.2.1/lib/node_modules/@google/clasp/src/dotfile.js +=================================================================== +--- clasp.orig/src/dotfile.js ++++ clasp/src/dotfile.js +@@ -94,7 +94,7 @@ exports.DOTFILE = { + return dotf(projectPath ? path_1.default.dirname(projectPath) : exports.DOT.PROJECT.DIR, exports.DOT.PROJECT.NAME); + }, + // Stores {ClaspCredentials} +- RC: dotf(exports.DOT.RC.DIR, exports.DOT.RC.NAME), ++ RC: dotf.default(exports.DOT.RC.DIR, exports.DOT.RC.NAME), + // Stores {ClaspCredentials} + RC_LOCAL: function () { + var localPath = find_up_1.default.sync(exports.DOT.PROJECT.PATH); diff --git a/pkgs/development/misc/google-clasp/generate.sh b/pkgs/development/misc/google-clasp/generate.sh new file mode 100755 index 000000000000..4e04231e2b89 --- /dev/null +++ b/pkgs/development/misc/google-clasp/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +set -eu -o pipefail + +exec node2nix --nodejs-10 \ + -i node-packages.json -o node-packages.nix \ + -c google-clasp.nix \ + --no-copy-node-env -e ../../../development/node-packages/node-env.nix diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix new file mode 100644 index 000000000000..c32132d7ac64 --- /dev/null +++ b/pkgs/development/misc/google-clasp/google-clasp.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.6.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + +let + nodeEnv = import ../../node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/misc/google-clasp/node-packages.json b/pkgs/development/misc/google-clasp/node-packages.json new file mode 100644 index 000000000000..b868571d0516 --- /dev/null +++ b/pkgs/development/misc/google-clasp/node-packages.json @@ -0,0 +1,3 @@ +[ + {"@google/clasp": "2.2.1"} +] diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix new file mode 100644 index 000000000000..6c51318c9ebf --- /dev/null +++ b/pkgs/development/misc/google-clasp/node-packages.nix @@ -0,0 +1,2101 @@ +# This file has been generated by node2nix 1.6.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@nodelib/fs.scandir-2.1.1" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz"; + sha512 = "NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg=="; + }; + }; + "@nodelib/fs.stat-2.0.1" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz"; + sha512 = "+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw=="; + }; + }; + "@nodelib/fs.walk-1.2.2" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz"; + sha512 = "J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ=="; + }; + }; + "@sindresorhus/is-0.14.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-12.7.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz"; + sha512 = "dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg=="; + }; + }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; + "agent-base-4.3.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; + sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; + }; + }; + "aggregate-error-3.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz"; + sha512 = "yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA=="; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-escapes-4.2.1" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz"; + sha512 = "Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q=="; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "array-differ-3.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"; + sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg=="; + }; + }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; + "arrify-2.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; + sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base64-js-1.3.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + }; + }; + "bignumber.js-7.2.1" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"; + sha512 = "S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "buffer-equal-constant-time-1.0.1" = { + name = "buffer-equal-constant-time"; + packageName = "buffer-equal-constant-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; + }; + }; + "cacheable-request-6.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-spinner-0.2.10" = { + name = "cli-spinner"; + packageName = "cli-spinner"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz"; + sha512 = "U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q=="; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "commander-2.20.0" = { + name = "commander"; + packageName = "commander"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + }; + "defer-to-connect-1.0.2" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz"; + sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "del-5.0.0" = { + name = "del"; + packageName = "del"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-5.0.0.tgz"; + sha512 = "TfU3nUY0WDIhN18eq+pgpbLY9AfL5RfiE9czKaTSolc6aK7qASXfDErvYgjV1UqCR4sNXDoxO0/idPmhDUt2Sg=="; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "dns-packet-5.2.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.1.tgz"; + sha512 = "JHj2yJeKOqlxzeuYpN1d56GfhzivAxavNwHj9co3qptECel27B1rLY5PifJAvubsInX5pGLDjAHuCfCUc2Zv/w=="; + }; + }; + "dns-socket-4.2.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.0.tgz"; + sha512 = "4XuD3z28jht3jvHbiom6fAipgG5LkjYeDLrX5OH8cbl0AtzTyUUAxGckcW8T7z0pLfBBV5qOiuC4wUEohk6FrQ=="; + }; + }; + "dotf-1.4.0" = { + name = "dotf"; + packageName = "dotf"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotf/-/dotf-1.4.0.tgz"; + sha512 = "9qGysIs00RzHk4px5KyUCBgiz1z3UNl60rFa1i1a9ROoC6Tk3enraAmrwgYZxCgcnZBjMQdGuu1bvxKnciNp7w=="; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "ecdsa-sig-formatter-1.0.11" = { + name = "ecdsa-sig-formatter"; + packageName = "ecdsa-sig-formatter"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; + }; + }; + "ellipsize-0.1.0" = { + name = "ellipsize"; + packageName = "ellipsize"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ellipsize/-/ellipsize-0.1.0.tgz"; + sha1 = "9d43682d44b91ad16ebd84268ac103170a6553f8"; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; + "es-abstract-1.13.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; + "es6-promise-4.2.8" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; + sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "exec-sh-0.2.2" = { + name = "exec-sh"; + packageName = "exec-sh"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz"; + sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "fast-glob-3.0.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz"; + sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg=="; + }; + }; + "fast-text-encoding-1.0.0" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz"; + sha512 = "R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ=="; + }; + }; + "fastq-1.6.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz"; + sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA=="; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "figures-3.0.0" = { + name = "figures"; + packageName = "figures"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz"; + sha512 = "HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "fs-extra-8.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "fuzzy-0.1.3" = { + name = "fuzzy"; + packageName = "fuzzy"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"; + sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; + }; + }; + "gaxios-2.0.1" = { + name = "gaxios"; + packageName = "gaxios"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-2.0.1.tgz"; + sha512 = "c1NXovTxkgRJTIgB2FrFmOFg4YIV6N/bAa4f/FZ4jIw13Ql9ya/82x69CswvotJhbV3DiGnlTZwoq2NVXk2Irg=="; + }; + }; + "gcp-metadata-2.0.1" = { + name = "gcp-metadata"; + packageName = "gcp-metadata"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.1.tgz"; + sha512 = "nrbLj5O1MurvpLC/doFwzdTfKnmYGDYXlY/v7eQ4tJNVIvQXbOK672J9UFbradbtmuTkyHzjpzD8HD0Djz0LWw=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; + "glob-parent-5.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; + sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + }; + }; + "globby-10.0.1" = { + name = "globby"; + packageName = "globby"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz"; + sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A=="; + }; + }; + "google-auth-library-4.2.6" = { + name = "google-auth-library"; + packageName = "google-auth-library"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz"; + sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw=="; + }; + }; + "google-p12-pem-2.0.1" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.1.tgz"; + sha512 = "6h6x+eBX3k+IDSe/c8dVYmn8Mzr1mUcmKC9MdUSwaBkFAXlqBEnwFWmSFgGC+tcqtsLn73BDP/vUNWEehf1Rww=="; + }; + }; + "googleapis-40.0.1" = { + name = "googleapis"; + packageName = "googleapis"; + version = "40.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/googleapis/-/googleapis-40.0.1.tgz"; + sha512 = "B6qZVCautOOspEhru9GZ814I+ztkGWyA4ZEUfaXwXHBruX/HAWqedbsuUEx1w3nCECywK/FLTNUdcbH9zpaMaw=="; + }; + }; + "googleapis-common-2.0.4" = { + name = "googleapis-common"; + packageName = "googleapis-common"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-2.0.4.tgz"; + sha512 = "8RRkxr24v1jIKCC1onFWA8RGnwFV55m3Qpil9DLX1yLc9e5qvOJsRoDOhhD2e7jFRONYEhT/BzT8vJZANqSr9w=="; + }; + }; + "got-9.6.0" = { + name = "got"; + packageName = "got"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + }; + }; + "graceful-fs-4.2.2" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; + }; + }; + "gtoken-3.0.2" = { + name = "gtoken"; + packageName = "gtoken"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-3.0.2.tgz"; + sha512 = "BOBi6Zz31JfxhSHRZBIDdbwIbOPyux10WxJHdx8wz/FMP1zyN1xFrsAWsgcLe5ww5v/OZu/MePUEZAjgJXSauA=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; + "http-cache-semantics-4.0.3" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; + }; + }; + "https-proxy-agent-2.2.2" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; + sha512 = "c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-5.1.4" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; + sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "inquirer-6.5.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz"; + sha512 = "uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw=="; + }; + }; + "inquirer-autocomplete-prompt-1.0.1" = { + name = "inquirer-autocomplete-prompt"; + packageName = "inquirer-autocomplete-prompt"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.1.tgz"; + sha512 = "Y4V6ifAu9LNrNjcEtYq8YUKhrgmmufUn5fsDQqeWgHY8rEO6ZAQkNUiZtBm2kw2uUQlC9HdgrRCHDhTPPguH5A=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "ip-regex-4.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz"; + sha512 = "pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA=="; + }; + }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-ip-3.1.0" = { + name = "is-ip"; + packageName = "is-ip"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz"; + sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q=="; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-online-8.2.0" = { + name = "is-online"; + packageName = "is-online"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-online/-/is-online-8.2.0.tgz"; + sha512 = "dvTrzRlziHPdl+uazMK+9ypLlwOA3szkaGfAWqI/MKuUutgNxOFBl2gfu2BTkV8C7A2YcYHNlVcsxHzZik3wUQ=="; + }; + }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "json-bigint-0.3.0" = { + name = "json-bigint"; + packageName = "json-bigint"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz"; + sha1 = "0ccd912c4b8270d05f056fbd13814b53d3825b1e"; + }; + }; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsonfile-5.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz"; + sha512 = "NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w=="; + }; + }; + "jwa-1.4.1" = { + name = "jwa"; + packageName = "jwa"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; + sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; + }; + }; + "jws-3.2.2" = { + name = "jws"; + packageName = "jws"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; + sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; + }; + }; + "keyv-3.1.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "merge-1.2.1" = { + name = "merge"; + packageName = "merge"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; + sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; + }; + }; + "merge2-1.2.4" = { + name = "merge2"; + packageName = "merge2"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz"; + sha512 = "FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A=="; + }; + }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; + "mime-2.4.4" = { + name = "mime"; + packageName = "mime"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "multimatch-4.0.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"; + sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "node-fetch-2.6.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; + sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; + }; + }; + "node-forge-0.8.5" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz"; + sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="; + }; + }; + "normalize-url-4.3.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz"; + sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; + "open-6.4.0" = { + name = "open"; + packageName = "open"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "p-any-2.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz"; + sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; + }; + }; + "p-cancelable-1.1.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + }; + "p-cancelable-2.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-limit-2.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-some-4.1.0" = { + name = "p-some"; + packageName = "p-some"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz"; + sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; + }; + }; + "p-timeout-3.1.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz"; + sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "path-0.12.7" = { + name = "path"; + packageName = "path"; + version = "0.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz"; + sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "picomatch-2.0.7" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz"; + sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA=="; + }; + }; + "pluralize-8.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz"; + sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; + }; + }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; + "public-ip-3.2.0" = { + name = "public-ip"; + packageName = "public-ip"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/public-ip/-/public-ip-3.2.0.tgz"; + sha512 = "DBq4o955zhrhESG4z6GkLN9mtY9NT/JOjEV8pvnYy3bjVQOQF0J5lJNwWLbEWwNstyNFJlY7JxCPFq4bdXSabw=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "qs-6.8.0" = { + name = "qs"; + packageName = "qs"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz"; + sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w=="; + }; + }; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + }; + }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "run-parallel-1.1.9" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + }; + }; + "rxjs-6.5.2" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz"; + sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg=="; + }; + }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; + "split-lines-2.0.0" = { + name = "split-lines"; + packageName = "split-lines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz"; + sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; + }; + }; + "string-width-4.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz"; + sha512 = "NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ=="; + }; + }; + "string.prototype.padend-3.0.0" = { + name = "string.prototype.padend"; + packageName = "string.prototype.padend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz"; + sha1 = "f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-bom-4.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"; + sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "ts2gas-3.4.4" = { + name = "ts2gas"; + packageName = "ts2gas"; + version = "3.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.4.4.tgz"; + sha512 = "u49TaxHUn+y88XqAJSyun488Yc7oqjZUCi/swOT1OP3qiHa/wJTeUH68842US+3OXxKk/As5SRmUHfChTcG3Ng=="; + }; + }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; + "type-fest-0.3.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; + sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; + }; + }; + "type-fest-0.5.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; + sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; + }; + }; + "typescript-3.5.3" = { + name = "typescript"; + packageName = "typescript"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz"; + sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + }; + "url-template-2.0.8" = { + name = "url-template"; + packageName = "url-template"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + }; + "util-0.10.4" = { + name = "util"; + packageName = "util"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; + sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; + }; + }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; + "watch-1.0.2" = { + name = "watch"; + packageName = "watch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz"; + sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "yallist-3.0.3" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; + sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; + }; + }; + }; +in +{ + "@google/clasp-2.2.1" = nodeEnv.buildNodePackage { + name = "_at_google_slash_clasp"; + packageName = "@google/clasp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.2.1.tgz"; + sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.1" + sources."@nodelib/fs.stat-2.0.1" + sources."@nodelib/fs.walk-1.2.2" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-12.7.2" + sources."abort-controller-3.0.0" + sources."agent-base-4.3.0" + sources."aggregate-error-3.0.0" + sources."ansi-escapes-4.2.1" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."array-differ-3.0.0" + sources."array-union-2.1.0" + sources."arrify-2.0.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.3.1" + sources."bignumber.js-7.2.1" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-equal-constant-time-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinner-0.2.10" + sources."cli-width-2.2.0" + sources."clone-response-1.0.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.20.0" + sources."concat-map-0.0.1" + sources."debug-3.2.6" + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" + sources."del-5.0.0" + sources."dir-glob-3.0.1" + sources."dns-packet-5.2.1" + sources."dns-socket-4.2.0" + sources."dotf-1.4.0" + sources."duplexer3-0.1.4" + sources."ecdsa-sig-formatter-1.0.11" + sources."ellipsize-0.1.0" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."event-target-shim-5.0.1" + sources."exec-sh-0.2.2" + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."fast-glob-3.0.4" + sources."fast-text-encoding-1.0.0" + sources."fastq-1.6.0" + sources."figures-3.0.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + ]; + }) + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."fuzzy-0.1.3" + sources."gaxios-2.0.1" + sources."gcp-metadata-2.0.1" + sources."get-stream-4.1.0" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."globby-10.0.1" + sources."google-auth-library-4.2.6" + sources."google-p12-pem-2.0.1" + sources."googleapis-40.0.1" + sources."googleapis-common-2.0.4" + sources."got-9.6.0" + sources."graceful-fs-4.2.2" + sources."gtoken-3.0.2" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" + sources."http-cache-semantics-4.0.3" + sources."https-proxy-agent-2.2.2" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.4" + sources."indent-string-3.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inquirer-6.5.1" + (sources."inquirer-autocomplete-prompt-1.0.1" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."figures-2.0.0" + ]; + }) + sources."ip-1.1.5" + sources."ip-regex-4.1.0" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-ip-3.1.0" + sources."is-number-7.0.0" + sources."is-online-8.2.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-promise-2.1.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" + sources."is-wsl-1.1.0" + sources."json-bigint-0.3.0" + sources."json-buffer-3.0.0" + sources."jsonfile-5.0.0" + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."keyv-3.1.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.15" + sources."lowercase-keys-1.0.1" + sources."lru-cache-5.1.1" + sources."merge-1.2.1" + sources."merge2-1.2.4" + sources."micromatch-4.0.2" + sources."mime-2.4.4" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."multimatch-4.0.0" + sources."mute-stream-0.0.8" + sources."node-fetch-2.6.0" + sources."node-forge-0.8.5" + sources."normalize-url-4.3.0" + sources."object-keys-1.1.1" + sources."once-1.4.0" + sources."onetime-5.1.0" + sources."open-6.4.0" + sources."os-tmpdir-1.0.2" + (sources."p-any-2.1.0" // { + dependencies = [ + sources."p-cancelable-2.0.0" + sources."type-fest-0.3.1" + ]; + }) + sources."p-cancelable-1.1.0" + sources."p-finally-1.0.0" + sources."p-limit-2.2.0" + sources."p-locate-4.1.0" + sources."p-map-2.1.0" + (sources."p-some-4.1.0" // { + dependencies = [ + sources."p-cancelable-2.0.0" + ]; + }) + sources."p-timeout-3.1.0" + sources."p-try-2.2.0" + sources."path-0.12.7" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-type-4.0.0" + sources."picomatch-2.0.7" + sources."pluralize-8.0.0" + sources."prepend-http-2.0.0" + sources."process-0.11.10" + sources."public-ip-3.2.0" + sources."pump-3.0.0" + sources."qs-6.8.0" + sources."recursive-readdir-2.2.2" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" + sources."rimraf-2.7.1" + sources."run-async-2.3.0" + sources."run-parallel-1.1.9" + sources."rxjs-6.5.2" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."signal-exit-3.0.2" + sources."slash-3.0.0" + sources."split-lines-2.0.0" + sources."string-width-4.1.0" + sources."string.prototype.padend-3.0.0" + sources."strip-ansi-5.2.0" + sources."strip-bom-4.0.0" + sources."supports-color-5.5.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."ts2gas-3.4.4" + sources."tslib-1.10.0" + sources."type-fest-0.5.2" + sources."typescript-3.5.3" + sources."universalify-0.1.2" + sources."url-parse-lax-3.0.0" + sources."url-template-2.0.8" + (sources."util-0.10.4" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."uuid-3.3.2" + (sources."watch-1.0.2" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Develop Apps Script Projects locally"; + homepage = "https://github.com/google/clasp#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + }; +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 62cdeb43032e..6f4b32b486ba 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,4 +1,4 @@ -{ composeAndroidPackages, stdenv, ant, jdk, gnumake, gawk }: +{ composeAndroidPackages, stdenv, lib, ant, jdk, gnumake, gawk }: { name , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null @@ -16,11 +16,11 @@ let extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs); in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot + name = lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot ANDROID_HOME = "${androidsdk}/libexec/android-sdk"; buildInputs = [ jdk ant ]; buildPhase = '' - ${stdenv.lib.optionalString release '' + ${lib.optionalString release '' # Provide key singing attributes ( echo "key.store=${keyStore}" echo "key.alias=${keyAlias}" @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ${stdenv.lib.optionalString (args ? includeNDK && args.includeNDK) '' + ${lib.optionalString (args ? includeNDK && args.includeNDK) '' export GNUMAKE=${gnumake}/bin/make export NDK_HOST_AWK=${gawk}/bin/gawk ${androidsdk}/libexec/android-sdk/ndk-bundle/ndk-build diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e5802c12e816..6e6a349cccc5 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -21,7 +21,7 @@ }: let - inherit (pkgs) stdenv fetchurl makeWrapper unzip; + inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" @@ -59,12 +59,12 @@ let }; system-images-packages = - stdenv.lib.recursiveUpdate + lib.recursiveUpdate system-images-packages-android - (stdenv.lib.recursiveUpdate system-images-packages-android-tv - (stdenv.lib.recursiveUpdate system-images-packages-android-wear - (stdenv.lib.recursiveUpdate system-images-packages-android-wear-cn - (stdenv.lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore)))); + (lib.recursiveUpdate system-images-packages-android-tv + (lib.recursiveUpdate system-images-packages-android-wear + (lib.recursiveUpdate system-images-packages-android-wear-cn + (lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore)))); # Generated addons addons = import ./generated/addons.nix { @@ -77,15 +77,13 @@ rec { }; platform-tools = import ./platform-tools.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook pkgs lib; package = packages.platform-tools."${platformToolsVersion}"; }; build-tools = map (version: import ./build-tools.nix { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; package = packages.build-tools."${version}"; } ) buildToolsVersions; @@ -96,8 +94,7 @@ rec { }; emulator = import ./emulator.nix { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; package = packages.emulator."${emulatorVersion}"."${os}"; }; @@ -115,12 +112,18 @@ rec { } ) platformVersions; - system-images = stdenv.lib.flatten (map (apiVersion: + system-images = lib.flatten (map (apiVersion: map (type: map (abiVersion: deployAndroidPackage { inherit os; package = system-images-packages.${apiVersion}.${type}.${abiVersion}; + # Patch 'google_apis' system images so they're recognized by the sdk. + # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead + # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error. + patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) '' + sed -i '/^Addon.Vendor/d' source.properties + ''; } ) abiVersions ) systemImageTypes @@ -128,23 +131,20 @@ rec { lldb = map (version: import ./lldb.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook pkgs lib; package = packages.lldb."${version}"; } ) lldbVersions; cmake = map (version: import ./cmake.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook pkgs lib; package = packages.cmake."${version}"; } ) cmakeVersions; ndk-bundle = import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools; - inherit (stdenv) lib; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools; package = packages.ndk-bundle."${ndkVersion}"; }; @@ -164,24 +164,24 @@ rec { # Function that automatically links all plugins for which multiple versions can coexist linkPlugins = {name, plugins}: - stdenv.lib.optionalString (plugins != []) '' + lib.optionalString (plugins != []) '' mkdir -p ${name} - ${stdenv.lib.concatMapStrings (plugin: '' + ${lib.concatMapStrings (plugin: '' ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} '') plugins} ''; # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: - stdenv.lib.optionalString check '' + lib.optionalString check '' ln -s ${plugin}/libexec/android-sdk/* ${name} ''; # Links all plugins related to a requested platform linkPlatformPlugins = {name, plugins, check}: - stdenv.lib.optionalString check '' + lib.optionalString check '' mkdir -p ${name} - ${stdenv.lib.concatMapStrings (plugin: '' + ${lib.concatMapStrings (plugin: '' ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} '') plugins} ''; # */ @@ -194,8 +194,7 @@ rec { https://developer.android.com/studio/terms by setting nixpkgs config option 'android_sdk.accept_license = true;' '' else import ./tools.nix { - inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686; - inherit (stdenv) lib; + inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686 lib; postInstall = '' # Symlink all requested plugins @@ -210,9 +209,9 @@ rec { ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} - ${stdenv.lib.optionalString includeSystemImages '' + ${lib.optionalString includeSystemImages '' mkdir -p system-images - ${stdenv.lib.concatMapStrings (system-image: '' + ${lib.concatMapStrings (system-image: '' apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) mkdir -p system-images/$apiVersion/$type @@ -224,7 +223,7 @@ rec { ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} # Link extras - ${stdenv.lib.concatMapStrings (identifier: + ${lib.concatMapStrings (identifier: let path = addons.extras."${identifier}".path; addon = deployAndroidPackage { diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index b05167460717..14882bc22438 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -10,12 +10,12 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv jdk ant gnumake gawk; + inherit (pkgs) stdenv lib jdk ant gnumake gawk; inherit composeAndroidPackages; }; emulateApp = import ./emulate-app.nix { - inherit (pkgs) stdenv; + inherit (pkgs) stdenv lib; inherit composeAndroidPackages; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 6c8f6d664d75..fa9a56fadbad 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,24 +1,21 @@ -{ composeAndroidPackages, stdenv }: +{ composeAndroidPackages, stdenv, lib }: { name, app ? null -, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false +, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" , enableGPU ? false, extraAVDFiles ? [] , package ? null, activity ? null -, avdHomeDir ? null -}@args: +, avdHomeDir ? null, sdkExtraArgs ? {} +}: let - androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); - - # Extract the parameters meant for the Android SDK - androidParams = { + sdkArgs = { platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; systemImageTypes = [ systemImageType ]; abiVersions = [ abiVersion ]; - }; + } // sdkExtraArgs; - androidsdkComposition = (composeAndroidPackages androidParams).androidsdk; + sdk = (composeAndroidPackages sdkArgs).androidsdk; in stdenv.mkDerivation { inherit name; @@ -44,7 +41,7 @@ stdenv.mkDerivation { ''} # We need to specify the location of the Android SDK root folder - export ANDROID_SDK_ROOT=${androidsdkComposition}/libexec/android-sdk + export ANDROID_SDK_ROOT=${sdk}/libexec/android-sdk # We have to look for a free TCP port @@ -52,7 +49,7 @@ stdenv.mkDerivation { for i in $(seq 5554 2 5584) do - if [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ] + if [ -z "$(${sdk}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ] then port=$i break @@ -70,41 +67,41 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exists - ${androidsdkComposition}/libexec/android-sdk/tools/android list targets + ${sdk}/libexec/android-sdk/tools/android list targets - if [ "$(${androidsdkComposition}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] + if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS - ${stdenv.lib.optionalString enableGPU '' + ${lib.optionalString enableGPU '' # Enable GPU acceleration echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini ''} - ${stdenv.lib.concatMapStrings (extraAVDFile: '' + ${lib.concatMapStrings (extraAVDFile: '' ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd '') extraAVDFiles} fi # Launch the emulator - ${androidsdkComposition}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + ${sdk}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 - ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device + ${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device echo "Device state has been reached" >&2 - while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + while [ -z "$(${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] do sleep 5 done echo "dev.bootcomplete property is 1" >&2 - #while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + #while [ -z "$(${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] #do #sleep 5 #done @@ -113,10 +110,10 @@ stdenv.mkDerivation { echo "ready" >&2 - ${stdenv.lib.optionalString (app != null) '' + ${lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] + if [ -z "${package}" ] || [ "$(${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then @@ -125,12 +122,12 @@ stdenv.mkDerivation { appPath="${app}" fi - ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath" + ${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath" fi # Start the application - ${stdenv.lib.optionalString (package != null && activity != null) '' - ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ${lib.optionalString (package != null && activity != null) '' + ${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} ''} ''} EOF diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2e42e8bd23c2..2ddffbf16b7c 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 7ae6e50de99f..baa4748fb946 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/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index d62902e4f6e4..9ec5977d5947 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: -stdenv.mkDerivation { - name = "xpwn-0.5.8git"; +stdenv.mkDerivation rec { + pname = "xpwn"; + version = "0.5.8git"; - src = fetchgit { - url = "git://github.com/dborca/xpwn.git"; - rev = "4534da88d4e8a32cdc9da9b5326e2cc482c95ef0"; - sha256 = "1h1ak40fg5bym0hifpii9q2hqdp2m387cwfzb4bl6qq36xpkd6wv"; + src = fetchFromGitHub { + owner = "planetbeing"; + repo = pname; + rev = "ac362d4ffe4d0489a26144a1483ebf3b431da899"; + sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf"; }; preConfigure = '' @@ -18,7 +20,9 @@ stdenv.mkDerivation { sed -i -e '/install/d' CMakeLists.txt ''; - buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; + strictDeps = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libpng bzip2 libusb openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 667b4233ff8f..e53f64d8ecaf 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -45,6 +45,7 @@ , "git-standup" , "graphql-cli" , "grunt-cli" +, "gtop" , "gulp" , "gulp-cli" , "html-minifier" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 8b5678755e5d..ce8a63cfdd37 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -2281,13 +2281,13 @@ let sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg=="; }; }; - "@snyk/dep-graph-1.10.0" = { + "@snyk/dep-graph-1.12.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.10.0.tgz"; - sha512 = "QwQTmmnVb1mjAffGsjKKrwit8ahLWyhlKWQcTVZo9UXFgWAwiuCjTXKAXhijZjGvrXQzNf5KbIBu+SZ1Dq2toQ=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.12.0.tgz"; + sha512 = "n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2839,13 +2839,13 @@ let sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA=="; }; }; - "@types/ws-6.0.1" = { + "@types/ws-6.0.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.1.tgz"; - sha512 = "EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.2.tgz"; + sha512 = "22XiR1ox9LftTaAtn/c5JCninwc7moaqbkJfaDUb7PkaUitcf5vbTZHdq9dxSMviCm9C3W85rzB8e6yNR70apQ=="; }; }; "@types/zen-observable-0.8.0" = { @@ -2857,40 +2857,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.9.0" = { + "@vue/cli-shared-utils-3.10.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz"; - sha512 = "wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz"; + sha512 = "i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg=="; }; }; - "@vue/cli-ui-3.9.3" = { + "@vue/cli-ui-3.10.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.9.3.tgz"; - sha512 = "CDMQn1An4OlaLoB0paZfXBSvuUUkR3BPU/EWTLszP1lHqTecAkj7ESIdelXfpPwRhxchE/7c9s9XXEhpHublrQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.10.0.tgz"; + sha512 = "Tekgh54ClA+x3ey3H1td/RVhGt9MG02/z/OtG+q2Dcy9j47bscDDiTv3OJgw64WrH5tqz1aKEA/SibxL9ehS+Q=="; }; }; - "@vue/cli-ui-addon-webpack-3.9.3" = { + "@vue/cli-ui-addon-webpack-3.10.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.9.3.tgz"; - sha512 = "BQro2UwHx7w1DcM2MJoF7qfa/Pp48mZWLwqJjCJVqg1utFkAqwjlIM9VweYWEWO7/jJ5B4JfuKCzRrGTtGDbdw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.10.0.tgz"; + sha512 = "c930BWpeFu1H+mbUZT4VSLngD95yaOAg9qr21Kq1KMZ3CW7gakbttwpgXjn8edwdkvUl65IpSkdh/n/XyYyXxg=="; }; }; - "@vue/cli-ui-addon-widgets-3.9.3" = { + "@vue/cli-ui-addon-widgets-3.10.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.9.3.tgz"; - sha512 = "DnIvWNbhilouNyaevH2aBKSzdUK1zhveQvGp3z9ddVNgD6MadY9qf0YIrGrtzK4gn2Jc42BpOh64Slzwq9KhcQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.10.0.tgz"; + sha512 = "FvPB05n8Gp0TbvWPXnlwcQPSLZIwEY+Mzwh0pMDTN9yoxnf+/xhIt2PwRmFtecIBqyBZAIyYI50wmCxs9c2Hbw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3550,13 +3550,13 @@ let sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; }; }; - "acorn-globals-4.3.2" = { + "acorn-globals-4.3.3" = { name = "acorn-globals"; packageName = "acorn-globals"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz"; - sha512 = "BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ=="; + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz"; + sha512 = "vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ=="; }; }; "acorn-jsx-3.0.1" = { @@ -4189,6 +4189,15 @@ let sha512 = "8zjUtFJ3db/QoPXuuEMloS2AUf79/yeyttJ7Abr3hteopJu9HK8vsgGviGUMq+zyA6cZZO6gAyZoMTF6TgaEjA=="; }; }; + "ansi-term-0.0.2" = { + name = "ansi-term"; + packageName = "ansi-term"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-term/-/ansi-term-0.0.2.tgz"; + sha1 = "fd753efa4beada0eac99981bc52a3f6ff019deb7"; + }; + }; "ansi-to-html-0.6.11" = { name = "ansi-to-html"; packageName = "ansi-to-html"; @@ -4207,6 +4216,15 @@ let sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; }; }; + "ansicolors-0.2.1" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz"; + sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef"; + }; + }; "ansicolors-0.3.2" = { name = "ansicolors"; packageName = "ansicolors"; @@ -4702,13 +4720,13 @@ let sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc"; }; }; - "archiver-3.0.3" = { + "archiver-3.1.1" = { name = "archiver"; packageName = "archiver"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-3.0.3.tgz"; - sha512 = "d0W7NUyXoLklozHHfvWnHoHS3dvQk8eB22pv5tBwcu1jEO5eZY8W+gHytkAaJ0R8fU2TnNThrWYxjvFlKvRxpw=="; + url = "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz"; + sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="; }; }; "archiver-utils-1.3.0" = { @@ -5539,13 +5557,13 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; - "async-limiter-1.0.0" = { + "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "async-lock-1.2.2" = { @@ -5701,13 +5719,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.503.0" = { + "aws-sdk-2.504.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.503.0"; + version = "2.504.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.503.0.tgz"; - sha512 = "DPwRxhPYCGNvKL9rUhpAoOVpMRyISbVMlXykLQknYo7wyOI+jYcyA7t8H7IFPAqj4ZG+R+Au9tO/KT4im+2gbg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.504.0.tgz"; + sha512 = "azOX54oovJv0zWzO23fBgIprwsvx8KUuMR+cAUAOx23D8LJ5S+sl3UYS9Q1X4qF/blBTa4+ZNawZDV0N1HiQmw=="; }; }; "aws-sign2-0.6.0" = { @@ -6763,13 +6781,13 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "base64-js-1.3.0" = { + "base64-js-1.3.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; - sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; "base64-url-1.2.1" = { @@ -7078,13 +7096,13 @@ let sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; - "binary-search-1.3.5" = { + "binary-search-1.3.6" = { name = "binary-search"; packageName = "binary-search"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.5.tgz"; - sha512 = "RHFP0AdU6KAB0CCZsRMU2CJTk2EpL8GLURT+4gilpjr1f/7M91FgUMnXuQLmf3OKLet34gjuNFwO7e4agdX5pw=="; + url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz"; + sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA=="; }; }; "binaryheap-0.0.3" = { @@ -7123,15 +7141,6 @@ let sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; }; }; - "bitfield-2.0.0" = { - name = "bitfield"; - packageName = "bitfield"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz"; - sha512 = "4xM4DYejOHQ/qWBfeqBXNA4mJ12PwcOibFYnH1kYh5U9BHciCqEJBqGNVnMJXUhm8mflujNRLSv7IiVQxovgjw=="; - }; - }; "bitfield-3.0.0" = { name = "bitfield"; packageName = "bitfield"; @@ -7204,13 +7213,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.11.0" = { + "bittorrent-tracker-9.12.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.11.0"; + version = "9.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.11.0.tgz"; - sha512 = "T1zvW/kSeEnWT4I3JE+6c7aZbO5jtleZyQe911SyzIxFF9DvtUNWXud3p5ZUkXaoI2xXwfpvlks5VFj5SKEB+A=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.12.1.tgz"; + sha512 = "5gjqHG3xV3eEy3UOOn4kkB09sl66t+fYzBGFMI83lRC/+33xmgpDYnu2lOnjYdRPAKWv0nBJT5XR/l9JkQ341A=="; }; }; "bl-0.8.2" = { @@ -7285,6 +7294,24 @@ let sha1 = "825a8fc536a5dc43193467f3124f7e9b78b21cef"; }; }; + "blessed-0.1.81" = { + name = "blessed"; + packageName = "blessed"; + version = "0.1.81"; + src = fetchurl { + url = "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz"; + sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; + }; + }; + "blessed-contrib-4.8.16" = { + name = "blessed-contrib"; + packageName = "blessed-contrib"; + version = "4.8.16"; + src = fetchurl { + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz"; + sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA=="; + }; + }; "blob-0.0.2" = { name = "blob"; packageName = "blob"; @@ -7330,13 +7357,13 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "block-stream2-1.1.0" = { + "block-stream2-2.0.0" = { name = "block-stream2"; packageName = "block-stream2"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz"; - sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz"; + sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g=="; }; }; "bluebird-1.1.1" = { @@ -7411,6 +7438,15 @@ let sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; }; }; + "bn.js-5.0.0" = { + name = "bn.js"; + packageName = "bn.js"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.0.0.tgz"; + sha512 = "bVwDX8AF+72fIUNuARelKAlQUNtPOfG2fRxorbVvFk4zpHbqLrPdOGfVg5vrKwVzLLePqPBiATaOZNELQzmS0A=="; + }; + }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -7654,6 +7690,15 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; + "bresenham-0.0.3" = { + name = "bresenham"; + packageName = "bresenham"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bresenham/-/bresenham-0.0.3.tgz"; + sha1 = "abdab9e5b194e27c757cd314d8444314f299877a"; + }; + }; "brfs-1.6.1" = { name = "brfs"; packageName = "brfs"; @@ -8509,13 +8554,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000988" = { + "caniuse-lite-1.0.30000989" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000988"; + version = "1.0.30000989"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz"; - sha512 = "lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz"; + sha512 = "vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="; }; }; "capture-stack-trace-1.0.1" = { @@ -8527,6 +8572,15 @@ let sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; + "cardinal-1.0.0" = { + name = "cardinal"; + packageName = "cardinal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz"; + sha1 = "50e21c1b0aa37729f9377def196b5a9cec932ee9"; + }; + }; "caseless-0.11.0" = { name = "caseless"; packageName = "caseless"; @@ -8779,6 +8833,15 @@ let sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; }; + "charm-0.1.2" = { + name = "charm"; + packageName = "charm"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; + sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; + }; + }; "charset-1.0.1" = { name = "charset"; packageName = "charset"; @@ -9013,13 +9076,13 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "chunk-store-stream-4.0.0" = { + "chunk-store-stream-4.1.0" = { name = "chunk-store-stream"; packageName = "chunk-store-stream"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.0.0.tgz"; - sha512 = "hmtlqMozj1LbZlEpTBXL3YrBsLz4nJEXVihrSbe6ugfxH/Yae5JvUCXQwpWI7VELjXX0GyZK3ajQDBX/r30zBw=="; + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-4.1.0.tgz"; + sha512 = "GjkZ16bFKMFnb8LrGZXAPeRoLXZTLu9ges6LCErJe28bMp6zKLxjWuJ7TYzR0jWq9nwo58hXG3BXZYy66Vze0Q=="; }; }; "ci-info-1.6.0" = { @@ -10165,13 +10228,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compress-commons-2.0.0" = { + "compress-commons-2.1.1" = { name = "compress-commons"; packageName = "compress-commons"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.0.0.tgz"; - sha512 = "gnETNngrfsAoLBENM8M0DoiCDJkHwz3OfIg4mBtqKDcRgE4oXNwHxHxgHvwKKlrcD7eZ7BVTy4l8t9xVF7q3FQ=="; + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz"; + sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q=="; }; }; "compressible-2.0.17" = { @@ -11065,6 +11128,15 @@ let sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; }; }; + "crc32-stream-3.0.1" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz"; + sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; + }; + }; "create-ecdh-4.0.3" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -11101,13 +11173,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.0.0" = { + "create-torrent-4.2.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.0.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.0.0.tgz"; - sha512 = "16JQRuPJWAntC4p+k6EFMxKatqzQOKv037aAun6Comomizlg9fOoBiIhxC/QCQfJFmGIfnT6HMOEa6da5xUmsg=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.2.1.tgz"; + sha512 = "IlKF2B3vrAGVzcgYVVgfsekp4p2N9BqkGeVqckTljajs+qIQ5oAwAzELJtb6sZ14UQBT7ZQNOOyvxgIL98VpZg=="; }; }; "creato-1.0.5" = { @@ -13162,6 +13234,15 @@ let sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; + "dom-serializer-0.2.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz"; + sha512 = "sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q=="; + }; + }; "dom-walk-0.1.1" = { name = "dom-walk"; packageName = "dom-walk"; @@ -13207,6 +13288,15 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; + "domelementtype-2.0.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + }; + }; "domexception-1.0.1" = { name = "domexception"; packageName = "domexception"; @@ -13387,6 +13477,24 @@ let sha512 = "pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA=="; }; }; + "drawille-blessed-contrib-1.0.0" = { + name = "drawille-blessed-contrib"; + packageName = "drawille-blessed-contrib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/drawille-blessed-contrib/-/drawille-blessed-contrib-1.0.0.tgz"; + sha1 = "15c27934f57a0056ad13596e1561637bc941f0b7"; + }; + }; + "drawille-canvas-blessed-contrib-0.1.3" = { + name = "drawille-canvas-blessed-contrib"; + packageName = "drawille-canvas-blessed-contrib"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/drawille-canvas-blessed-contrib/-/drawille-canvas-blessed-contrib-0.1.3.tgz"; + sha1 = "212f078a722bfd2ecc267ea86ab6dddc1081fd48"; + }; + }; "dreamopt-0.6.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -13648,13 +13756,13 @@ let sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; }; }; - "electron-to-chromium-1.3.210" = { + "electron-to-chromium-1.3.215" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.210"; + version = "1.3.215"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz"; - sha512 = "m1i/F+gw9jkauxDx0mOr7Sj6vp6se1mfkQNYqZb1yL5VGTp0AC1NZH5CGI6YMSO7WaScILmkKDZFG9/hlR9axQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz"; + sha512 = "ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg=="; }; }; "elegant-spinner-1.0.1" = { @@ -14054,6 +14162,15 @@ let sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; + "entities-2.0.0" = { + name = "entities"; + packageName = "entities"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz"; + sha512 = "D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="; + }; + }; "env-paths-1.0.0" = { name = "env-paths"; packageName = "env-paths"; @@ -14594,6 +14711,15 @@ let sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f"; }; }; + "esprima-3.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz"; + sha1 = "53cf247acda77313e551c3aa2e73342d3fb4f7d9"; + }; + }; "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; @@ -14747,6 +14873,15 @@ let sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }; }; + "event-stream-0.9.8" = { + name = "event-stream"; + packageName = "event-stream"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-0.9.8.tgz"; + sha1 = "5da9cf3c7900975989db5a68c28e5b3c98ebe03a"; + }; + }; "event-stream-3.1.5" = { name = "event-stream"; packageName = "event-stream"; @@ -15845,13 +15980,13 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filestream-4.1.3" = { + "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; - version = "4.1.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/filestream/-/filestream-4.1.3.tgz"; - sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325"; + url = "https://registry.npmjs.org/filestream/-/filestream-5.0.0.tgz"; + sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; "fill-range-2.2.4" = { @@ -16187,15 +16322,6 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "flatten-1.0.2" = { - name = "flatten"; - packageName = "flatten"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz"; - sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; - }; - }; "flow-bin-0.85.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -17375,6 +17501,15 @@ let sha512 = "SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ=="; }; }; + "gl-matrix-2.8.1" = { + name = "gl-matrix"; + packageName = "gl-matrix"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.8.1.tgz"; + sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; + }; + }; "glob-3.1.21" = { name = "glob"; packageName = "glob"; @@ -17871,13 +18006,13 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "graceful-fs-4.2.0" = { + "graceful-fs-4.2.1" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"; - sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz"; + sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="; }; }; "graceful-readlink-1.0.1" = { @@ -18762,6 +18897,15 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; + "here-0.0.2" = { + name = "here"; + packageName = "here"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/here/-/here-0.0.2.tgz"; + sha1 = "69c1af3f02121f3d8788e02e84dc8b3905d71195"; + }; + }; "hex-color-regex-1.1.0" = { name = "hex-color-regex"; packageName = "hex-color-regex"; @@ -18870,13 +19014,13 @@ let sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094"; }; }; - "hosted-git-info-2.7.1" = { + "hosted-git-info-2.8.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.7.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; - sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz"; + sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w=="; }; }; "hsl-regex-1.0.0" = { @@ -21228,6 +21372,15 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; + "is-wsl-2.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz"; + sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ=="; + }; + }; "is-yarn-global-0.3.0" = { name = "is-yarn-global"; packageName = "is-yarn-global"; @@ -24820,6 +24973,15 @@ let sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; + "map-canvas-0.1.5" = { + name = "map-canvas"; + packageName = "map-canvas"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/map-canvas/-/map-canvas-0.1.5.tgz"; + sha1 = "8be6bade0bf3e9f9a8b56e8836a1d1d133cab186"; + }; + }; "map-filter-reduce-2.2.1" = { name = "map-filter-reduce"; packageName = "map-filter-reduce"; @@ -25018,6 +25180,15 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; + "marked-terminal-1.7.0" = { + name = "marked-terminal"; + packageName = "marked-terminal"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-1.7.0.tgz"; + sha1 = "c8c460881c772c7604b64367007ee5f77f125904"; + }; + }; "marky-1.2.1" = { name = "marky"; packageName = "marky"; @@ -25324,6 +25495,15 @@ let sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; }; }; + "memory-streams-0.1.3" = { + name = "memory-streams"; + packageName = "memory-streams"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-streams/-/memory-streams-0.1.3.tgz"; + sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA=="; + }; + }; "memorystore-1.6.1" = { name = "memorystore"; packageName = "memorystore"; @@ -25333,6 +25513,15 @@ let sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA=="; }; }; + "memorystream-0.3.1" = { + name = "memorystream"; + packageName = "memorystream"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"; + sha1 = "86d7090b30ce455d63fbae12dda51a47ddcaf9b2"; + }; + }; "menu-string-1.3.0" = { name = "menu-string"; packageName = "menu-string"; @@ -26458,13 +26647,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-3.0.0" = { + "multistream-3.1.0" = { name = "multistream"; packageName = "multistream"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-3.0.0.tgz"; - sha512 = "v1Fx9uhHEpTB725/Kj8YpRCvrLhb20LeABFLw+0dkBkKUUAbDCY6CUUNzGQsJ94ji/p50wBPsRjIQXN1iOwZYA=="; + url = "https://registry.npmjs.org/multistream/-/multistream-3.1.0.tgz"; + sha512 = "zBgD3kn8izQAN/TaL1PCMv15vYpf+Vcrsfub06njuYVYlzUldzpopTlrEZ53pZVEbfn3Shtv7vRFoOv6LOV87Q=="; }; }; "mustache-2.3.2" = { @@ -26584,13 +26773,13 @@ let sha512 = "iWo/23xFnl+IGeX+LlfwoVKtyY4volPSodf3nwPScPgxjws4k2ZUozPG98OouMA0yn0JamqApjRw7eqLrzyV2A=="; }; }; - "muxrpcli-3.1.1" = { + "muxrpcli-3.1.2" = { name = "muxrpcli"; packageName = "muxrpcli"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.1.tgz"; - sha512 = "DSBXkmbfZgUrM9Y54Saeb2RySmuDMo5jAnMnBo0JHempIlHIXmnrIASdC0co0TQATq8kECF6SYcTFbJLKZUfJw=="; + url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-3.1.2.tgz"; + sha512 = "3nDL3dYXKxAN+spKSQBolxFoOl4HJCcm5UKlxjdjQxcjvLGLFLvwuNf1vCRpSveCHiFCxPLltWq2hT+vlDLPtQ=="; }; }; "mv-2.1.1" = { @@ -27480,6 +27669,15 @@ let sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ=="; }; }; + "node-notifier-5.4.2" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "5.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz"; + sha512 = "85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA=="; + }; + }; "node-persist-2.1.0" = { name = "node-persist"; packageName = "node-persist"; @@ -27759,6 +27957,15 @@ let sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; }; }; + "nopt-2.1.2" = { + name = "nopt"; + packageName = "nopt"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + }; + }; "nopt-2.2.1" = { name = "nopt"; packageName = "nopt"; @@ -28768,6 +28975,15 @@ let sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }; }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; "optimist-0.6.0" = { name = "optimist"; packageName = "optimist"; @@ -30163,6 +30379,15 @@ let sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA=="; }; }; + "picture-tuber-1.0.2" = { + name = "picture-tuber"; + packageName = "picture-tuber"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picture-tuber/-/picture-tuber-1.0.2.tgz"; + sha512 = "49/xq+wzbwDeI32aPvwQJldM8pr7dKDRuR76IjztrkmiCkAQDaWFJzkmfVqCHmt/iFoPFhHmI9L0oKhthrTOQw=="; + }; + }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -30460,6 +30685,15 @@ let sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; }; }; + "png-js-0.1.1" = { + name = "png-js"; + packageName = "png-js"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz"; + sha1 = "1cc7c212303acabe74263ec3ac78009580242d93"; + }; + }; "pngjs-2.3.1" = { name = "pngjs"; packageName = "pngjs"; @@ -31253,13 +31487,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.1.0" = { + "prompts-2.2.1" = { name = "prompts"; packageName = "prompts"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz"; - sha512 = "+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz"; + sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw=="; }; }; "promzard-0.3.0" = { @@ -33071,6 +33305,15 @@ let sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; }; }; + "redeyed-1.0.1" = { + name = "redeyed"; + packageName = "redeyed"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redeyed/-/redeyed-1.0.1.tgz"; + sha1 = "e96c193b40c0816b00aec842698e61185e55498a"; + }; + }; "redis-0.12.1" = { name = "redis"; packageName = "redis"; @@ -34727,13 +34970,13 @@ let sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; }; }; - "secret-stack-6.2.1" = { + "secret-stack-6.3.0" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.2.1.tgz"; - sha512 = "7hw13S77Et4yC23uVXOFDRyullxAvFuoN3XW6PvHlAVkYMirLkyeglPOwPTk5JhYwIKPdpIz6vQ7DM0zSlOUHA=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.0.tgz"; + sha512 = "abIfcP1tlJ3gbfgAkp6mgqEc7M70GvXVTyE//iHDXMQz21zQxOD5WcWAiMg1Lgw5FgLfHM1WF+c8PqFNNE3WOg=="; }; }; "secure-keys-1.0.0" = { @@ -35591,13 +35834,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-7.2.0" = { + "simple-websocket-8.0.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "7.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.2.0.tgz"; - sha512 = "wdxFg1fHw1yqFKWDcw+yNb4VIYqtl+vknZMlpLhvZSlR6l7/iVuwozqo+Qtl73mB1IH5QnXzonD1S+hAaLNTvQ=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.0.tgz"; + sha512 = "DwBEoqOq8gvnblarMPkhZD6AWituWbVfTil/UflowYm/Bu5SK23BDKGxrVwgQXGKydzxlSiYva7LC3/hXSRLIw=="; }; }; "single-line-log-0.4.1" = { @@ -35627,13 +35870,13 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; - "sisteransi-1.0.2" = { + "sisteransi-1.0.3" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz"; - sha512 = "ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w=="; + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz"; + sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="; }; }; "skin-tone-1.0.0" = { @@ -35843,22 +36086,22 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.208.0" = { + "snyk-1.210.0" = { name = "snyk"; packageName = "snyk"; - version = "1.208.0"; + version = "1.210.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.208.0.tgz"; - sha512 = "MMOQazfz+5fvoCDEBBJiuYNdcrtE3anemGvL7VJFlWu4uc8YgVZ8gvetEO7OmLmn4FfTmJ/hAthEQgcXYjDjFw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz"; + sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg=="; }; }; - "snyk-config-2.2.2" = { + "snyk-config-2.2.3" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.2.tgz"; - sha512 = "ud1UJhU5b3z2achCVbXin6m3eeESvJTn9hBDYjp5BafI+1ajOJt0LnUB9+SAZ3CnQIK90PUb/3nSx0xjtda7sA=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz"; + sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; "snyk-docker-plugin-1.25.1" = { @@ -35906,13 +36149,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.3.1" = { + "snyk-mvn-plugin-2.3.3" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.1.tgz"; - sha512 = "2RgBnYe3Upc7SL+sL7MmnoCoJV/TZZ7q2L0J1BAbjoD/4cca4q0TCR6QVLzytHf4fSqc6QjSMjTUfmAo0kgsBg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.3.tgz"; + sha512 = "NYFL+jtHfAJk+Jdyme4I8pTvg/wfoHgkOs1g1nFUEPTcpBb5mfqy7Q9hDJWvnfXY8M6P9aEqvO+bmCVgTQvySg=="; }; }; "snyk-nodejs-lockfile-parser-1.16.0" = { @@ -35924,13 +36167,13 @@ let sha512 = "cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA=="; }; }; - "snyk-nuget-plugin-1.11.2" = { + "snyk-nuget-plugin-1.11.3" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.2.tgz"; - sha512 = "dNAwwFzrxI0gJh+3Eta7EFlz+jzXeTqXUwThaEASxCNNugV8gKsK/v+k0pQBsRPKvTLFlswB2D2Bt1E7YSOixA=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.3.tgz"; + sha512 = "UgLTMr7Vz0qZoL15SkFAUfMb4Vw/qFxf6lBoL2v8xA+Mqdvn2Yu9x/yW659ElFVSUjniqKTFyloKq9/XSv+c+A=="; }; }; "snyk-paket-parser-1.5.0" = { @@ -36248,13 +36491,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.4.3" = { + "sodium-native-2.4.5" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.4.3"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.3.tgz"; - sha512 = "UCj3G++buo7HFADLMXyG+K7trEl6h17lde/2Sd3Al9ozcfPIQyKohmVqDncHY7ZggWkhzdwHKyDnlFWFQHZ5pg=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.5.tgz"; + sha512 = "G1uhd4l1OexzUC/6eHIbAvoivCs9T7ncDlEWodZglPZVUOXi6jtSe7tCi25aYB06zRoOjVfE4SL+hZ4EfkyZgw=="; }; }; "sodium-universal-2.0.0" = { @@ -36509,6 +36752,15 @@ let sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; }; }; + "sparkline-0.1.2" = { + name = "sparkline"; + packageName = "sparkline"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sparkline/-/sparkline-0.1.2.tgz"; + sha1 = "c3bde46252b1354e710c4b200d54816bd9f07a32"; + }; + }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -37499,6 +37751,15 @@ let sha512 = "ryeEu3DGMt/095uTShIYGzLbbhZ+tHQtgp5HWEhXALSoc4U1iLSvpReZUdysahnJ3tki80wBBgryqqBzFZ0KaA=="; }; }; + "stream-to-blob-2.0.0" = { + name = "stream-to-blob"; + packageName = "stream-to-blob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-2.0.0.tgz"; + sha512 = "E+YitTtIHo7RQ4Cmgl+EzlMpqvLroTynRgt4t0pI4y5oz/piqlBQB8NFXLIWcjGOsKw+THnImrdpWcOCVxK25Q=="; + }; + }; "stream-to-blob-url-2.1.2" = { name = "stream-to-blob-url"; packageName = "stream-to-blob-url"; @@ -38480,6 +38741,15 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; + "systeminformation-4.14.4" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "4.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.4.tgz"; + sha512 = "ib2dodksiiaGOW4rcKvFr5naHkODI9GwQPugLb6FLKppkIsE7rj2dfY2UdMBr7oX0/iZP981hoxmbk2e6zl99Q=="; + }; + }; "syswide-cas-5.3.0" = { name = "syswide-cas"; packageName = "syswide-cas"; @@ -38796,6 +39066,15 @@ let sha512 = "LB83o9bfZGrntdqPuRdanIVCPReam9SOZKW0fOy5I9X3A854GGWi0tjCqoXEk84XIEYBc/x9Hq3EFop/H5wJaw=="; }; }; + "term-canvas-0.0.5" = { + name = "term-canvas"; + packageName = "term-canvas"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/term-canvas/-/term-canvas-0.0.5.tgz"; + sha1 = "597afac2fa6369a6f17860bce9c5f66d6ea0ca96"; + }; + }; "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; @@ -38805,13 +39084,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.29.2" = { + "terminal-kit-1.29.3" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.29.2"; + version = "1.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.2.tgz"; - sha512 = "Ky4kxKivTqdH7OXZEOh1oaUx9OZSf707nW3OHN97UpLAfU/U75lzUlQhDxoKsG0T9qejC7b8qCbX3Ps+kX14SQ=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.3.tgz"; + sha512 = "RngmihiCinQ0CT3Q7l2R4aiV50czaB0gmGZ2rOZXhX5vWAkUAsnRVcv4JG068KQP1FbQNhm88CU/nBCZQmMPUQ=="; }; }; "terser-3.17.0" = { @@ -38823,13 +39102,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.1.2" = { + "terser-4.1.3" = { name = "terser"; packageName = "terser"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz"; - sha512 = "jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw=="; + url = "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz"; + sha512 = "on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ=="; }; }; "terser-webpack-plugin-1.4.1" = { @@ -40092,13 +40371,13 @@ let sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA=="; }; }; - "type-1.0.1" = { + "type-1.0.3" = { name = "type"; packageName = "type"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.0.1.tgz"; - sha512 = "MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw=="; + url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz"; + sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="; }; }; "type-check-0.3.2" = { @@ -41586,6 +41865,15 @@ let sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="; }; }; + "v8-compile-cache-2.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + }; + }; "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; @@ -42018,13 +42306,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-3.2.0" = { + "videostream-3.2.1" = { name = "videostream"; packageName = "videostream"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-3.2.0.tgz"; - sha512 = "8+EY2dBxpJti9OBWUHtTn8wZEzyUwX7ldm/rwz8LKsgK+ccGVbTug9F6nyBOehLhifXALCs6Ca+CeYPVGBwobg=="; + url = "https://registry.npmjs.org/videostream/-/videostream-3.2.1.tgz"; + sha512 = "Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ=="; }; }; "vinyl-0.4.6" = { @@ -42567,13 +42855,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.39.0" = { + "webpack-4.39.1" = { name = "webpack"; packageName = "webpack"; - version = "4.39.0"; + version = "4.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.39.0.tgz"; - sha512 = "nrxFNSEKm4T1C/EsgOgN50skt//Pl4X7kgJC1MrlE47M292LSCVmMOC47iTGL0CGxbdwhKGgeThrJcw0bstEfA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz"; + sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ=="; }; }; "webpack-cli-3.3.6" = { @@ -42594,13 +42882,13 @@ let sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; }; }; - "webpack-sources-1.4.1" = { + "webpack-sources-1.4.3" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.1.tgz"; - sha512 = "XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; "websocket-driver-0.7.3" = { @@ -42630,13 +42918,13 @@ let sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug=="; }; }; - "webtorrent-0.105.3" = { + "webtorrent-0.106.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.105.3"; + version = "0.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.105.3.tgz"; - sha512 = "Jm2Y4NIwRdAOTnFCueE9t1bcFjFK9W75pEfvx9WNidLo20eUvdLuERLu75Gnl7eI44mue1nAtk7MgaYk2CaeRw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.106.0.tgz"; + sha512 = "CTj4J6yj6TuNTfrjRL84tunlCwIM+4hBu/6BfZslgi+iHdiJklUmFra/1WXBsx1madUB6/Ujx1eh4w+FO0on7g=="; }; }; "whatwg-encoding-1.0.5" = { @@ -43278,6 +43566,15 @@ let sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; }; }; + "x256-0.0.2" = { + name = "x256"; + packageName = "x256"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz"; + sha1 = "c9af18876f7a175801d564fe70ad9e8317784934"; + }; + }; "xdg-basedir-3.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -44062,13 +44359,13 @@ let sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; }; }; - "zip-stream-2.1.0" = { + "zip-stream-2.1.2" = { name = "zip-stream"; packageName = "zip-stream"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.0.tgz"; - sha512 = "F/xoLqlQShgvn1BzHQCNiYIoo2R93GQIMH+tA6JC3ckMDkme4bnhEEXSferZcG5ea/6bZNx3GqSUHqT8TUO6uQ=="; + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.2.tgz"; + sha512 = "ykebHGa2+uzth/R4HZLkZh3XFJzivhVsjJt8bN3GvBzLaqqrUdRacu+c4QtnUgjkkQfsOuNE1JgLKMCPNmkKgg=="; }; }; "zmq-2.15.3" = { @@ -44169,13 +44466,13 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -44561,7 +44858,7 @@ in sources."globalyzer-0.1.4" sources."globrex-0.1.2" sources."got-9.6.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" (sources."gulp-vinyl-zip-2.1.2" // { dependencies = [ sources."readable-stream-2.3.6" @@ -44736,10 +45033,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.9.3.tgz"; - sha512 = "+l/N5sNSwvDe6UsVrqcz8GIWp8QO5Q72OUW7P0X3xdcVo0XPnzwJ/jzKaYGnp7/syOFTIfL6KyW4gVezPE2oPA=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.10.0.tgz"; + sha512 = "0A2wsUPAoiiqr4B/EAlz1SPUNbq0pbyt4I8V6fiwie5oJXaxfJ8Vl8rpSUsZ2PzwpowgdiutjFkOxvFmhHAkQQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -44875,16 +45172,16 @@ in sources."@types/node-12.6.9" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" - sources."@types/ws-6.0.1" + sources."@types/ws-6.0.2" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.9.0" - (sources."@vue/cli-ui-3.9.3" // { + sources."@vue/cli-shared-utils-3.10.0" + (sources."@vue/cli-ui-3.10.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.9.3" - sources."@vue/cli-ui-addon-widgets-3.9.3" + sources."@vue/cli-ui-addon-webpack-3.10.0" + sources."@vue/cli-ui-addon-widgets-3.10.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" @@ -44952,7 +45249,7 @@ in sources."ast-types-0.11.7" sources."async-1.5.2" sources."async-each-1.0.3" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."async-retry-1.2.3" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -44967,7 +45264,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bl-1.2.2" @@ -44995,7 +45292,7 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30000988" + sources."caniuse-lite-1.0.30000989" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" @@ -45120,7 +45417,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.6.2" - sources."electron-to-chromium-1.3.210" + sources."electron-to-chromium-1.3.215" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -45241,7 +45538,7 @@ in }) sources."good-listener-1.2.2" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."graphql-14.4.2" (sources."graphql-anywhere-4.2.4" // { @@ -45425,9 +45722,9 @@ in sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-5.4.0" // { + (sources."node-notifier-5.4.2" // { dependencies = [ - sources."semver-5.7.0" + sources."is-wsl-2.1.0" ]; }) (sources."node-releases-1.1.26" // { @@ -46099,7 +46396,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-color-0.1.7" sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" @@ -46605,10 +46902,10 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.7.1480"; + version = "2.7.1505"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1480.tgz"; - sha512 = "Yr0YtXQ6JHB8ep68X9E5FQvbNb0Hs05t8o8exl+LJ8c/0VpIg2Ff7slzRHseTuQF4RysYk2VbRNPaN6ZPS1kWw=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1505.tgz"; + sha512 = "3v1lDv6zwhGi2Qb8rNFA3tR+8h/vlufuanRgbw2ofPCPBCC29yiyQs2+IiCTBHVAxcBPN0h5rsELstoZ3S2Odw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -46635,7 +46932,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."glob-7.1.3" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."https-proxy-agent-2.2.1" sources."inflight-1.0.6" @@ -46683,7 +46980,7 @@ in dependencies = [ sources."abab-2.0.0" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.2" // { + (sources."acorn-globals-4.3.3" // { dependencies = [ sources."acorn-6.2.1" ]; @@ -46696,7 +46993,7 @@ in sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -46934,14 +47231,14 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) sources."fs.realpath-1.0.0" sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.11" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -46952,21 +47249,22 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) sources."lodash-4.2.1" sources."loud-rejection-1.6.0" + sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-db-1.40.0" @@ -46990,7 +47288,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) sources."pify-2.3.0" @@ -47027,6 +47325,7 @@ in sources."trim-newlines-1.0.0" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -47062,7 +47361,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -47248,7 +47547,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-2.0.1" sources."bitfield-0.1.0" @@ -47346,12 +47645,12 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."got-1.2.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-1.0.3" sources."hat-0.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-signature-1.2.0" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" @@ -47387,6 +47686,7 @@ in sources."long-2.4.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" + sources."lru-cache-5.1.1" sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" (sources."mdns-js-1.0.3" // { @@ -47613,6 +47913,7 @@ in sources."xmldom-0.1.27" sources."xspfr-0.3.1" sources."xtend-4.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -47823,7 +48124,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.44" (sources."body-parser-1.19.0" // { @@ -48020,7 +48321,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -48032,7 +48333,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -48106,7 +48407,7 @@ in sources."lodash.debounce-4.0.8" sources."loud-rejection-2.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."make-dir-1.3.0" sources."map-cache-0.2.2" @@ -48335,6 +48636,8 @@ in sources."cross-spawn-5.1.0" sources."execa-0.7.0" sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."through-2.3.8" @@ -48398,7 +48701,7 @@ in sources."xdg-basedir-3.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."yallist-2.1.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -48533,14 +48836,14 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."ignore-4.0.6" sources."indent-string-3.2.0" sources."inflight-1.0.6" @@ -48572,6 +48875,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" + sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" @@ -48720,6 +49024,7 @@ in sources."use-3.1.1" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" + sources."yallist-3.0.3" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -48859,7 +49164,7 @@ in sources."symbol-observable-1.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."type-1.0.1" + sources."type-1.0.3" sources."util-deprecate-1.0.2" (sources."variable-diff-1.1.0" // { dependencies = [ @@ -48921,7 +49226,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."hyperquest-2.1.3" sources."iconv-lite-0.4.24" @@ -49021,7 +49326,7 @@ in sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -49311,7 +49616,7 @@ in sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -49586,7 +49891,11 @@ in ]; }) sources."sodium-javascript-0.5.5" - sources."sodium-native-2.4.3" + (sources."sodium-native-2.4.5" // { + dependencies = [ + sources."node-gyp-build-4.1.0" + ]; + }) sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -49909,10 +50218,10 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.503.0" + sources."aws-sdk-2.504.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" sources."buffer-queue-1.0.0" @@ -50037,7 +50346,7 @@ in sources."ansi-styles-2.2.1" sources."anymatch-3.0.3" sources."async-each-1.0.3" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."binary-extensions-2.0.0" sources."braces-3.0.2" sources."chalk-1.1.3" @@ -50142,7 +50451,7 @@ in sources."supports-color-2.0.0" sources."timers-ext-0.1.7" sources."to-regex-range-5.0.1" - sources."type-1.0.1" + sources."type-1.0.3" sources."unpipe-1.0.0" sources."url-parse-1.4.3" sources."which-1.3.1" @@ -50251,13 +50560,18 @@ in sources."get-stream-3.0.0" sources."globals-9.18.0" sources."got-7.1.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-ansi-3.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."import-jsx-1.3.2" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -50566,7 +50880,7 @@ in sources."tslib-1.10.0" sources."type-check-0.3.2" sources."uri-js-4.2.2" - sources."v8-compile-cache-2.0.3" + sources."v8-compile-cache-2.1.0" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -50720,7 +51034,7 @@ in sources."tslib-1.10.0" sources."type-check-0.3.2" sources."uri-js-4.2.2" - sources."v8-compile-cache-2.0.3" + sources."v8-compile-cache-2.1.0" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -50790,13 +51104,13 @@ in sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-signature-1.2.0" sources."indent-string-2.1.0" sources."inherits-2.0.4" @@ -50826,6 +51140,7 @@ in }) sources."log-update-1.0.2" sources."loud-rejection-1.6.0" + sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-db-1.40.0" @@ -50912,6 +51227,7 @@ in sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."which-1.3.1" + sources."yallist-3.0.3" sources."yauzl-2.4.1" sources."zen-observable-0.5.2" ]; @@ -50976,9 +51292,14 @@ in sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" sources."get-stream-3.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."iconv-lite-0.4.24" sources."indent-string-3.2.0" sources."inherits-2.0.4" @@ -51230,7 +51551,7 @@ in sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -51633,7 +51954,7 @@ in sources."muxrpc-6.4.2" sources."nan-2.14.0" sources."nearley-2.18.0" - sources."node-gyp-build-3.9.0" + sources."node-gyp-build-4.1.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -51708,7 +52029,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.3" + sources."sodium-native-2.4.5" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" @@ -51982,7 +52303,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ @@ -52020,7 +52341,12 @@ in sources."has-flag-3.0.0" sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -52670,6 +52996,80 @@ in production = true; bypassCache = true; }; + gtop = nodeEnv.buildNodePackage { + name = "gtop"; + packageName = "gtop"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz"; + sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansi-term-0.0.2" + sources."ansicolors-0.2.1" + sources."blessed-0.1.81" + sources."blessed-contrib-4.8.16" + sources."bresenham-0.0.3" + sources."buffers-0.1.1" + sources."cardinal-1.0.0" + sources."chalk-1.1.3" + sources."charm-0.1.2" + sources."cli-table-0.3.1" + sources."colors-1.0.3" + sources."core-util-is-1.0.2" + sources."drawille-blessed-contrib-1.0.0" + sources."drawille-canvas-blessed-contrib-0.1.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-3.0.0" + (sources."event-stream-0.9.8" // { + dependencies = [ + sources."optimist-0.2.8" + ]; + }) + sources."gl-matrix-2.8.1" + sources."has-ansi-2.0.0" + sources."here-0.0.2" + sources."inherits-2.0.4" + sources."isarray-0.0.1" + sources."lodash-4.17.15" + sources."lodash.assign-4.2.0" + sources."lodash.toarray-4.4.0" + sources."map-canvas-0.1.5" + sources."marked-0.6.3" + sources."marked-terminal-1.7.0" + sources."memory-streams-0.1.3" + sources."memorystream-0.3.1" + sources."node-emoji-1.10.0" + sources."nopt-2.1.2" + sources."optimist-0.3.7" + sources."picture-tuber-1.0.2" + sources."png-js-0.1.1" + sources."readable-stream-1.0.34" + sources."redeyed-1.0.1" + sources."sax-1.2.4" + sources."sparkline-0.1.2" + sources."string_decoder-0.10.31" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."systeminformation-4.14.4" + sources."term-canvas-0.0.5" + sources."wordwrap-0.0.3" + sources."x256-0.0.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "graphic top"; + homepage = "https://github.com/aksakalli/gtop#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; gulp = nodeEnv.buildNodePackage { name = "gulp"; packageName = "gulp"; @@ -52853,7 +53253,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.0" @@ -52864,7 +53264,7 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -52905,6 +53305,7 @@ in sources."lead-1.0.0" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" + sources."lru-cache-5.1.1" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -53077,7 +53478,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."to-through-2.0.0" - sources."type-1.0.1" + sources."type-1.0.3" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."undertaker-1.2.1" @@ -53110,6 +53511,7 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-3.2.1" + sources."yallist-3.0.3" sources."yargs-7.1.0" sources."yargs-parser-5.0.0" ]; @@ -53229,7 +53631,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."gulplog-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -53238,7 +53640,7 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."inherits-2.0.4" sources."ini-1.3.5" sources."interpret-1.2.0" @@ -53282,6 +53684,7 @@ in sources."lcid-1.0.0" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" + sources."lru-cache-5.1.1" (sources."make-iterator-1.0.1" // { dependencies = [ sources."kind-of-6.0.2" @@ -53426,7 +53829,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."type-1.0.1" + sources."type-1.0.3" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -53449,6 +53852,7 @@ in sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" sources."y18n-3.2.1" + sources."yallist-3.0.3" sources."yargs-7.1.0" sources."yargs-parser-5.0.0" ]; @@ -53523,9 +53927,10 @@ in sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.1" // { + (sources."dom-serializer-0.2.1" // { dependencies = [ - sources."entities-1.1.2" + sources."domelementtype-2.0.1" + sources."entities-2.0.0" ]; }) sources."domelementtype-1.3.1" @@ -53790,7 +54195,7 @@ in sha512 = "RJ8nHsE4diosqkSpKot3unMn05ExCisUDy/URw/3M9t8MetvthBBQpcfaRPGftXRGebaMF1HnH6dLG994TpNVQ=="; }; dependencies = [ - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."chrome-remote-interface-0.26.1" sources."commander-2.11.0" sources."node-fetch-2.6.0" @@ -53835,7 +54240,7 @@ in sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."astral-regex-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -53902,7 +54307,7 @@ in sources."get-stream-4.1.0" sources."get-uri-2.0.3" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -54257,7 +54662,7 @@ in sources."abab-2.0.0" sources."abbrev-1.1.1" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.2" // { + (sources."acorn-globals-4.3.3" // { dependencies = [ sources."acorn-6.2.1" ]; @@ -54284,7 +54689,7 @@ in sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."async-mutex-0.1.3" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -54392,7 +54797,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -54666,7 +55071,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.29.2" + sources."terminal-kit-1.29.3" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -54822,7 +55227,7 @@ in sources."catharsis-0.8.11" sources."entities-1.1.2" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."js2xmlparser-4.0.0" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -54866,9 +55271,10 @@ in sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" sources."date-now-0.1.4" - (sources."dom-serializer-0.1.1" // { + (sources."dom-serializer-0.2.1" // { dependencies = [ - sources."entities-1.1.2" + sources."domelementtype-2.0.1" + sources."entities-2.0.0" ]; }) sources."domelementtype-1.3.1" @@ -55101,7 +55507,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -55320,7 +55726,7 @@ in sources."anymatch-3.0.3" sources."arraybuffer.slice-0.0.7" sources."async-2.6.3" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -55384,7 +55790,7 @@ in sources."fsevents-2.0.7" sources."glob-7.1.4" sources."glob-parent-5.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" @@ -55525,7 +55931,7 @@ in sources."glob-7.1.4" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-symbols-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -56272,7 +56678,7 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" (sources."handlebars-4.1.2" // { dependencies = [ sources."source-map-0.6.1" @@ -56290,7 +56696,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" @@ -56832,7 +57238,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -57026,7 +57432,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -57250,7 +57656,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-each-1.0.3" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -57368,7 +57774,7 @@ in sources."github-slugger-1.2.1" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -57997,7 +58403,7 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bl-1.2.2" @@ -58035,7 +58441,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30000988" + sources."caniuse-lite-1.0.30000989" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -58194,7 +58600,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.210" + sources."electron-to-chromium-1.3.215" sources."elliptic-6.5.0" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -58389,7 +58795,7 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -58415,7 +58821,7 @@ in sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" @@ -58907,7 +59313,7 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-4.1.2" // { + (sources."terser-4.1.3" // { dependencies = [ sources."commander-2.20.0" sources."source-map-0.6.1" @@ -58982,7 +59388,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.39.0" // { + (sources."webpack-4.39.1" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -59034,7 +59440,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."webpack-sources-1.4.1" // { + (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-list-map-2.0.1" sources."source-map-0.6.1" @@ -59480,7 +59886,7 @@ in sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -59535,7 +59941,7 @@ in }) (sources."gulp-sourcemaps-2.6.4" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."readable-stream-2.3.6" sources."source-map-0.6.1" sources."string_decoder-1.1.1" @@ -59552,7 +59958,7 @@ in sources."extend-shallow-1.1.4" sources."glob-7.1.4" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" @@ -59654,7 +60060,7 @@ in sources."lead-1.0.0" (sources."less-2.7.3" // { dependencies = [ - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" ]; }) sources."liftoff-2.5.0" @@ -59897,7 +60303,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.0.1" + sources."type-1.0.3" sources."typescript-3.5.3" (sources."uglify-js-3.4.9" // { dependencies = [ @@ -59940,7 +60346,7 @@ in dependencies = [ sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."vinyl-2.2.0" ]; }) @@ -60268,7 +60674,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -60451,14 +60857,14 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."headless-0.1.7" sources."hoek-2.16.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-errors-1.7.2" sources."http-signature-1.1.1" sources."iconv-lite-0.4.24" @@ -60490,6 +60896,7 @@ in sources."load-json-file-1.1.0" sources."lodash-2.4.2" sources."loud-rejection-1.6.0" + sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."media-typer-0.3.0" sources."meow-3.7.0" @@ -60647,6 +61054,7 @@ in sources."xmldom-0.1.27" sources."xtend-4.0.2" sources."y18n-3.2.1" + sources."yallist-3.0.3" sources."yargs-3.32.0" ]; buildInputs = globalBuildInputs; @@ -60793,7 +61201,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.1.22" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -60934,7 +61342,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -61188,7 +61596,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" - sources."type-1.0.1" + sources."type-1.0.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uc.micro-1.0.6" @@ -61257,7 +61665,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -61299,11 +61707,11 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -61318,6 +61726,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" + sources."lru-cache-5.1.1" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" @@ -61559,7 +61968,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -61891,11 +62300,11 @@ in sources."glob-7.1.4" sources."global-dirs-0.1.1" sources."got-9.6.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.2" @@ -62015,7 +62424,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.1.0" + sources."prompts-2.2.1" sources."protoduck-5.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -62065,7 +62474,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sisteransi-1.0.2" + sources."sisteransi-1.0.3" sources."smart-buffer-4.0.2" sources."socks-2.3.2" (sources."socks-proxy-agent-4.0.2" // { @@ -62505,7 +62914,7 @@ in sources."abab-2.0.0" sources."abbrev-1.1.1" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.2" // { + (sources."acorn-globals-4.3.3" // { dependencies = [ sources."acorn-6.2.1" ]; @@ -62538,7 +62947,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-each-1.0.3" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -62561,7 +62970,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.2.1" @@ -62598,7 +63007,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000988" + sources."caniuse-lite-1.0.30000989" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.6" @@ -62718,7 +63127,12 @@ in sources."des.js-1.0.0" sources."destroy-1.0.4" sources."diffie-hellman-5.0.3" - sources."dom-serializer-0.1.1" + (sources."dom-serializer-0.2.1" // { + dependencies = [ + sources."domelementtype-2.0.1" + sources."entities-2.0.0" + ]; + }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domexception-1.0.1" @@ -62731,7 +63145,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.210" + sources."electron-to-chromium-1.3.215" sources."elliptic-6.5.0" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -62789,7 +63203,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -62818,7 +63232,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.4" // { dependencies = [ - sources."terser-4.1.2" + sources."terser-4.1.3" ]; }) (sources."htmlparser2-3.10.1" // { @@ -63292,7 +63706,7 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."uuid-3.3.2" - sources."v8-compile-cache-2.0.3" + sources."v8-compile-cache-2.1.0" sources."vendors-1.0.3" sources."verror-1.10.0" sources."vlq-0.2.3" @@ -63417,11 +63831,11 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-headers-3.0.2" sources."iconv-lite-0.4.24" sources."immediate-chunk-store-1.0.8" @@ -63463,6 +63877,7 @@ in sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" + sources."lru-cache-5.1.1" sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" @@ -63612,6 +64027,7 @@ in sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."xtend-4.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -63635,7 +64051,7 @@ in sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" sources."ajv-6.10.2" - sources."archiver-3.0.3" + sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.6" @@ -63651,7 +64067,7 @@ in sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."base64-url-1.2.1" sources."base64id-1.0.0" sources."basic-auth-1.0.4" @@ -63697,7 +64113,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - (sources."compress-commons-2.0.0" // { + (sources."compress-commons-2.1.1" // { dependencies = [ sources."readable-stream-2.3.6" ]; @@ -63729,11 +64145,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."crc-3.8.0" - (sources."crc32-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - ]; - }) + sources."crc32-stream-3.0.1" (sources."csrf-3.0.6" // { dependencies = [ sources."uid-safe-2.1.4" @@ -63811,7 +64223,7 @@ in sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary-0.1.7" // { @@ -64076,7 +64488,7 @@ in sources."xmlhttprequest-ssl-1.5.3" sources."xtend-4.0.2" sources."yeast-0.1.2" - sources."zip-stream-2.1.0" + sources."zip-stream-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -64090,10 +64502,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.2.tgz"; - sha512 = "/UW87zxOU3p60deTeo94GX/ZR6ph1tGDDZmCnIFvo2gMsAaWAM/nePuAdT/RZ3cbSJfG3+/HXxsYOxetAjC/Sg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.3.tgz"; + sha512 = "Hxk8VouMZRh870u0hJHCcumylGO8VV6Id+Fm7S+MyZVGGgtaZlEFFV2HIndVd9nXTksS+RuhINX6jGIVmqTmDg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64147,7 +64559,7 @@ in }) sources."async-1.5.2" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -64221,7 +64633,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.4" sources."globule-1.2.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.7" @@ -64453,7 +64865,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -65083,7 +65495,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -65376,14 +65788,14 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.208.0"; + version = "1.210.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.208.0.tgz"; - sha512 = "MMOQazfz+5fvoCDEBBJiuYNdcrtE3anemGvL7VJFlWu4uc8YgVZ8gvetEO7OmLmn4FfTmJ/hAthEQgcXYjDjFw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz"; + sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg=="; }; dependencies = [ sources."@snyk/composer-lockfile-parser-1.0.3" - sources."@snyk/dep-graph-1.10.0" + sources."@snyk/dep-graph-1.12.0" sources."@snyk/gemfile-1.2.0" sources."@types/agent-base-4.2.0" sources."@types/debug-4.1.4" @@ -65495,10 +65907,15 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graphlib-2.1.7" sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -65652,7 +66069,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."smart-buffer-4.0.2" - sources."snyk-config-2.2.2" + sources."snyk-config-2.2.3" (sources."snyk-docker-plugin-1.25.1" // { dependencies = [ sources."debug-4.1.1" @@ -65670,13 +66087,13 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.3.1" // { + (sources."snyk-mvn-plugin-2.3.3" // { dependencies = [ sources."tslib-1.9.3" ]; }) sources."snyk-nodejs-lockfile-parser-1.16.0" - sources."snyk-nuget-plugin-1.11.2" + sources."snyk-nuget-plugin-1.11.3" sources."snyk-paket-parser-1.5.0" (sources."snyk-php-plugin-1.6.4" // { dependencies = [ @@ -65801,7 +66218,7 @@ in sources."accepts-1.3.7" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" @@ -65894,7 +66311,12 @@ in sources."color-name-1.1.3" sources."configstore-3.1.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."debug-3.1.0" @@ -65918,9 +66340,9 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.2" sources."import-lazy-2.1.0" @@ -65947,7 +66369,7 @@ in sources."log-update-2.3.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-5.1.1" sources."make-dir-1.3.0" sources."map-obj-2.0.0" sources."meow-5.0.0" @@ -66023,7 +66445,7 @@ in sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."yallist-2.1.2" + sources."yallist-3.0.3" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -66076,7 +66498,7 @@ in sources."base64-url-2.3.2" sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" - sources."binary-search-1.3.5" + sources."binary-search-1.3.6" (sources."bl-0.8.2" // { dependencies = [ sources."isarray-0.0.1" @@ -66228,7 +66650,7 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" @@ -66344,11 +66766,7 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."leveldown-5.1.1" // { - dependencies = [ - sources."node-gyp-build-4.1.0" - ]; - }) + sources."leveldown-5.1.1" sources."levelup-4.1.0" sources."libnested-1.4.1" sources."libsodium-0.7.5" @@ -66392,7 +66810,7 @@ in sources."muxrpc-6.4.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" - sources."muxrpcli-3.1.1" + sources."muxrpcli-3.1.2" (sources."mv-2.1.1" // { dependencies = [ sources."rimraf-2.4.5" @@ -66410,7 +66828,7 @@ in sources."ncp-2.0.0" sources."nearley-2.18.0" sources."nice-try-1.0.5" - sources."node-gyp-build-3.9.0" + sources."node-gyp-build-4.1.0" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.2" @@ -66620,7 +67038,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.20" - sources."secret-stack-6.2.1" + sources."secret-stack-6.3.0" sources."semver-5.7.0" sources."separator-escape-0.0.0" (sources."set-value-2.0.1" // { @@ -66669,7 +67087,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.3" + sources."sodium-native-2.4.5" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -66899,9 +67317,9 @@ in sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-1.5.2" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.503.0" + sources."aws-sdk-2.504.0" sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."babel-runtime-6.26.0" @@ -66916,7 +67334,7 @@ in }) sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."base64id-1.0.0" sources."base64url-3.0.1" sources."basic-auth-1.1.0" @@ -67097,7 +67515,7 @@ in sources."ms-2.1.2" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graphlib-2.1.7" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -67117,7 +67535,12 @@ in ]; }) sources."hoek-2.16.3" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -67681,10 +68104,14 @@ in ]; }) sources."define-properties-1.1.3" - sources."dom-serializer-0.1.1" + (sources."dom-serializer-0.2.1" // { + dependencies = [ + sources."domelementtype-2.0.1" + ]; + }) sources."domelementtype-1.3.1" sources."domutils-1.7.0" - sources."entities-1.1.2" + sources."entities-2.0.0" sources."es-abstract-1.13.0" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" @@ -67926,7 +68353,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" (sources."graphlib-2.1.7" // { dependencies = [ sources."lodash-4.17.15" @@ -68366,7 +68793,7 @@ in sources."argparse-1.0.10" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -68494,7 +68921,7 @@ in sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -68592,11 +69019,11 @@ in sources."function-bind-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.3" @@ -68630,6 +69057,7 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."log-symbols-1.0.2" + sources."lru-cache-5.1.1" sources."map-like-2.0.0" sources."markdown-escapes-1.0.3" sources."md5-2.2.1" @@ -68730,6 +69158,7 @@ in sources."x-is-string-0.1.0" sources."xml-escape-1.1.0" sources."xtend-4.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -68837,7 +69266,12 @@ in sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."cuss-1.16.0" @@ -68867,9 +69301,9 @@ in sources."glob-7.1.4" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."ignore-3.3.10" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -68911,7 +69345,7 @@ in sources."lodash.intersection-4.4.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-5.1.1" (sources."make-dir-1.3.0" // { dependencies = [ sources."pify-3.0.0" @@ -69085,7 +69519,7 @@ in sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" - sources."yallist-2.1.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -69460,7 +69894,7 @@ in sources."asn1-0.2.3" sources."asn1.js-5.2.0" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -69572,7 +70006,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."got-9.6.0" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -69904,7 +70338,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -70270,7 +70704,7 @@ in sources."commander-2.20.0" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -70334,7 +70768,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-1.0.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -70480,7 +70914,7 @@ in sources."getmac-1.4.6" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -70496,7 +70930,12 @@ in sources."mkdirp-0.3.0" ]; }) - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -70845,7 +71284,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.5" @@ -70925,7 +71364,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.4" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" sources."handlebars-4.1.2" @@ -71267,7 +71706,12 @@ in sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."crypto-random-string-1.0.0" sources."css-parse-1.7.0" sources."currently-unhandled-0.4.1" @@ -71291,7 +71735,12 @@ in sources."doctrine-3.0.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."editorconfig-0.15.3" + (sources."editorconfig-0.15.3" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."element-helper-json-2.0.5" sources."emoji-regex-7.0.3" sources."error-ex-1.3.2" @@ -71358,7 +71807,7 @@ in sources."global-dirs-0.1.1" sources."globals-11.12.0" sources."got-6.7.1" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -71390,7 +71839,7 @@ in sources."hast-util-parse-selector-2.2.2" sources."hast-util-to-string-1.0.2" sources."hast-util-whitespace-1.0.3" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."html-void-elements-1.0.4" sources."html-whitespace-sensitive-tag-names-1.0.1" sources."iconv-lite-0.4.24" @@ -71508,7 +71957,7 @@ in sources."longest-streak-1.0.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-5.1.1" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" @@ -72014,7 +72463,7 @@ in sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" sources."y18n-3.2.1" - sources."yallist-2.1.2" + sources."yallist-3.0.3" (sources."yargs-4.7.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -72063,7 +72512,7 @@ in sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@snyk/composer-lockfile-parser-1.0.3" - sources."@snyk/dep-graph-1.10.0" + sources."@snyk/dep-graph-1.12.0" sources."@snyk/gemfile-1.2.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/agent-base-4.2.0" @@ -72169,7 +72618,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" (sources."bl-1.2.2" // { @@ -72561,7 +73010,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.7" sources."growly-1.3.0" @@ -72577,7 +73026,12 @@ in ]; }) sources."has-yarn-2.1.0" - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.0.3" sources."http-errors-1.7.3" @@ -73049,7 +73503,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.208.0" // { + (sources."snyk-1.210.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -73058,7 +73512,7 @@ in sources."update-notifier-2.5.0" ]; }) - (sources."snyk-config-2.2.2" // { + (sources."snyk-config-2.2.3" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -73091,13 +73545,13 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-mvn-plugin-2.3.1" // { + (sources."snyk-mvn-plugin-2.3.3" // { dependencies = [ sources."tslib-1.9.3" ]; }) sources."snyk-nodejs-lockfile-parser-1.16.0" - (sources."snyk-nuget-plugin-1.11.2" // { + (sources."snyk-nuget-plugin-1.11.3" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -73254,7 +73708,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.0.1" + sources."type-1.0.3" sources."type-check-0.3.2" sources."type-fest-0.5.2" sources."typedarray-0.0.6" @@ -73378,10 +73832,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.39.0"; + version = "4.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.39.0.tgz"; - sha512 = "nrxFNSEKm4T1C/EsgOgN50skt//Pl4X7kgJC1MrlE47M292LSCVmMOC47iTGL0CGxbdwhKGgeThrJcw0bstEfA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz"; + sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -73434,7 +73888,7 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bluebird-3.5.5" @@ -73566,7 +74020,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -73777,7 +74231,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.1.2" // { + (sources."terser-4.1.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -73830,7 +74284,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" - (sources."webpack-sources-1.4.1" // { + (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -73970,7 +74424,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -74181,20 +74635,20 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-2.0.2.tgz"; - sha512 = "thdHJQpoOLDXZMJQ708JhAQvqceds3R79LIDmzAALLRV5h1O/Ezmj7en3L3b/s1ek0TLkYW9TJxs1ohDcjaU9Q=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.0.tgz"; + sha512 = "ktehmMXkJbM1gnlPxiiVbTYq0rQHLs+U/A/3pXNt0vIYjHgzsydooejwHZlmL7vxdfZAaSHilbkBDRgWW071rA=="; }; dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ascli-0.3.0" - sources."async-limiter-1.0.0" + sources."async-limiter-1.0.1" sources."balanced-match-1.0.0" sources."bencode-2.0.1" - sources."binary-search-1.3.5" - sources."bitfield-2.0.0" + sources."binary-search-1.3.6" + sources."bitfield-3.0.0" (sources."bittorrent-dht-9.0.1" // { dependencies = [ sources."debug-4.1.1" @@ -74204,12 +74658,11 @@ in sources."bittorrent-peerid-1.3.0" (sources."bittorrent-protocol-3.1.0" // { dependencies = [ - sources."bitfield-3.0.0" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.11.0" // { + (sources."bittorrent-tracker-9.12.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74217,13 +74670,8 @@ in ]; }) sources."blob-to-buffer-1.2.8" - (sources."block-stream2-1.1.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.2" - ]; - }) - sources."bn.js-4.11.8" + sources."block-stream2-2.0.0" + sources."bn.js-5.0.0" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" sources."buffer-alloc-1.2.0" @@ -74243,7 +74691,7 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-4.0.0" + sources."chunk-store-stream-4.1.0" sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" @@ -74254,13 +74702,13 @@ in dependencies = [ sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.0.0" + sources."create-torrent-4.2.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."defined-1.0.0" (sources."dlnacasts-0.1.0" // { dependencies = [ sources."mime-1.6.0" @@ -74273,13 +74721,7 @@ in sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" - (sources."filestream-4.1.3" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.2" - ]; - }) - sources."flatten-1.0.2" + sources."filestream-5.0.0" (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."thunky-1.0.3" @@ -74340,7 +74782,7 @@ in sources."thunky-1.0.3" ]; }) - sources."multistream-3.0.0" + sources."multistream-3.1.0" sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" @@ -74349,7 +74791,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."opn-6.0.0" + sources."open-6.4.0" sources."optjs-3.2.2" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-0.0.2" @@ -74402,21 +74844,23 @@ in ]; }) sources."simple-sha1-2.1.2" - (sources."simple-websocket-7.2.0" // { + (sources."simple-websocket-8.0.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.2" - sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.2" ]; }) sources."speedometer-1.1.0" sources."split-1.0.1" - sources."stream-to-blob-1.0.2" - sources."stream-to-blob-url-2.1.2" + sources."stream-to-blob-2.0.0" + (sources."stream-to-blob-url-2.1.2" // { + dependencies = [ + sources."stream-to-blob-1.0.2" + ]; + }) sources."stream-with-known-length-to-buffer-1.0.3" sources."string2compact-1.3.0" - (sources."string_decoder-1.1.1" // { + (sources."string_decoder-1.2.0" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -74442,7 +74886,6 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.4.0" // { dependencies = [ - sources."bitfield-3.0.0" sources."debug-4.1.1" sources."ms-2.1.2" ]; @@ -74450,9 +74893,9 @@ in sources."ut_pex-1.2.1" sources."utf-8-validate-5.0.2" sources."util-deprecate-1.0.2" - sources."videostream-3.2.0" + sources."videostream-3.2.1" sources."vlc-command-1.1.2" - (sources."webtorrent-0.105.3" // { + (sources."webtorrent-0.106.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74461,11 +74904,10 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.1.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -74766,7 +75208,7 @@ in sources."global-tunnel-ng-2.7.1" sources."globby-8.0.2" sources."got-8.3.2" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -74785,7 +75227,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.7.1" + (sources."hosted-git-info-2.8.2" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.0.3" + ]; + }) sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index e9062f33a407..a4a765d70ed0 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -184,13 +184,13 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "base64-js-1.3.0" = { + "base64-js-1.3.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; - sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -724,13 +724,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "graceful-fs-4.2.0" = { + "graceful-fs-4.2.1" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"; - sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz"; + sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="; }; }; "grunt-known-options-1.1.1" = { @@ -814,13 +814,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "hosted-git-info-2.7.1" = { + "hosted-git-info-2.8.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.7.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; - sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz"; + sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w=="; }; }; "http-signature-1.2.0" = { @@ -1183,6 +1183,15 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -2607,7 +2616,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -2649,11 +2658,11 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.0" + sources."graceful-fs-4.2.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.7.1" + sources."hosted-git-info-2.8.2" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -2668,6 +2677,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" + sources."lru-cache-5.1.1" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix new file mode 100644 index 000000000000..7a78573412fe --- /dev/null +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchzip, buildDunePackage, camomile, result }: + +buildDunePackage rec { + pname = "charInfo_width"; + version = "1.1.0"; + src = fetchzip { + url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; + sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; + }; + + propagatedBuildInputs = [ camomile result ]; + + meta = { + homepage = "https://bitbucket.org/zandoye/charinfo_width/"; + description = "Determine column width for a character"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 3d293b1a1ac4..22a4e6371a9c 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,22 +1,22 @@ { lib, fetchFromGitHub, buildDunePackage , ppx_fields_conv, ppx_sexp_conv -, base64, fieldslib, jsonm, re, stringext, uri +, base64, fieldslib, jsonm, re, stringext, uri-sexp }: buildDunePackage rec { pname = "cohttp"; - version = "2.0.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0nz9y7l5s9a2rq5sb1m5705h99wvf4dk3fhcgragwhy5nwwzcya8"; + sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d"; }; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; - propagatedBuildInputs = [ base64 fieldslib re stringext uri ]; + propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index dde86bf3e526..c7586ad23e42 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchzip, which, ocaml, findlib, camlp4 -, camlzip, camomile, extlib +{ stdenv, fetchzip, which, ocaml, findlib +, camlzip, extlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -then throw "javalib not supported for ocaml ${ocaml.version}" +if !stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "javalib is not available for OCaml ${ocaml.version}" else -let - pname = "javalib"; -in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "3.0"; + name = "ocaml${ocaml.version}-javalib-${version}"; + version = "3.1.1"; src = fetchzip { url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz"; - sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n"; + sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld"; }; - buildInputs = [ which ocaml findlib camlp4 ]; + buildInputs = [ which ocaml findlib ]; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; @@ -29,13 +26,13 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; - propagatedBuildInputs = [ camlzip camomile extlib ]; + propagatedBuildInputs = [ camlzip extlib ]; meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; homepage = https://javalib-team.github.io/javalib/; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 157beaac4bc7..22c4216a88ff 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -5,7 +5,9 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "logs is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 7eea297e3eeb..8286ee16619d 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lwt_log"; - version = "1.1.0"; + version = "1.1.1"; minimumOCamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = pname; rev = version; - sha256 = "1c58gkqfvyf2j11jwj2nh4iq999wj9xpnmr80hz9d0nk9fv333pi"; + sha256 = "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7"; }; propagatedBuildInputs = [ lwt ]; diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix new file mode 100644 index 000000000000..8ae1f4a9d47c --- /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/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 73f84886cc57..f4e3586b43c1 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -7,8 +7,8 @@ with lib; let param = if versionAtLeast ocaml.version "4.03" then { - version = "1.1.0"; - sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3"; + version = "1.2.0"; + sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8"; } else { version = "0.8.4"; sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh"; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 38050bc09a12..23940ef14995 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/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 4bc9b7f8629e..1287c9b80b57 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 4e46c1534d80..6c9e72f95d75 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/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 4b6bea31b40c..8c8d45192494 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,10 +1,14 @@ { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: +if stdenv.lib.versionOlder ocaml.version "4.02" +then throw "ocurl is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { - name = "ocurl-0.8.1"; + name = "ocurl-0.8.2"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "08ldzbx1k3mbjc01fmzsn86ll4paf331bcjss6iig6y6hgc9q3ry"; + sha256 = "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index ac853c94094b..caa2d01a4418 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,35 +1,22 @@ -{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, findlib, topkg -, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, rresult, nocrypto -, astring +{ lib, fetchFromGitHub, buildDunePackage +, cstruct, sexplib0, rresult, nocrypto, astring }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "otr is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-otr-${version}"; - version = "0.3.4"; +buildDunePackage rec { + pname = "otr"; + version = "0.3.6"; src = fetchFromGitHub { owner = "hannesm"; repo = "ocaml-otr"; rev = "${version}"; - sha256 = "0ixf0jvccmcbhk5mhzqakfzimvz200wkdkq3z2d0bdzyggslbdl4"; + sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ppx_tools ppx_sexp_conv ppx_cstruct ]; - propagatedBuildInputs = [ cstruct sexplib rresult nocrypto astring ]; - - buildPhase = "${topkg.run} build --tests true"; - - inherit (topkg) installPhase; + propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ]; doCheck = true; - checkPhase = "${topkg.run} test"; - - meta = with stdenv.lib; { - inherit (ocaml.meta) platforms; + meta = with lib; { homepage = https://github.com/hannesm/ocaml-otr; description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f4d1ef829bb4..cf3cd3272a8e 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/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 24cfbcf5b7af..d45298972cce 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,41 +1,22 @@ -{ stdenv, ocaml, findlib, ocamlbuild, fetchzip -, cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree +{ lib, fetchzip, buildDunePackage +, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "ppx_deriving is not available for OCaml ${ocaml.version}" -else - -let param = - if ocaml.version == "4.03.0" - then { - version = "4.1"; - sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"; - extraPropagatedBuildInputs = []; - } else { - version = "4.2.1"; - sha256 = "1yhhjnncbbb7fsif7qplndh01s1xd72dqm8f3jkgx9y4ariqqvf9"; - extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; -}; in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_deriving-${version}"; - inherit (param) version; +buildDunePackage rec { + pname = "ppx_deriving"; + version = "4.4"; src = fetchzip { url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - inherit (param) sha256; + sha256 = "0b2gaxlh54pcz3b4891yd143nx852mwggcy0yhq8g85dl3iisxzq"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; - propagatedBuildInputs = param.extraPropagatedBuildInputs ++ - [ ppx_tools result ]; - - createFindlibDestdir = true; + buildInputs = [ ppxfind cppo ounit ]; + propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ]; - installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; + doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; maintainers = [ maintainers.maurer ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 2aa74d751dbf..a8fb4af2a6bb 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -20,6 +20,9 @@ let param = { "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; + "4.08" = { + version = "5.3+4.08.0"; + sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; }; }."${ocaml.meta.branch}"; in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 363b774aaeba..03cadad7ff4d 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}"; - version = "5.1"; +buildDunePackage rec { + pname = "ppx_tools_versioned"; + version = "5.2.3"; src = fetchFromGitHub { - owner = "let-def"; - repo = "ppx_tools_versioned"; + owner = "ocaml-ppx"; + repo = pname; rev = version; - sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; + sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ]; - createFindlibDestdir = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/let-def/ppx_tools_versioned; description = "Tools for authors of syntactic tools (such as ppx rewriters)"; license = licenses.gpl2; diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix index 7d8c14c55130..3b61a6512635 100644 --- a/pkgs/development/ocaml-modules/ppxfind/default.nix +++ b/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -1,6 +1,6 @@ -{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }: +{ lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: -buildDunePackage rec { +buildDunePackage (rec { pname = "ppxfind"; version = "1.3"; src = fetchurl { @@ -18,4 +18,8 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; }; -} +} // ( +if lib.versions.majorMinor ocaml.version == "4.04" then { + dontStrip = true; +} else {} +)) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index e50deafd6e2d..644e1c98c481 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.6.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"; + sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 4137abf1ac7b..653f45325857 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-sedlex-${version}"; - version = "1.99.4"; + version = "1.99.5"; src = fetchzip { - url = "https://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz"; - sha256 = "1b7nqxyfcz8i7m4b8zil2rn6ygh2czy26f9v64xnxn8r0hy9sh1m"; + url = "https://github.com/ocaml-community/sedlex/archive/fb84e1766fc4b29e79ec40029ffee5cdb37b392f.tar.gz"; + sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n"; }; buildInputs = [ ocaml findlib ppx_tools_versioned ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = https://github.com/alainfrisch/sedlex; + homepage = https://github.com/ocaml-community/sedlex; description = "An OCaml lexer generator for Unicode"; license = stdenv.lib.licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 011acf01839e..e17e99cdc67c 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit -, re, sexplib0, stringext +{ lib, fetchurl, buildDunePackage, ounit +, re, stringext }: buildDunePackage rec { pname = "uri"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi"; + sha256 = "1yhrgm3hbn0hh4jdmcrvxinazgg8vrm0vn425sg8ggzblvxk9cwg"; }; buildInputs = [ ounit ]; - propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ]; + propagatedBuildInputs = [ re stringext ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix new file mode 100644 index 000000000000..c6f979e5a3e7 --- /dev/null +++ b/pkgs/development/ocaml-modules/uri/sexp.nix @@ -0,0 +1,13 @@ +{ lib, ocaml, buildDunePackage, uri, ounit, ppx_sexp_conv, sexplib0 }: + +if !lib.versionAtLeast ocaml.version "4.04" +then throw "uri-sexp is not available for OCaml ${ocaml.version}" +else + +buildDunePackage { + pname = "uri-sexp"; + inherit (uri) version src doCheck meta; + + buildInputs = [ ounit ]; + propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ]; +} diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 125b117bcd83..ab6a7d8f5235 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: stdenv.mkDerivation rec { - version = "0.9.6"; + version = "0.9.7"; name = "uuidm-${version}"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; + sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; }; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index cffbd77351c2..9980b3f10830 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -11,11 +11,13 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.1"; + version = "0.9.3"; webpage = "https://erratique.ch/software/${pname}"; in -assert versionAtLeast ocaml.version "4.02.0"; +if !versionAtLeast ocaml.version "4.03" +then throw "vg is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp"; + sha256 = "0jj5hrqxdb6yyplnz0r7am4mbjzgcn876qp7sqs2x93a97fk6lwd"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1d331090a44f..cb90c2005473 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/perl-modules/DBD-Oracle/default.nix b/pkgs/development/perl-modules/DBD-Oracle/default.nix index a7ec1e2d1826..0658dd4248dd 100644 --- a/pkgs/development/perl-modules/DBD-Oracle/default.nix +++ b/pkgs/development/perl-modules/DBD-Oracle/default.nix @@ -1,16 +1,20 @@ -{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }: +{ stdenv, fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }: buildPerlPackage { pname = "DBD-Oracle"; - version = "1.76"; + version = "1.80"; src = fetchurl { url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz; - sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3"; + sha256 = "1wym2kc8b31qa1zb0dgyy3w4iqlk1faw36gy9hkpj895qr1pznxn"; }; - ORACLE_HOME = "${oracle-instantclient}/lib"; + ORACLE_HOME = "${oracle-instantclient.lib}/lib"; buildInputs = [ TestNoWarnings oracle-instantclient ] ; propagatedBuildInputs = [ DBI ]; + + postBuild = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath "${oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle + ''; } diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index ed89c26943f8..b0c81a62e337 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -1,33 +1,29 @@ -{ pkgs -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi +, cryptography , invoke +, mock , paramiko -, cryptography , pytest -, mock , pytest-relaxed }: buildPythonPackage rec { pname = "fabric"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068"; + sha256 = "19nzdibjfndzcwvby20p59igqwyzw7skrb45v2mxqsjma5yjv114"; }; propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; - # ignore subprocess main errors (1) due to hardcoded /bin/bash checkPhase = '' - rm tests/main.py pytest tests ''; - meta = with pkgs.lib; { + meta = with lib; { description = "Pythonic remote execution"; homepage = https://www.fabfile.org/; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 18c42dbc126b..b1b71b395724 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "1qjwqshcrfsa2a0j9bk0w01y857idzic1bj202p9cpar3xsjjw69"; + sha256 = "126gpx6zj7fpx87v1qgicpfdahmmkqqmd2a8abllq0jlckrmjsyh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix new file mode 100644 index 000000000000..77d7cf653d19 --- /dev/null +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -0,0 +1,35 @@ +{ lib, isPy3k, fetchFromGitHub, buildPythonPackage +, atpublic }: + +buildPythonPackage rec { + pname = "aiosmtpd"; + version = "1.2.1"; + disabled = !isPy3k; + + # Release not published to Pypi + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = version; + sha256 = "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7"; + }; + + 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/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index e21445ab3ec2..fab3c0df58c5 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchFromGitHub , buildPythonPackage , pycrypto , paramiko @@ -18,11 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.2"; + version = "2.8.4"; - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1e5ba829ca0602c55b33da399b06f99b135a34014b661d1c36d8892a1e2d3730"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible"; + rev = "v${version}"; + sha256 = "1fp7zz8awfv70nn8i6x0ggx4472377hm7787x16qv2kz4nb069ki"; }; prePatch = '' diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix new file mode 100644 index 000000000000..a71ffd853675 --- /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/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix new file mode 100644 index 000000000000..6657b41cc784 --- /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/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index 8fe664f42310..d2a72461b177 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "authres"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0bxclx021zn4hhrpaw5fl61bhnf17yqjd0pvwxqfqwdkxdjpx37b"; + sha256 = "1dr5zpqnb54h4f5ax8334l1dcp8j9083d7v4vdi1xqkwmnavklck"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d93703c00c41..a2d19e9ee3c5 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-cli-core/default.nix b/pkgs/development/python-modules/azure-cli-core/default.nix index 3455053ff21a..f535a2431785 100644 --- a/pkgs/development/python-modules/azure-cli-core/default.nix +++ b/pkgs/development/python-modules/azure-cli-core/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "azure-cli-core"; - version = "2.0.69"; + version = "2.0.71"; src = fetchPypi { inherit pname version; - sha256 = "797c4fab2285aa2ac316daf692c1e8f6b14186c059805e8a57332b4d83d7bb23"; + sha256 = "01pqdh16l2c9a6b1az9galmm1szvhg7fyf9shq872wanw1xx88dj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index ad730774c5e5..6384df020e04 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.7.0"; + version = "4.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04z9f0nd2nh5miw81qahqrrz998l4yd328qcyx7bxg42a5f5v5jp"; + sha256 = "0h2lnigmh2arq0ppwjk8h9rqxplj6s7h7qxwyv7wirk0ydx6cfd9"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 3689f85f2250..c8574680c172 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-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 0f4c6b101e04..b8b39292e5f6 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "4.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kffay8hr8h3hf78wb1kisvffpwxsxy6lixbgh9dbv0p781sgyh6"; + sha256 = "1kxd30s2axn3g4qx3v7q3d5l744a29xlfk3q06ra0rqm1p6prvgv"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 823b9ab8c6a4..a86acbb23ac2 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,16 +14,16 @@ }: buildPythonPackage rec { - version = "19.1.1"; + version = "19.7.3"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a"; + sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; }; - buildInputs = [ cython cmake ]; + nativeBuildInputs = [ cmake cython ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; 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 000000000000..cf35243f2b08 --- /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/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 6a5e6f82b7c3..5b5655553144 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.55.0"; + version = "3.56.0"; src = fetchPypi { inherit pname version; - sha256 = "0l3i0ayzykrsraqf87z4h39qm3kxyfwrm09n81gnkvsn2126izsd"; + sha256 = "1d1xv7b4s68yfa3snnvcjldj0q7v1izpyvqkv2c1k0w73hl657b5"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 64510ee5b640..807dafab4369 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.6.4"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 7459fc6f981b..c19fc280c7f6 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -3,7 +3,7 @@ sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, - glibcLocales }: + git, glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg"; + sha256 = "141ad2g1j5y0n5cdnd18m55ss0gqjlz5ky85rb6qfn73dgw42vmz"; }; propagatedBuildInputs = [ @@ -37,7 +37,6 @@ let twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate dateutil @@ -65,6 +64,7 @@ let buildbot-worker buildbot-pkg parameterized + git glibcLocales ]; @@ -95,7 +95,7 @@ let meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 8de1572b48c0..dababe48e996 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5"; + sha256 = "0na336jwibgbix8fr4jki1gqys44kkm0a8q32llcr2z08igs4mvy"; }; postPatch = '' @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index e03524ea5ada..e31085a24988 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,23 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }: +{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg, mock }: { www = buildPythonPackage rec { - pname = "buildbot_www"; + pname = "buildbot-www"; inherit (buildbot-pkg) version; - # NOTE: wheel is used due to buildbot circular dependency - format = "wheel"; - src = fetchPypi { - inherit pname version format; - python = "py3"; - sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w"; + inherit pname version; + sha256 = "0g3m5z8yska245r1x9n85b4br8b63i4zca2qn3qspf62b1wzmxmd"; }; + buildInputs = [ buildbot buildbot-pkg mock ]; + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot UI"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -28,16 +26,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra"; + sha256 = "0p7az9mb09c4bl0j37w28wflzygq9vy8rjbbnhlfbs6py6mjdagr"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -48,16 +46,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll"; + sha256 = "0ba0a7q7ii7sipvifxs9ldkcs4b975skndarmirbphc797993hj1"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -68,16 +66,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj"; + sha256 = "0dvchhjzmfbbrxqm8dlmwck22z99pgnflxk3cyn0wbb1qskhd9cv"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ nand0p lopsided98 ]; license = licenses.gpl2; }; }; @@ -88,16 +86,16 @@ src = fetchPypi { inherit pname version; - sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28"; + sha256 = "0w9p3y89rqsmqiacwj2avir42r0xjr2yri14v3ay6yar5391r8wa"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + buildInputs = [ buildbot-pkg ]; checkInputs = [ buildbot ]; meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 0ca2570496a0..8cfc56678c02 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52"; + sha256 = "04dk1jg0yq0rcm7j7pn7l1pqqjhiyvwppnhc1b7106sx2cdj2yb2"; }; propagatedBuildInputs = [ twisted future ]; @@ -22,7 +22,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ nand0p ryansydnor ]; + maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; license = licenses.gpl2; }; }) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index aa3aa8b9c02b..653296a927e8 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi -, tzlocal, requests, vobject, lxml }: +, tzlocal, requests, vobject, lxml, nose }: buildPythonPackage rec { pname = "caldav"; version = "0.6.1"; - propagatedBuildInputs = [ tzlocal requests vobject lxml ]; + propagatedBuildInputs = [ tzlocal requests vobject lxml nose ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 91e00ed7e43c..2bd22ebf0d9b 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/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 755f92117469..3b49289c2e48 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 96602c624a47..8c55c3ac8bbb 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast , more-itertools, six, setuptools_scm, setuptools-scm-git-archive , pytest, pytestcov, portend, pytest-testmon, pytest-mock , backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket , backports_functools_lru_cache }: +let inherit (stdenv) lib; in + buildPythonPackage rec { pname = "cheroot"; - version = "6.5.5"; + version = "6.5.6"; src = fetchPypi { inherit pname version; - sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; + sha256 = "b824f9961eb447809badeb051820a05770354e2f9ae5c355eecc21f22633c217"; }; + patches = [ ./tests.patch ]; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; @@ -20,14 +24,17 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; # Disable doctest plugin because times out + # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails + # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 checkPhase = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" + ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} + pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; license = licenses.mit; diff --git a/pkgs/development/python-modules/cheroot/tests.patch b/pkgs/development/python-modules/cheroot/tests.patch new file mode 100644 index 000000000000..3de48a5a4684 --- /dev/null +++ b/pkgs/development/python-modules/cheroot/tests.patch @@ -0,0 +1,45 @@ +diff --git a/cheroot/test/test_ssl.py b/cheroot/test/test_ssl.py +index fe8a0a0..92a77c1 100644 +--- a/cheroot/test/test_ssl.py ++++ b/cheroot/test/test_ssl.py +@@ -316,11 +316,9 @@ def test_tls_client_auth( + expected_ssl_errors = ( + requests.exceptions.SSLError, + OpenSSL.SSL.Error, +- ) if PY34 else ( +- requests.exceptions.SSLError, ++ requests.exceptions.ConnectionError, + ) +- if IS_WINDOWS: +- expected_ssl_errors += requests.exceptions.ConnectionError, ++ + with pytest.raises(expected_ssl_errors) as ssl_err: + make_https_request() + +@@ -335,7 +333,7 @@ def test_tls_client_auth( + except AttributeError: + if PY34: + pytest.xfail('OpenSSL behaves wierdly under Python 3.4') +- elif six.PY3 and IS_WINDOWS: ++ elif six.PY3: + err_text = str(ssl_err.value) + else: + raise +@@ -348,8 +346,7 @@ def test_tls_client_auth( + if IS_MACOS and IS_PYPY and adapter_type == 'pyopenssl': + expected_substrings = ('tlsv1 alert unknown ca', ) + if ( +- IS_WINDOWS +- and tls_verify_mode in ( ++ tls_verify_mode in ( + ssl.CERT_REQUIRED, + ssl.CERT_OPTIONAL, + ) +@@ -361,6 +358,7 @@ def test_tls_client_auth( + "SysCallError(10054, 'WSAECONNRESET')", + "('Connection aborted.', " + 'OSError("(10054, \'WSAECONNRESET\')"))', ++ 'OSError("(104, \'ECONNRESET\')"))', + ) + assert any(e in err_text for e in expected_substrings) + diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index a7ae70a43795..3aece4020e6c 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs"; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index daf522fe6534..eeee7370b7e3 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/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a71d048b47bb..7d78abd075de 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.15"; + version = "0.9.16"; src = fetchPypi { inherit pname version; - sha256 = "0k3y3czpabw173vhqg523l2r804jj08986wlz6vyh224zr0ngggw"; + sha256 = "0ggvh38mc1kkrlqdicjz5a16j5v6f6z0nwmcvv8i3y5gaffkfy2b"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix new file mode 100644 index 000000000000..905b274a0552 --- /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/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix new file mode 100644 index 000000000000..01f5bb8a7e53 --- /dev/null +++ b/pkgs/development/python-modules/crc16/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "crc16"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15nkx0pa4lskwin84flpk8fsw3jqg6wic6v3s83syjqg76h6my61"; + }; + + meta = with stdenv.lib; { + homepage = "https://code.google.com/archive/p/pycrc16/"; + description = "Python library for calculating CRC16"; + license = licenses.lgpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index aaaad292df04..d0f3a7dc7623 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "6.0.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "168xi92pfk80n2k47qc5zim7jai3kcmj3j157fynz9c8dfw4sbn4"; + sha256 = "0d6liaavgqks772rqam53qha3yk6dfw24i0pj3izxvvawzhlp10z"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 5708bf12d6bc..77814ec1191c 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.1.3"; + version = "7.2.2"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "4f26b7418e2796112f8b36338a2f9a7c07dd08df53d857e3478bb53f61dd52e4"; + sha256 = "1kp6fgyln0jkdbjm20h6rhybsmvqjj847frhsndyfvkf38m32ss0"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index cd38c8f137c5..ba8c06f73f2e 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 000000000000..ee7c89d8167d --- /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/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 600fe8887514..e01433d90c5c 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.6"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "68071e5ae7cd7e9da6c7dffd750922be4825c7c3a6780d29314076009cc39c35"; + sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index da082643e0fd..4a892ddb7058 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "1.28.1"; + version = "2.3.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "12n487qn66jkgq4nd3vgyc9hfqw4i7zwr4dyybsqm4xmgs5kzn1v"; + sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; 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 000000000000..1eed9578a8a2 --- /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 000000000000..d9734ff4a220 --- /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-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix new file mode 100644 index 000000000000..91cea9b00598 --- /dev/null +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +, django-allauth, mailmanclient, django, mock +}: + +buildPythonPackage rec { + pname = "django-mailman3"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v6c1jhcc212wc2xa314irfcchl05r7nysrcy63dcaan958kmnnx"; + }; + + propagatedBuildInputs = [ + django-gravatar2 django_compressor django-allauth mailmanclient + ]; + checkInputs = [ django mock ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test + ''; + + meta = with stdenv.lib; { + description = "Django library for Mailman UIs"; + homepage = https://gitlab.com/mailman/django-mailman3; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 3a33960faf88..443f793f37b4 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-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 71ec20faed8b..af3404b2f880 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "0.2.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1bwpgmkh32d7a5dgppin9m0mnh8a33ccl5ksnpw5vjp4lal3xq73"; + sha256 = "087mspmx74qbcknpbksl66rsyin0dc5aglhjmmpk999pl2wvdfk0"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 479e66289e64..4efd2002b1fd 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -2,18 +2,21 @@ , buildPythonPackage , fetchPypi , pytz +, pythonOlder , six }: buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.4"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "02mrs7aapabapfh7h7n71s8r7zxkmad3yk4rdyfwcf0x36326rsr"; + sha256 = "0zcn1b0lp9dg6xvz8p8v1hrrgqj71izqalqz2dp1nz5rbj3s34x2"; }; + disabled = pythonOlder "3.5"; + doCheck = false; propagatedBuildInputs = [ pytz six ]; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 6bb2b1d43f15..13ba5ef7964e 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "django-silk"; - version = "3.0.2"; + version = "3.0.3"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "1fbaafc2gx01gscdalp6hj6bz4b0cmq59lgmvsydw7jkds4mps7c"; + sha256 = "0j1r88zv7fvmlnrzr2h65czzdcpvl7n847ra1pfc52bfa4lf8b9j"; }; # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index c200b6959b64..d9b3bb93264e 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: +{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; @@ -10,9 +10,15 @@ buildPythonPackage { ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; - setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ]; + setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS"; patches = [ ./build-cores.patch ]; - checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "more-itertools<6.0.0" "more-itertools" \ + --replace "pytest==3.8" "pytest" + ''; + + checkInputs = [ pytest more-itertools ]; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 804267268d78..deeb8ce06420 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -11,6 +11,7 @@ , fetchurl , dbus , xvfb_run +, wrapGAppsHook # , fetchPypi }: @@ -32,8 +33,9 @@ buildPythonPackage rec { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb_run ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; + strictDeps = false; # issue 56943 checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 94c67afe164d..7288dee77631 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.3.5"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lda2a4nxxh9wp727vhn31rl5v7y9fxkscdjawg7gzj50xf76xj0"; + sha256 = "1775cz6lipb43hmjll77m2pxh72pikng74lpg30v9n1b66s78959"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix new file mode 100644 index 000000000000..0e5db1de3e92 --- /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/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 090f9dd82601..e9e6316bb61e 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/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix new file mode 100644 index 000000000000..070e69970106 --- /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/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix new file mode 100644 index 000000000000..0a2e8dff1b73 --- /dev/null +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -0,0 +1,14 @@ +{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }: + +buildPythonPackage rec { + pname = "flufl.bounce"; + version = "3.0"; + + buildInputs = [ nose2 ]; + propagatedBuildInputs = [ atpublic zope_interface ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2"; + }; +} diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix new file mode 100644 index 000000000000..6e8d77bf4f81 --- /dev/null +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.i18n"; + version = "2.0.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1csgds59nx0ann9v2alqr69lakp1cnc1ikmbgn96l6n23js7c2ah"; + }; +} diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix new file mode 100644 index 000000000000..1be5d9a7c4c2 --- /dev/null +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, atpublic }: + +buildPythonPackage rec { + pname = "flufl.lock"; + version = "3.2"; + + propagatedBuildInputs = [ atpublic ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8"; + }; +} diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index c8eca2ac60cb..c89bfbfd5244 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/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix new file mode 100644 index 000000000000..ed4f950e3631 --- /dev/null +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: + +buildPythonPackage rec { + pname = "FoxDot"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "147n2c9rwmrby8rr6xfxlh7mfm12lqk2a7v1gxlzhq1i2jj1j5h4"; + }; + + propagatedBuildInputs = [ tkinter supercollider ]; + + # Requires a running SuperCollider instance + doCheck = false; + + meta = with stdenv.lib; { + description = "Live coding music with SuperCollider"; + homepage = https://foxdot.org/; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix new file mode 100644 index 000000000000..8f4b9cf8c890 --- /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/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index f6fa41e33f83..d7a9fd2a0b08 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.5.1"; + version = "5.6"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ci6xrj4g01a97nymxpv9nj820nlmgzc4ybaz9k46i6bnxzpax7s"; + sha256 = "1k4vr5rfa62yafwpmb4827n50pwb79if0vhg1y4yqbb0bv20jxbd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index fd36c7590b5e..0220fd1aeb9d 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.12"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "0vdbh0ykmjsvq4vb3hrx5327q9ccl1jhbjca59lsr0v0ghwb0grz"; + sha256 = "1hxii7g4fn301vr8wg53jc1jkvbjlbaz1fbpgpn4362xcwzk73wi"; }; # No tests diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 91b8d455cdef..a41cdada4be7 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "geojson"; - version = "2.4.1"; + version = "2.5.0"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "12k4g993qqgrhq2mgy5k8rhm5a2s2hbn769rs5fwbc5lwv4bbgxj"; + sha256 = "1filqm050ixy53kdv81bd4n80vjvfapnmzizy7jg8a6pilv17gfc"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 78986ec7d306..6c9df6b571b0 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -3,20 +3,19 @@ , fetchPypi , isPy3k , gevent +, gunicorn }: buildPythonPackage rec { pname = "gevent-websocket"; version = "0.10.1"; - # SyntaxError in tests. - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; }; - propagatedBuildInputs = [ gevent ]; + propagatedBuildInputs = [ gevent gunicorn ]; meta = with stdenv.lib; { homepage = https://www.gitlab.com/noppo/gevent-websocket; 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 000000000000..86d4decc6d8f --- /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/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 60a6caace5ec..e81f82740869 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/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index f49ebc3fb5d9..ecdb76173fa1 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -48,7 +48,7 @@ else buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 9355db763dcc..cb6e47a60026 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.22.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab"; + sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 5c85dd343578..65e9e3fb5995 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz"; + sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5"; }; nativeBuildInputs = [ cython pkgconfig ] diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index a2597b2e6e77..2a20d6104853 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 c64013624a44..00c9b86c5eba 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1chmxhjbs39paaxlfsdrr13v4zvv94ijvhxasdphxlxkqlycbm4a"; + sha256 = "0n13vb3v50vr04vrnql2w00gri0gcf08i0pr0q2p4w8scbsw7kjk"; }; # It's used to locate headers 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 000000000000..d5492b3b6414 --- /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/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index d2839d32b0a9..a07dd9e727cf 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw"; + sha256 = "1nn7gad0rvy492acpyhkrp01zsk86acf34qhsvq4xmm6x39788n5"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index f31b9013d94b..18a2d570497d 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 714a5ce10147..e6c4086c386c 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.1"; + version = "3.0.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "0iynzxrjmdkrriw4pcf8as8afckvmq4jk457lxg52wh29l39wb30"; + sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix new file mode 100644 index 000000000000..44944c03500b --- /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/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index f682e11bfed1..112e680ea9a5 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = https://jupyter.org/; license = licenses.bsd3; - maintainers = with maintainers; [ fridh globin ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix new file mode 100644 index 000000000000..7d83d2c4338f --- /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/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 74703ff5c9df..9942168607e6 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { homepage = http://liw.fi/larch/; description = "Python B-tree library"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 527c99a15895..590ca9880234 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.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "05na4izlq34bmij8awmfn58liinmsh8qzh6948knk5ms5nsh50cp"; + sha256 = "1d8dbn8wwqqvvjyhai813sqkx6366d8jkjq0gkyh51692pflmwrp"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix new file mode 100644 index 000000000000..759c9689bc93 --- /dev/null +++ b/pkgs/development/python-modules/lazr/config.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, lazr_delegates }: + +buildPythonPackage rec { + pname = "lazr.config"; + version = "2.2.1"; + + propagatedBuildInputs = [ lazr_delegates ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn"; + }; +} diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix new file mode 100644 index 000000000000..40e2e47d517d --- /dev/null +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchPypi, nose, zope_interface }: + +buildPythonPackage rec { + pname = "lazr.delegates"; + version = "2.0.4"; + + propagatedBuildInputs = [ nose zope_interface ]; + + doCheck = false; # cannot import name 'ClassType' from 'types' + + src = fetchPypi { + inherit pname version; + sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + }; +} diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index e6a493f7b641..3853d796fcd6 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j"; + sha256 = "1dj8jh5ccjv7qbydf49cw17py7z3jjkaxk4jj2gx6mq2f4w304wg"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index b707b3430568..09177f16bc6a 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "libkeepass"; - version = "0.3.0"; + version = "0.3.1.post1"; src = fetchPypi { inherit pname version; - sha256 = "3ed79ea786f7020b14b83c082612ed8fbcc6f8edf65e1697705837ab9e40e9d7"; + sha256 = "0pwg7n9xqcjia1qmz6g48h5s31slh3mxmcqag73gq4zhl4xb6bai"; }; propagatedBuildInputs = [ lxml pycryptodome colorama ]; 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 000000000000..6d52e5f5c1f5 --- /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 8926a7383a77..4f090d73e60f 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.96"; + version = "0.97"; src = fetchPypi { inherit pname version; - sha256 = "0wpahad7wac34r1hxa1jhk0bsll39n7667cljyr5251kj12ksfgr"; + sha256 = "0jw3n14x6qg5wps2w4qkqf4pyan949h1s2nbkrz2qh7xwnnp2g8p"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix new file mode 100644 index 000000000000..95e9e4fdd3e0 --- /dev/null +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, httplib2 }: + +buildPythonPackage rec { + pname = "mailmanclient"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xsrzdrsmfhnxv68zwm1g6awk7in08k6yhkyd27ipn0mq1wjm5jd"; + }; + + propagatedBuildInputs = [ six httplib2 ]; + + meta = with stdenv.lib; { + homepage = "http://www.gnu.org/software/mailman/"; + description = "REST client for driving Mailman 3"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ peti globin ]; + }; +} diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index a9f37b52c1b4..2a0544cf6d8f 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/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index 6a99913c6c8b..e770eedbfc31 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0yq1bcsjzsz7yz4rp69izsdn47rvkld4wki2xmapp8gg2s9i8709"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ six ]; checkPhase = "py.test tests.py"; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 8040b80f88b8..a45a24b7a2a9 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.5.0"; + version = "5.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0x8xblc3zybp7jw9cscpm4r5pmmilj9l4yi1rkxyf0y80kchlxq4"; + sha256 = "1k2yf2yglzx65gcv2bqql6w6lmgyp3f1jz4ddq9vylf09a8j7fga"; }; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/cprogrammer1994/ModernGL; + homepage = https://github.com/moderngl/moderngl; description = "High performance rendering for Python 3"; license = licenses.mit; platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index bdfb9e2efcae..6f11b01481b0 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moretools"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "f531cc79b7cd0c4aab590d5d4d0291f7cf6f083398be1dd523224b3385b732f4"; + sha256 = "1rvd9kl0163gm5kqwsb2m44x87sp72k5pirvcmhy2ffix4pzadqp"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index be6a4c7c8a5d..8885401ae5f1 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -20,16 +20,12 @@ buildPythonPackage rec { sha256 = "b13c0b8459d6fb0688f9a4e70feeec43fa2cca05b727fc01156789596e083bb1"; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - buildInputs = [ subunit testrepository testtools six ]; propagatedBuildInputs = [ pbr fixtures ]; - # FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags - # ValueError: cannot use LOCALE flag with a str pattern - doCheck = !isPy36; + # Disabling as several tests depdencies are missing: + # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt + doCheck = false; meta = with stdenv.lib; { description = "Mock object framework for Python"; diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix index 4a3ff00f8352..39ad7c472153 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/development/python-modules/mps-youtube/default.nix @@ -1,20 +1,17 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , pafy }: buildPythonPackage rec { - name = "mps-youtube-${version}"; - version = "0.2.7.1"; + pname = "mps-youtube"; + version = "0.2.8"; disabled = (!isPy3k); src = fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; rev = "v${version}"; - sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; + sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; }; propagatedBuildInputs = [ pafy ]; @@ -29,11 +26,10 @@ buildPythonPackage rec { export XDG_CONFIG_HOME=$(pwd)/check-phase ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal based YouTube player and downloader"; homepage = https://github.com/np1/mps-youtube; license = licenses.gpl3; maintainers = with maintainers; [ odi ]; }; - } diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index cd9ca9451b8b..f5ae020c71c6 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -1,25 +1,33 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pkgs +{ stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 +, mpv }: buildPythonPackage rec { pname = "mpv"; - version = "0.1"; + version = "0.3.9"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw"; + src = fetchFromGitHub { + owner = "jaseg"; + repo = "python-mpv"; + rev = "v${version}"; + sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q"; }; - buildInputs = [ pkgs.mpv ]; - patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so"; + buildInputs = [ mpv ]; + + postPatch = '' + substituteInPlace mpv.py \ + --replace "sofile = ctypes.util.find_library('mpv')" \ + 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + ''; + + # tests impure, will error if it can't load libmpv.so + checkPhase = "${python.interpreter} -c 'import mpv'"; meta = with stdenv.lib; { description = "A python interface to the mpv media player"; homepage = "https://github.com/jaseg/python-mpv"; license = licenses.agpl3; }; - } diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index c43c45df600c..488f6f9a7bb5 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.4.2.post1"; + version = "1.4.4"; nativeBuildInputs = [ mysql.connector-c @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7"; + sha256 = "1379hab7spjp9v5fypqgy0b8vr8vnalxahm9hcsxvj2xbb2pqwww"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 91e6e5f0fd6a..e8d2c209eb58 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c01ec7d0bc093420a45d8b5ea8261a84ba12bff0cabf47cb15b716c5ea8f3d23"; + sha256 = "1kc2phcz22r7vim3hmq0vrp2zqxl6v49hq40jmp4p81pdvgh5c6b"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 11552a7c342e..69828b2b18ff 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Converting Jupyter Notebooks"; homepage = https://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index c0485eef4d3d..79900197133a 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; inherit (src.meta) homepage; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ globin ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 6e9b5ce61cd2..ef6d51cb19a4 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.4"; + version = "3.4.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1dbwwhsbsp31bvvksq7kyrfs6s27lp8wgwqs4qf6hajkz2jj0k3n"; + sha256 = "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y"; }; propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 34a81a66ec9d..1c38918c1477 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - version = "0.6.1"; + version = "0.7.0"; pname = "node-semver"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; + sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 556fcfb31f5f..431d4bb4d563 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = https://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index d0ce48774c3a..026643266852 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "1sz9ls6a7h056nc5q76w4xl43sr1h9in2f23qwkxazcazr3zpi3p"; + sha256 = "1kav0jlgdpgwx4am09ja7cr8s1g8h8a7j8mcfy1cfjr8fficg2g4"; }; propagatedBuildInputs = [ jsonschema pyyaml six ] diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 7e6207697595..def8ecb8458e 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/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 82d9107bfdde..daaf845cdf0b 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "parsel"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8"; + sha256 = "08v76s6s4li7asnyz8a7gbp9vz522rv5apranyv76mb0lhmjd92d"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index c797c57c40f9..0d6edcbd3f48 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -5,12 +5,11 @@ buildPythonPackage rec { pname = "pdfkit"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1p1m6gp51ql3wzjs2iwds8sc3hg1i48yysii9inrky6qc3s6q5vf"; + sha256 = "1lcc1njpjd2zadbljqsnkrvamschl6j099p4giz1jd6mg1ds67gg"; }; # tests are not distributed diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index bfc9f5a1f7c6..afb805c0b7eb 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.6"; + version = "3.10.0"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1pgmsd7v73d0gqxsa4wnm9s3lyffw46wvvkqn25xgh4v8z869fg2"; + sha256 = "166h7vy3j0v4h2jnyiwpmpqgmn95381a5ra40ghghy0fqd9v49g8"; }; 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 000000000000..20da40560e20 --- /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 000000000000..50220bb3993d --- /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/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index b86706bef081..b9c4a62f0de0 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.15"; + version = "8.10.16"; src = fetchPypi { inherit pname version; - sha256 = "617b9127dc6fd29765ca122915d3b603131446a76a587deed0b92c8db53963fe"; + sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b"; }; meta = { diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix new file mode 100644 index 000000000000..c2662915b12d --- /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 f5be6ec308e9..5cd6c1068269 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.1.0"; src = fetchPypi { inherit pname version; - sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx"; + sha256 = "166rscpr9xbs3pwd61mivhlm1gv3chkgpk2cy0fpb86axa7z4cwk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index e611e2ea5b10..7054485f3021 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/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index ba5ede1ad771..adcb71104676 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "A pure Python OTR implementation"; homepage = "http://python-otr.pentabarf.de/"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 26dcd244c510..b6d2eb3bda9d 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 ed44043eb9a9..7b5377cc15aa 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.2"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c"; + sha256 = "1y6gd6nq8mfyjxknrgdryvn1bj5arvwaz2r00h41g054lfg3iki1"; }; 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 be409e348ea3..a4e3cada1fc1 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 4d8d0589edae..a322518979a3 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/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 80b17034aa03..163477a27251 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -14,10 +14,8 @@ in buildPythonPackage rec { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool libcangjie sqlite cython - ]; + nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ]; + buildInputs = [ libcangjie sqlite ]; preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index ef5996f32c78..ead5a24bbdbe 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "3.2.2"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "17l7nlnpqjgnrw4hzs52lbzmdxa1vm3v51mm33l4c43c1md5m2ns"; + sha256 = "1fhh3djb6chs23j46hwzm1rd6hypkl517vjmmg44rxnslkcl7dhb"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 93ea1e6734be..066e849f0aab 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -38,7 +38,10 @@ buildPythonPackage rec { checkPhase = '' pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ - and not test_keyfunction_bogus_return" + and not test_keyfunction_bogus_return \ + and not test_libcurl_ssl_gnutls \ + and not test_libcurl_ssl_nss \ + and not test_libcurl_ssl_openssl" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pydot_ng/default.nix b/pkgs/development/python-modules/pydot_ng/default.nix index ba754e9959bf..d48ddaccd585 100644 --- a/pkgs/development/python-modules/pydot_ng/default.nix +++ b/pkgs/development/python-modules/pydot_ng/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 +, graphviz +, mock , pyparsing , pytest , unittest2 -, pkgs }: buildPythonPackage rec { @@ -16,19 +15,22 @@ buildPythonPackage rec { sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5"; }; - buildInputs = [ pytest unittest2 ]; - propagatedBuildInputs = [ pkgs.graphviz pyparsing ]; + propagatedBuildInputs = [ graphviz pyparsing ]; + + checkInputs = [ + graphviz + mock + pytest + ] ++ lib.optionals isPy27 [ unittest2]; checkPhase = '' - mkdir test/my_tests - py.test test + pytest ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pypi.python.org/pypi/pydot-ng"; description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot"; license = licenses.mit; - maintainers = [ maintainers.bcdarwin ]; + maintainers = with maintainers; [ bcdarwin jonringer ]; }; - } diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix new file mode 100644 index 000000000000..26c36e70d0cc --- /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 aae37e0282ff..e303f3415d7f 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.4.1"; + version = "1.4.2"; pname = "pyglet"; src = fetchPypi { inherit pname version; - sha256 = "132p484g53b9p8g3q2bcnhzyg9x37hsm4rhpscl4llngjw5fbk22"; + sha256 = "1dxxrl4nc7xh3aai1clgzvk48bvd35r7ksirsddz0mwhx7jmm8px"; }; # 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 0ff269c98740..26a91a313ee4 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/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 0770520ceee9..850e64000738 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -1,8 +1,10 @@ -{ pyqt4, - stdenv, callPackage, fetchurl, cmake, automoc4, sip }: +{ pyqt4, openssl_1_0_2 +, stdenv, callPackage, fetchurl, cmake, automoc4, sip }: let - kdelibs = callPackage ./kdelibs.nix {}; + kdelibs = callPackage ./kdelibs.nix { + openssl = openssl_1_0_2; + }; sip4_19_3 = sip.overrideAttrs (oldAttrs: rec { src = fetchurl { url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz"; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index c5e148d1500a..073a2e624a5f 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -2,7 +2,7 @@ stdenv, fetchurl, automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, - libdbusmenu_qt, libjpeg, phonon, qt4 + libdbusmenu_qt, libjpeg, phonon, qt4, openssl }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ - attica giflib libdbusmenu_qt libjpeg + attica giflib libdbusmenu_qt libjpeg openssl ]; propagatedBuildInputs = [ qt4 phonon ]; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 4fe7816d4fdc..c07f1b46cbe1 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; license = licenses.asl20; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index ce0df266332e..559b75eec412 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/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index e7cd0872c76a..1e567a9935cb 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "3.4.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cwgqvpqn59y3zq4wv35m1v4jrh3ih6zbyv30g5nxbw13vddxr92"; + sha256 = "196pab5whswy3bgi2s842asjhyka2f9mw98m84bvqjmfw0m7x4y0"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d78a5f55aadc..8064d9b6d575 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.26"; + version = "4.0.27"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5"; + sha256 = "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib"; }; buildInputs = [ unixODBC ]; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 1392956ef036..1b8fffa1d294 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, requests, geojson }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, requests, geojson }: buildPythonPackage rec { pname = "pyowm"; version = "2.10.0"; + disabled = pythonOlder "3.3"; + src = fetchPypi { inherit pname version; sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; @@ -14,8 +16,7 @@ buildPythonPackage rec { # This may actually break the package. postPatch = '' substituteInPlace setup.py \ - --replace "requests>=2.18.2,<2.19" "requests" \ - --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0" + --replace "requests>=2.18.2,<2.19" "requests" ''; # No tests in archive diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf2387..198445177c41 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/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 7d745aa9e105..b48f21b9e78d 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, pythonPackages, pkgconfig , qmake, qtbase, qtsvg, qtwebengine +, wrapQtAppsHook }: let @@ -77,9 +78,12 @@ in buildPythonPackage rec { doCheck = true; - enableParallelBuilding = true; + passthru = { + inherit wrapQtAppsHook; + }; + meta = with lib; { description = "Python bindings for Qt5"; homepage = http://www.riverbankcomputing.co.uk; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index d8609ca07766..974ac4499ac8 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 621820e39de8..ae4c273fc00e 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/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index 0f4b2b688cd9..ae17ed351050 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pysocks"; - version = "1.6.8"; + version = "1.7.0"; src = fetchPypi { pname = "PySocks"; inherit version; - sha256 = "3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672"; + sha256 = "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 3f4ee6fea28a..ad0db8dc8bcb 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/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index 39671041d8a6..9316e85b2608 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; - maintainers = with maintainers; [ lovek323 rickynils ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 547e52edbd20..72be3227e6cb 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "0vyv6wnch1l5kcxqzngakx948qz90q604bl5h93x54381lq3ndj6"; + sha256 = "1mjr3pa4fycdsl7xk9s8fpn2vhpgx7mrdnn5h4lyyjhz86195ivg"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 3085ee06e870..0ef79cd09894 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ansible , pytest , mock @@ -8,11 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.0.2"; + version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "d69d89cbcf29e587cbe6ec4b229346edbf027d3c04944dd7bcbf3d7bba46348f"; + src = fetchFromGitHub { + owner = "ansible"; + repo = "pytest-ansible"; + rev = "v${version}"; + sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0"; }; patchPhase = '' @@ -24,11 +26,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; propagatedBuildInputs = [ ansible pytest ]; - # tests not included with release + # tests not included with release, even on github doCheck = false; checkPhase = '' - pytest + HOME=$TMPDIR pytest tests/ ''; meta = with stdenv.lib; { 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 000000000000..a4e0cb809aec --- /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-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix new file mode 100644 index 000000000000..ec340806964b --- /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-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 0669c22f9211..afd36155cf78 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm pytest ]; + buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 084432061d1e..6b25ba93ef9b 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.27.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "158wxj2w880jrab7mi4fb3xqnjhmfixqacxjp7whf7jy3zxqrq38"; + sha256 = "0xa0zw7hlfqqa305ic4csgfmlbxhklb5xzx72mfkcz8gcc0f5qwd"; }; # The tests require all the providers, disable otherwise. diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix new file mode 100644 index 000000000000..e6425c300478 --- /dev/null +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-unshare"; + # pypi version doesn't support Python 3 and the package didn't update for a long time: + # https://github.com/TheTincho/python-unshare/pull/8 + version = "unstable-2018-05-20"; + + src = fetchFromGitHub { + owner = "TheTincho"; + repo = "python-unshare"; + rev = "4e98c177bdeb24c5dcfcd66c457845a776bbb75c"; + sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h"; + }; + + meta = with stdenv.lib; { + description = "Python bindings for the Linux unshare() syscall"; + homepage = "https://github.com/thetincho/python-unshare"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; + +} 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 000000000000..93fa36fa2fcf --- /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/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 9762fd280e06..1a4fdff5812c 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.24"; + version = "1.0.25"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0k5y4h0c4cjn1xl5fayh3a001kl42vvrhjyhp5r2fwn22z56a02p"; + sha256 = "15m0ajcrxjdzahdkxa3mylk87l31zz48k99bvmmx96hcl31cf347"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index d5305781ef5c..7042b42f7ed8 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "162rad86slg4gmzxy33pnyyzm4hhcszcpjpw1vk79f3gxzvy8j8x"; + sha256 = "11164sy9vwphf7iw60n4hmns2q6anazrkhc15lwi6sb2qmkjc541"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix new file mode 100644 index 000000000000..1b3b271fb61f --- /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/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 907f87dcd474..13a946aeafd0 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ click colorama ]; - meta = { + meta = with lib; { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ "1000101" ]; + license = licenses.mit; + maintainers = [ maintainers."1000101" ]; }; } diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix new file mode 100644 index 000000000000..8b84d6a248ee --- /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 9e80830f4380..abd4854c73fd 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/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index bf76166d73b4..7839a77f9f5e 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage -, fetchdarcs +, fetchFromGitHub , isPy3k , pkgs , cython @@ -14,13 +14,14 @@ buildPythonPackage rec { pname = "sipsimple"; - version = "3.1.1"; + version = "3.4.2"; disabled = isPy3k; - src = fetchdarcs { - url = http://devel.ag-projects.com/repositories/python-sipsimple; + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "python-sipsimple"; rev = "release-${version}"; - sha256 = "0jdilm11f5aahxrzrkxrfx9sgjgkbla1r0wayc5dzd2wmjrdjyrg"; + sha256 = "094xf343d6zjhg9jwbm3dr74zq264cyqnn22byvm2m88lnagmhmr"; }; preConfigure = '' @@ -32,7 +33,7 @@ buildPythonPackage rec { buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SIP SIMPLE implementation for Python"; homepage = http://sipsimpleclient.org/; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 40b2626bade0..a97d2e82c348 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/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index badc99f5e377..b513a9f33c8c 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "spark_parser"; - version = "1.8.7"; + version = "1.8.9"; src = fetchPypi { inherit pname version; - sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; }; buildInputs = [ nose ]; 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 000000000000..ef30b6917a3b --- /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.2"; + + src = fetchPypi { + inherit version; + pname = "SQLAlchemy-Utils"; + sha256 = "126c9p8rnnb043w57ah7idqfryczbz4vi9lzsz2cgiaig6fv52b6"; + }; + + 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 000000000000..13272a5a0b71 --- /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/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 37091da1b499..4b5ad014b973 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7"; + sha256 = "1k9vmw0kcbkij9lbz80imkwkhq24vgrqf1i95kv8y5aaarjda6mx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 43134fb746d8..899e89368436 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -118,7 +118,7 @@ let keras-applications # libs taken from system through the TF_SYS_LIBS mechanism - grpc + # grpc sqlite openssl jsoncpp @@ -169,7 +169,8 @@ let "flatbuffers" "gast_archive" "gif_archive" - "grpc" + # Lots of errors, requires an older version + # "grpc" "hwloc" "icu" "jpeg" @@ -245,8 +246,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - # No idea why gpr isn't linked properly; perhaps Tensorflow expects a static library? - NIX_LDFLAGS = [ "-lgpr" ] ++ lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; hardeningDisable = [ "format" ]; @@ -261,15 +261,14 @@ let bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; fetchAttrs = { - preInstall = '' - rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} - ''; + # So that checksums don't depend on these. + TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1rbzvir569ch33bpvm47byx954vr80rjnzrbgs4rg3bqww73hr3k" + "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx" else - "1wnhma450zh72raiq7ddd9lyq3a056cjqiy6i7y4sidiy09ncvcg"; + "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index 843f26508ae4..094c01eef78b 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { homepage = http://liw.fi/tracing/; description = "Python debug logging helper"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 12e881536963..47aa23ca1143 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -40,10 +40,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak mmahut "1000101" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ np prusnak mmahut maintainers."1000101" ]; }; } diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 4cd4776f0da9..21a3c5d6d08f 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trollius"; - version = "2.2"; + version = "2.2.post1"; src = fetchPypi { inherit pname version; - sha256 = "093978388qvw5hyscbbj062dbdc2761xs9yzrq26mh63g689lnxk"; + sha256 = "06s44k6pcq35vl5j4i2pgkpb848djal818qypcvx44gyn4azjrqn"; }; checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2; diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index 042b4a196421..bce0ad8d7c0c 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index 2c3ee66663f6..d59a0bb8b8a4 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = licenses.asl20; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 6e357f307e3a..f2c02c8a6c67 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.1"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448"; + sha256 = "07kahmr0vfmncf8y4x6ldjrghnd4gsf0fwykgjj5ijvqi9xc21xs"; }; buildInputs = [ nose numpy ]; 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 000000000000..ec34a451156d --- /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/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 9387ba778016..f85c28b7f579 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0glsl57ha0d4pn5q318dmzml7crml1h8yilbhxh768wcs2030s1g"; + sha256 = "06s0lym5md59pj8w89acnwk0i0hh92az187h4gz22mb849h308pw"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 528846d72381..ffd99734f932 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/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 365a65950f14..885595ef6d4b 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,32 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch }: +{ stdenv, buildPythonPackage, fetchPypi }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "urwid"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; + sha256 = "1g6cpicybvbananpjikmjk8npmjk4xvak1wjzji62wc600wkwkb4"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch"; - sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx"; - }) - # fix tests - (fetchpatch { - url = "https://github.com/floppym/urwid/commit/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3.patch"; - sha256 = "1b3vz7mrwz2bqvdwvbyv2j835f9lzapgw0j2km4sam76bxmgfpgq"; - }) - ]; - - postPatch = '' - # Several tests keep failing on Hydra - rm urwid/tests/test_vterm.py - ''; - meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; @@ -34,4 +16,4 @@ buildPythonPackage (rec { license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; -}) +} diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 29515f75c9e0..4c550e073c3f 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.1.0"; + version = "2.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f"; + sha256 = "0ggiisrq7cbk307d09fdwfdcjb667jv90lx6gfwhxfpxgq66cccb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index b45a46b3a839..70512edf4001 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.11.5"; + version = "0.11.7"; src = fetchPypi { inherit pname version; - sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef"; + sha256 = "0mplkcpb5d8wjf8vk195fys4y6a3wbibiyf708imw33lphfk9g1a"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index b71bc7dc928d..c0d2d744f096 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "1mqwlc1cr15jxr3gr8pqqh5gf0gppm2kcvdi8vid6y8wmq9bjkg5"; + sha256 = "05a3fxi4f43n0dc87lizsy2h84dxvqjy0q6rhkyabdbhypz5864b"; }; buildInputs = [ six pytest ]; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index f9565d8e6a05..407bb88fa2ae 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; - maintainers = with maintainers; [ rickynils offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/wikipedia/default.nix b/pkgs/development/python-modules/wikipedia/default.nix deleted file mode 100644 index 19b7c42558ec..000000000000 --- 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/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 60f0f3cc9696..141b499453ed 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix new file mode 100644 index 000000000000..36aaf0ec8ceb --- /dev/null +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: + +buildPythonPackage rec { + pname = "wsproto"; + version = "0.14.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + }; + + propagatedBuildInputs = [ h11 enum34 ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Pure Python, pure state-machine WebSocket implementation"; + homepage = https://github.com/python-hyper/wsproto/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 36aaf0ec8ceb..dfbf9ceabdc3 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy36 +, dataclasses +, h11 +, pytest +}: buildPythonPackage rec { pname = "wsproto"; - version = "0.14.1"; + version = "0.15.0"; + disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; + sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1"; }; - propagatedBuildInputs = [ h11 enum34 ]; + propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index c953fe9fe1e3..9f6e9866cef3 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/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix new file mode 100644 index 000000000000..c15f2682e63c --- /dev/null +++ b/pkgs/development/python-modules/xapian/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchurl, python +, sphinx +, xapian +}: + +let + pythonSuffix = lib.optionalString python.isPy3k "3"; +in +buildPythonPackage rec { + pname = "xapian"; + inherit (xapian) version; + format = "other"; + + src = fetchurl { + url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; + sha256 = "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm"; + }; + + configureFlags = [ + "--with-python${pythonSuffix}" + "PYTHON${pythonSuffix}_LIB=${placeholder "out"}/${python.sitePackages}" + ]; + + preConfigure = '' + export XAPIAN_CONFIG=${xapian}/bin/xapian-config + ''; + + buildInputs = [ sphinx xapian ]; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} python${pythonSuffix}/smoketest.py + ${python.interpreter} python${pythonSuffix}/pythontest.py + ''; + + meta = with lib; { + description = "Python Bindings for Xapian"; + homepage = https://xapian.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index e5d06a3c6943..5fc7f55d4197 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,18 +1,18 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub +, click , pytest , six -, click }: buildPythonPackage rec { pname = "xdis"; - version = "4.0.1"; + version = "4.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1ifakxxawyxw4w4p58m4xdc0c955miqyaq3dfbl386ipw0f50kyz"; + src = fetchFromGitHub { + owner = "rocky"; + repo = "python-xdis"; + rev = version; + sha256 = "1h4j8hincf49zyd0rvn4bh0ypj8836y8vz3d496ycb9gjzkr6044"; }; checkInputs = [ pytest ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = https://github.com/rocky/python-xdis/; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b22b9554fa61..5c738c11f84c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.16.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1bw39aiyqspjsxps5m3skaszih8vap8kyialbzg7jjc080nyqkws"; + sha256 = "04xarlbh59f9ah53jxrcpqpzladyfxaw6cb2g8clw9aid0qzi9kh"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index da6bdcde463f..1aa03983f68a 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 ee9270f3596d..dcebf7d4ecf9 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/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 81e5d0fbc815..42f0218c8463 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "0.1.4"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a7838b2f21bc06b7e3db5c64ffa6642255a5f7c01841660b3388a9840e101f99"; + sha256 = "04532600mnsvzv43l2jvjrn7sflg0wkjqzy7nj7m3vvxm5gd4kg3"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 58e72e4a9f42..f0727b3c1704 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -36,7 +36,7 @@ let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // { + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // { inherit preferLocalBuild allowSubstitutes; # pass the defaults buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0db88835e6ce..fb351f4adfd8 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.106.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "189pibz5b9md6dhiadr7616xlmmrx5zwh7brbyrvgbapq80k9lak"; + sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://flow.org/; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; - maintainers = with maintainers; [ marsam puffnfresh globin ]; + maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 88d84ad1d11d..3f3731e2ac83 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/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index caa4d718f89f..5099505cc5b0 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.9.3"; + version = "0.10.3"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "10saljrman41pjmjhbzan8jw8jbz069yhcf6vvzxmw763x5s3n85"; + sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39"; }; - modSha256 = "0zfgyv1m7iay3brkqmh35gw1giyr3i3ja56dh4kgm6ai4z1jmvgc"; + modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index ee2367d28bba..678988480ece 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, lib }: stdenv.mkDerivation rec { + pname = "avro-tools"; version = "1.9.0"; - name = "avro-tools-${version}"; src = fetchurl { url = - "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar"; + "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi"; }; @@ -19,11 +19,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/libexec/avro-tools - mv $src ${name}.jar - cp ${name}.jar $out/libexec/avro-tools + cp $src $out/libexec/avro-tools/${pname}.jar makeWrapper ${jre}/bin/java $out/bin/avro-tools \ - --add-flags "-jar $out/libexec/avro-tools/${name}.jar" + --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 73adfaec8386..0e511271e1c1 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { ]; postPatch = '' - substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0" + substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.22.0" substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0" substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1" ''; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 51aeebb82e52..62ecc47b17bd 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1i3b6kn9kq70a34wkpm8zjqj1skawdxs3r01b7r6ws1rbdnfj6mp"; + sha256 = "0g2y283glx2ykxxqc3vsg520a6s2w5d937wndhgpfajc5yjgiz43"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 701b0c48388e..1007f4df8cad 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/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix new file mode 100644 index 000000000000..e9bb3c27df9f --- /dev/null +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -0,0 +1,133 @@ +{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: + +let + + xplat = fetchurl { + url = "https://github.com/mono/msbuild/releases/download/0.07/mono_msbuild_xplat-master-8f608e49.zip"; + sha256 = "1jxq3fk9a6q2a8i9zacxaz3fkvc22i9qvzlpa7wbb95h42g0ffhq"; + }; + + deps = import ./nuget.nix { inherit fetchurl; }; + +in + +stdenv.mkDerivation rec { + pname = "msbuild"; + version = "16.3+xamarinxplat.2019.07.26.14.57"; + + src = fetchurl { + url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz"; + sha256 = "1zcdfx4xsh62wj3g1jc2an0lppsfs691lz4dv05xbgi01aq1hk6a"; + }; + + nativeBuildInputs = [ + dotnet-sdk + mono + ]; + + buildInputs = [ + dotnetPackages.Nuget + glibcLocales + makeWrapper + unzip + ]; + + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild + phases = ["unpackPhase" "buildPhase" "installPhase" "installCheckPhase"]; + + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; + + buildPhase = '' + # nuget would otherwise try to base itself in /homeless-shelter + export HOME=$(pwd)/fake-home + + for package in ${toString deps}; do + nuget add $package -Source nixos + done + + nuget sources Disable -Name "nuget.org" + nuget sources Add -Name nixos -Source $(pwd)/nixos + + # license check is case sensitive + mv LICENSE license + + mkdir -p artifacts + unzip ${xplat} -d artifacts + mv artifacts/msbuild artifacts/mono-msbuild + chmod +x artifacts/mono-msbuild/MSBuild.dll + + ln -s $(find ${dotnet-sdk} -name libhostfxr.so) artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/ + + # overwrite the file + echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh + + # msbuild response files to use only the nixos source + echo "/p:RestoreSources=nixos" > artifacts/mono-msbuild/MSBuild.rsp + echo "/p:RestoreSources=nixos" > src/MSBuild/MSBuild.rsp + + # not patchShebangs, there is /bin/bash in the body of the script as well + substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} + + # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa + # TODO there are some (many?) failing tests + ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true + ''; + + installPhase = '' + mono artifacts/mono-msbuild/MSBuild.dll mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO + + ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn + + makeWrapper ${mono}/bin/mono $out/bin/msbuild \ + --set MSBuildExtensionsPath $out/lib/mono/xbuild \ + --set-default MONO_GC_PARAMS "nursery-size=64m" \ + --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll" + ''; + + doInstallCheck = true; + + # https://docs.microsoft.com/cs-cz/visualstudio/msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch?view=vs-2019 + installCheckPhase = '' + cat > Helloworld.cs <<EOF +using System; + +class HelloWorld +{ + static void Main() + { +#if DebugConfig + Console.WriteLine("WE ARE IN THE DEBUG CONFIGURATION"); +#endif + + Console.WriteLine("Hello, world!"); + } +} +EOF + + cat > Helloworld.csproj <<EOF +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Compile Include="Helloworld.cs" /> + </ItemGroup> + <Target Name="Build"> + <Csc Sources="@(Compile)"/> + </Target> +</Project> +EOF + + $out/bin/msbuild Helloworld.csproj -t:Build + ${mono}/bin/mono Helloworld.exe | grep "Hello, world!" + ''; + + meta = with stdenv.lib; { + description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; + homepage = https://github.com/mono/msbuild; + license = licenses.mit; + maintainers = with maintainers; [ jdanek ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/development/tools/build-managers/msbuild/nuget.nix b/pkgs/development/tools/build-managers/msbuild/nuget.nix new file mode 100644 index 000000000000..0aae3840752d --- /dev/null +++ b/pkgs/development/tools/build-managers/msbuild/nuget.nix @@ -0,0 +1,1130 @@ +{ fetchurl }: let + + fetchNuGet = { url, name, version, sha256 }: fetchurl { + inherit name url sha256; + }; + +in [ +(fetchNuGet { + name = "microsoft.build"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build/14.3.0"; + sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz"; + }) +(fetchNuGet { + name = "system.io"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.io/4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) +(fetchNuGet { + name = "system.io"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io/4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) +(fetchNuGet { + name = "system.xml.xpath"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xpath/4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) +(fetchNuGet { + name = "microsoft.net.compilers.toolset"; + version = "3.3.0-beta2-19367-02"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.compilers.toolset/3.3.0-beta2-19367-02/microsoft.net.compilers.toolset.3.3.0-beta2-19367-02.nupkg"; + sha256 = "1v9lz2fmfprhql0klqa8iipiiz3wcflvlgr3a86pcjjk7x0y84sl"; + }) +(fetchNuGet { + name = "system.io.filesystem"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) +(fetchNuGet { + name = "system.io.filesystem"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem/4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) +(fetchNuGet { + name = "largeaddressaware"; + version = "1.0.3"; + url = "https://www.nuget.org/api/v2/package/largeaddressaware/1.0.3"; + sha256 = "1ppss9bgj0hf5s8307bnm2a4qm10mrymp0v12m28a5q81zjz0fr5"; + }) +(fetchNuGet { + name = "nuget.protocol"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.protocol/5.2.0-rtm.6067"; + sha256 = "0fm3qgcdsy6dy6fih0n9a4w39mzdha4cz51gr9pp9g4nag34za2a"; + }) +(fetchNuGet { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) +(fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) +(fetchNuGet { + name = "system.buffers"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.buffers/4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) +(fetchNuGet { + name = "system.buffers"; + version = "4.4.0"; + url = "https://www.nuget.org/api/v2/package/system.buffers/4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) +(fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.core/2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) +(fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) +(fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.primitives/4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) +(fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) +(fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmldocument/4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) +(fetchNuGet { + name = "microsoft.build.framework"; + version = "15.5.180"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/15.5.180"; + sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z"; + }) +(fetchNuGet { + name = "microsoft.build.framework"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.framework/14.3.0"; + sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd"; + }) +(fetchNuGet { + name = "system.globalization"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.globalization/4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) +(fetchNuGet { + name = "system.globalization"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.globalization/4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) +(fetchNuGet { + name = "microsoft.dotnet.signtool"; + version = "1.0.0-beta.19372.10"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.signtool/1.0.0-beta.19372.10/microsoft.dotnet.signtool.1.0.0-beta.19372.10.nupkg"; + sha256 = "1f2im2lilw10zslfclxh49knr542jy7q09p009flxsgn68riy0j6"; + }) +(fetchNuGet { + name = "system.runtime.handles"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) +(fetchNuGet { + name = "system.runtime.handles"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.handles/4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.common"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.common/3.0.0-beta1-61516-01"; + sha256 = "1qfm61yrsmihhir7n3hb5ccn1r50i39rv1g74880ma7ihjl1hz54"; + }) +(fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) +(fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.platforms/1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) +(fetchNuGet { + name = "system.reflection.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) +(fetchNuGet { + name = "system.reflection.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.primitives/4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) +(fetchNuGet { + name = "microbuild.core"; + version = "0.2.0"; + url = "https://www.nuget.org/api/v2/package/microbuild.core/0.2.0"; + sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194"; + }) +(fetchNuGet { + name = "system.diagnostics.tracesource"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracesource/4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) +(fetchNuGet { + name = "system.runtime.numerics"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.numerics/4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) +(fetchNuGet { + name = "system.threading.tasks.parallel"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.3.0"; + sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; + }) +(fetchNuGet { + name = "system.threading.tasks.parallel"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.parallel/4.0.1"; + sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75"; + }) +(fetchNuGet { + name = "nuget.credentials"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.credentials/5.2.0-rtm.6067"; + sha256 = "07g2na590sph9li5igww74i3gqyrj5cb6gsgjh54f1f4bs4x1c4k"; + }) +(fetchNuGet { + name = "system.objectmodel"; + version = "4.0.12"; + url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) +(fetchNuGet { + name = "system.objectmodel"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.objectmodel/4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) +(fetchNuGet { + name = "system.xml.xmlserializer"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.xml.xmlserializer/4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.build.tasks"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.build.tasks/3.0.0-beta1-61516-01"; + sha256 = "1cjpqbd4i0gxhh86nvamlpkisd1krcrya6riwjhghvpjph6115vp"; + }) +(fetchNuGet { + name = "system.private.datacontractserialization"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.private.datacontractserialization/4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) +(fetchNuGet { + name = "system.numerics.vectors"; + version = "4.4.0"; + url = "https://www.nuget.org/api/v2/package/system.numerics.vectors/4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) +(fetchNuGet { + name = "microsoft.build.centralpackageversions"; + version = "2.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.centralpackageversions/2.0.1"; + sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k"; + }) +(fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) +(fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.extensions/4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) +(fetchNuGet { + name = "microsoft.visualstudio.sdk.embedinteroptypes"; + version = "15.0.15"; + url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15"; + sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd"; + }) +(fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) +(fetchNuGet { + name = "system.runtime.extensions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) +(fetchNuGet { + name = "system.runtime.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.extensions/4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) +(fetchNuGet { + name = "system.resources.extensions"; + version = "4.6.0-preview8.19364.1"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.extensions/4.6.0-preview8.19364.1/system.resources.extensions.4.6.0-preview8.19364.1.nupkg"; + sha256 = "0jh9ilbicmsngv77a4ayzs0n7s440ycdf726nbljw029gq4rzvqf"; + }) +(fetchNuGet { + name = "nuget.frameworks"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.frameworks/5.2.0-rtm.6067"; + sha256 = "1g1kcfqhxr1bhl3ksbdmz3rb9nq1qmkac1sijf9ng4gmr9fmprdm"; + }) +(fetchNuGet { + name = "system.diagnostics.diagnosticsource"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.diagnosticsource/4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) +(fetchNuGet { + name = "system.security.claims"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.claims/4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) +(fetchNuGet { + name = "system.linq.expressions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.linq.expressions/4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) +(fetchNuGet { + name = "system.diagnostics.stacktrace"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.stacktrace/4.3.0"; + sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; + }) +(fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) +(fetchNuGet { + name = "system.diagnostics.tracing"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) +(fetchNuGet { + name = "system.diagnostics.tracing"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tracing/4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) +(fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + url = "https://www.nuget.org/api/v2/package/xunit.analyzers/0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) +(fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.assert/2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) +(fetchNuGet { + name = "system.appcontext"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.appcontext/4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) +(fetchNuGet { + name = "system.appcontext"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.appcontext/4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) +(fetchNuGet { + name = "system.text.encoding.codepages"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.3.0"; + sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; + }) +(fetchNuGet { + name = "system.text.encoding.codepages"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding.codepages/4.0.1"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }) +(fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.csharp"; + version = "3.0.0-beta1-61516-01"; + url = "https://dotnet.myget.org/F/roslyn/api/v2/package/microsoft.codeanalysis.csharp/3.0.0-beta1-61516-01"; + sha256 = "0a7npkdw6s5jczw1lkm63x2bpz1z3ccid20h5nm6k78cv7sihm4h"; + }) +(fetchNuGet { + name = "system.console"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.console/4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) +(fetchNuGet { + name = "system.console"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.console/4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) +(fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.typeextensions/4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) +(fetchNuGet { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.2"; + url = "https://www.nuget.org/api/v2/package/system.runtime.compilerservices.unsafe/4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) +(fetchNuGet { + name = "system.threading.tasks"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) +(fetchNuGet { + name = "system.threading.tasks"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks/4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) +(fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + url = "https://www.nuget.org/api/v2/package/xunit.abstractions/2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) +(fetchNuGet { + name = "microsoft.build.utilities.core"; + version = "15.5.180"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/15.5.180"; + sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630"; + }) +(fetchNuGet { + name = "microsoft.build.utilities.core"; + version = "14.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.build.utilities.core/14.3.0"; + sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb"; + }) +(fetchNuGet { + name = "system.reflection.emit"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit/4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) +(fetchNuGet { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.16.30"; + url = "https://www.nuget.org/api/v2/package/microsoft.visualstudio.setup.configuration.interop/1.16.30"; + sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; + }) +(fetchNuGet { + name = "system.net.sockets"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.sockets/4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) +(fetchNuGet { + name = "microsoft.dotnet.arcade.sdk"; + version = "1.0.0-beta.19372.10"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.arcade.sdk/1.0.0-beta.19372.10/microsoft.dotnet.arcade.sdk.1.0.0-beta.19372.10.nupkg"; + sha256 = "1lii0yg4fbsma80mmvw2zwplc26abb46q6gkxwbsbkyszkw128hv"; + }) +(fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) +(fetchNuGet { + name = "runtime.native.system.io.compression"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system.io.compression/4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) +(fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) +(fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.debug/4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) +(fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) +(fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.xml.readerwriter/4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) +(fetchNuGet { + name = "system.threading.timer"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) +(fetchNuGet { + name = "system.threading.timer"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.threading.timer/4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) +(fetchNuGet { + name = "system.reflection.metadata"; + version = "1.4.2"; + url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.4.2"; + sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; + }) +(fetchNuGet { + name = "system.reflection.metadata"; + version = "1.6.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.metadata/1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) +(fetchNuGet { + name = "system.xml.xdocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xdocument/4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) +(fetchNuGet { + name = "system.linq"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.linq/4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) +(fetchNuGet { + name = "system.linq"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.linq/4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) +(fetchNuGet { + name = "nuget.librarymodel"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.librarymodel/5.2.0-rtm.6067"; + sha256 = "0dxvnspgkc1lcmilb67kkipg39ih34cmifs6jwk9kbrwf96z51q9"; + }) +(fetchNuGet { + name = "xlifftasks"; + version = "1.0.0-beta.19252.1"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/xlifftasks/1.0.0-beta.19252.1/xlifftasks.1.0.0-beta.19252.1.nupkg"; + sha256 = "0249sfb30y9dgsfryaj8644qw3yc1xp2xzc08lsrwvmm8vjcvkri"; + }) +(fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) +(fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.text.regularexpressions/4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) +(fetchNuGet { + name = "system.security.accesscontrol"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.accesscontrol/4.3.0"; + sha256 = "1gakrskmlmwhzmjc1c2mrwk0fml615rsk31dw0kbjnn9yqnnrjbi"; + }) +(fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.runner.visualstudio/2.4.1"; + sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; + }) +(fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) +(fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.resources.resourcemanager/4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) +(fetchNuGet { + name = "nuget.projectmodel"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.projectmodel/5.2.0-rtm.6067"; + sha256 = "1s5950nbcsnfrpbaxdnl6cv1xbsa57fln04lhyrki536476a6wcn"; + }) +(fetchNuGet { + name = "nuget.versioning"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.versioning/5.2.0-rtm.6067"; + sha256 = "04rr31ms95h7ymqxlalpv3xs48j8ng4ljfz5lmrfw7547rhcrj2h"; + }) +(fetchNuGet { + name = "system.memory"; + version = "4.5.3"; + url = "https://www.nuget.org/api/v2/package/system.memory/4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) +(fetchNuGet { + name = "system.resources.reader"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.resources.reader/4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + }) +(fetchNuGet { + name = "nuget.common"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.common/5.2.0-rtm.6067"; + sha256 = "1ff5dhkv8v04n2kr5gyjjvki4mqsp1w4dwsgj7cvdcfcm8alba0m"; + }) +(fetchNuGet { + name = "runtime.native.system"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) +(fetchNuGet { + name = "runtime.native.system"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.native.system/4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) +(fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) +(fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices/4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) +(fetchNuGet { + name = "microbuild.core.sentinel"; + version = "1.0.0"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; + sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i"; + }) +(fetchNuGet { + name = "sn"; + version = "1.0.0"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/sn/1.0.0/sn.1.0.0.nupkg"; + sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs"; + }) +(fetchNuGet { + name = "system.text.encoding"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) +(fetchNuGet { + name = "system.text.encoding"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.text.encoding/4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) +(fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) +(fetchNuGet { + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit.lightweight/4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) +(fetchNuGet { + name = "microsoft.net.test.sdk"; + version = "15.9.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.net.test.sdk/15.9.0"; + sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; + }) +(fetchNuGet { + name = "system.io.compression"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.compression/4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) +(fetchNuGet { + name = "system.runtime.serialization.primitives"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.primitives/4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) +(fetchNuGet { + name = "system.diagnostics.fileversioninfo"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.fileversioninfo/4.3.0"; + sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; + }) +(fetchNuGet { + name = "system.xml.xpath.xdocument"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.xml.xpath.xdocument/4.3.0"; + sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; + }) +(fetchNuGet { + name = "system.security.principal.windows"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.principal.windows/4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) +(fetchNuGet { + name = "vswhere"; + version = "2.6.7"; + url = "https://www.nuget.org/api/v2/package/vswhere/2.6.7"; + sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk"; + }) +(fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) +(fetchNuGet { + name = "xunit.runner.console"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.runner.console/2.4.1"; + sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"; + }) +(fetchNuGet { + name = "system.threading"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.threading/4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) +(fetchNuGet { + name = "system.threading"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading/4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) +(fetchNuGet { + name = "system.threading.tasks.dataflow"; + version = "4.5.24"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.dataflow/4.5.24"; + sha256 = "0wahbfdb0jxx3hi04xggfms8wgf68wmvv68m2vfp8v2kiqr5mr2r"; + }) +(fetchNuGet { + name = "microsoft.codeanalysis.analyzers"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.codeanalysis.analyzers/1.1.0"; + sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; + }) +(fetchNuGet { + name = "system.dynamic.runtime"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.dynamic.runtime/4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) +(fetchNuGet { + name = "system.io.pipes"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.pipes/4.3.0"; + sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r"; + }) +(fetchNuGet { + name = "system.net.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.primitives/4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) +(fetchNuGet { + name = "system.runtime.serialization.xml"; + version = "4.1.1"; + url = "https://www.nuget.org/api/v2/package/system.runtime.serialization.xml/4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }) +(fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.encoding/4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) +(fetchNuGet { + name = "system.collections.nongeneric"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.collections.nongeneric/4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) +(fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.tools/4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) +(fetchNuGet { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0-alpha-004"; + url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies/1.0.0-alpha-004"; + sha256 = "1qrpxhcx11v92lqwvrih88mlyfw2rkrsjqh7gl8c1h71vyppr3bp"; + }) +(fetchNuGet { + name = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.emit.ilgeneration/4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) +(fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.extensibility.execution/2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) +(fetchNuGet { + name = "microsoft.codecoverage"; + version = "15.9.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.codecoverage/15.9.0"; + sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; + }) +(fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit.extensibility.core/2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) +(fetchNuGet { + name = "system.collections.concurrent"; + version = "4.0.12"; + url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) +(fetchNuGet { + name = "system.collections.concurrent"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.concurrent/4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) +(fetchNuGet { + name = "system.collections"; + version = "4.0.11"; + url = "https://www.nuget.org/api/v2/package/system.collections/4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) +(fetchNuGet { + name = "system.collections"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.collections/4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) +(fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) +(fetchNuGet { + name = "microsoft.build.nugetsdkresolver"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/microsoft.build.nugetsdkresolver/5.2.0-rtm.6067"; + sha256 = "1rz2i4md7b8rlybb9s7416l0pr357f3ar149s6ipfq0xijn3xgmh"; + }) +(fetchNuGet { + name = "system.reflection"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection/4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) +(fetchNuGet { + name = "system.reflection"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection/4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) +(fetchNuGet { + name = "nuget.configuration"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.configuration/5.2.0-rtm.6067"; + sha256 = "075mypb32i0d0x73rcr0di6pb0bhlp0izv3633ky64kddriajma1"; + }) +(fetchNuGet { + name = "system.net.http"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.net.http/4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) +(fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) +(fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.x509certificates/4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) +(fetchNuGet { + name = "nuget.packaging"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.packaging/5.2.0-rtm.6067"; + sha256 = "16p5glvvpp5rw10ycbpyg39k4prir450l12r5frpm8qz0rdp3xig"; + }) +(fetchNuGet { + name = "nuget.commands"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.commands/5.2.0-rtm.6067"; + sha256 = "06vnphsmwnvcigwj37hy5abipjzwhnq61zw66cclwd6jjibb1kh9"; + }) +(fetchNuGet { + name = "system.runtime"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime/4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) +(fetchNuGet { + name = "system.runtime"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime/4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) +(fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) +(fetchNuGet { + name = "microsoft.win32.primitives"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.win32.primitives/4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.2.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.3.1"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.3.1"; + sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; + }) +(fetchNuGet { + name = "system.collections.immutable"; + version = "1.5.0"; + url = "https://www.nuget.org/api/v2/package/system.collections.immutable/1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) +(fetchNuGet { + name = "nuget.dependencyresolver.core"; + version = "5.2.0-rtm.6067"; + url = "https://dotnet.myget.org/F/nuget-build/api/v2/package/nuget.dependencyresolver.core/5.2.0-rtm.6067"; + sha256 = "0iw1z2lascjjmdkk9nf2wqm5sj5nqjv4611xx29vlmp6cyhnpq4i"; + }) +(fetchNuGet { + name = "netstandard.library"; + version = "1.6.1"; + url = "https://www.nuget.org/api/v2/package/netstandard.library/1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) +(fetchNuGet { + name = "shouldly"; + version = "3.0.0"; + url = "https://www.nuget.org/api/v2/package/shouldly/3.0.0"; + sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3"; + }) +(fetchNuGet { + name = "microsoft.diasymreader.pdb2pdb"; + version = "1.1.0-beta1-62506-02"; + url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.diasymreader.pdb2pdb/1.1.0-beta1-62506-02/microsoft.diasymreader.pdb2pdb.1.1.0-beta1-62506-02.nupkg"; + sha256 = "1dkhpmq5aw34nndvb4xc370866vf33x70zrjhgvnpwwspb6vb0zh"; + }) +(fetchNuGet { + name = "system.globalization.calendars"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.globalization.calendars/4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) +(fetchNuGet { + name = "system.io.compression.zipfile"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.compression.zipfile/4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) +(fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) +(fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.runtime.interopservices.runtimeinformation/4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) +(fetchNuGet { + name = "system.io.filesystem.driveinfo"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.io.filesystem.driveinfo/4.3.0"; + sha256 = "0j67khc75lwdf7d5i3z41cks7zhac4zdccgvk2xmq6wm1l08xnlh"; + }) +(fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) +(fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.tasks.extensions/4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) +(fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) +(fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + url = "https://www.nuget.org/api/v2/package/microsoft.netcore.targets/1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) +(fetchNuGet { + name = "system.reflection.extensions"; + version = "4.0.1"; + url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) +(fetchNuGet { + name = "system.reflection.extensions"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.reflection.extensions/4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) +(fetchNuGet { + name = "system.diagnostics.process"; + version = "4.1.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }) +(fetchNuGet { + name = "system.diagnostics.process"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.diagnostics.process/4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) +(fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.primitives/4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) +(fetchNuGet { + name = "system.threading.thread"; + version = "4.0.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) +(fetchNuGet { + name = "system.threading.thread"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.threading.thread/4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) +(fetchNuGet { + name = "newtonsoft.json"; + version = "9.0.1"; + url = "https://www.nuget.org/api/v2/package/newtonsoft.json/9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) +(fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) +(fetchNuGet { + name = "xunit"; + version = "2.4.1"; + url = "https://www.nuget.org/api/v2/package/xunit/2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) +(fetchNuGet { + name = "system.valuetuple"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.valuetuple/4.3.0"; + sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; + }) +(fetchNuGet { + name = "microsoft.netframework.referenceassemblies.net472"; + version = "1.0.0-alpha-004"; + url = "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/microsoft.netframework.referenceassemblies.net472/1.0.0-alpha-004"; + sha256 = "08wa54dm7yskayzxivnwbm8sg1pf6ai8ccr64ixf9lyz3yw6y0nc"; + }) +(fetchNuGet { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + url = "https://www.nuget.org/api/v2/package/system.security.cryptography.algorithms/4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) +] diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index e0cfe59b0516..cf19862b0056 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/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 8110027b6cfc..ba00a7078fc6 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; - maintainers = with maintainers; [ nequissimus rickynils ]; + maintainers = with maintainers; [ nequissimus ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d6..08644def517d 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/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3c04f8a12af6..3ef3c75ca4ef 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,15 +1,15 @@ { stdenv, buildGoPackage, fetchFromGitHub , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp -, go-md2man }: +}: let - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "19yf93pq4vw24h76kl32c6ryvg5fp5mixakw9c6sqydf7m74z9i8"; + sha256 = "0dki2v8j2jzbw49sdzcyjqbalbh70m0lgzrldgj6cc92mj896pxk"; }; goPackagePath = "github.com/containers/buildah"; @@ -26,22 +26,18 @@ in buildGoPackage rec { # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig go-md2man.bin ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; - # Copied from the skopeo package, doesn’t seem to make a difference? - # If something related to these libs failed, uncomment these lines. - /*preBuild = with lib; '' - export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" - '';*/ + buildPhase = '' + pushd go/src/${goPackagePath} + patchShebangs . + make GIT_COMMIT="unknown" + install -Dm755 buildah $bin/bin/buildah + ''; postBuild = '' - # depends on buildGoPackage not changing … - pushd ./go/src/${goPackagePath}/docs - make docs - make install PREFIX="$man" - popd + make -C docs install PREFIX="$man" ''; meta = { diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix deleted file mode 100644 index b6098ca98bfe..000000000000 --- 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 653d0d4505e7..1011f95cce7f 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/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 0d129765aa4a..9f9a160c587f 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -1,10 +1,12 @@ GEM remote: https://rubygems.org/ specs: - cbor-diag (0.5.2) + cbor-diag (0.5.6) json + neatjson treetop (~> 1) - json (2.1.0) + json (2.2.0) + neatjson (0.9) polyglot (0.3.5) treetop (1.6.10) polyglot (~> 0.3) @@ -16,4 +18,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix index 2de0e9a647a7..49de5b06f543 100644 --- a/pkgs/development/tools/cbor-diag/gemset.nix +++ b/pkgs/development/tools/cbor-diag/gemset.nix @@ -1,22 +1,38 @@ { cbor-diag = { - dependencies = ["json" "treetop"]; + dependencies = ["json" "neatjson" "treetop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.6"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; + }; + neatjson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw"; + type = "gem"; + }; + version = "0.9"; }; polyglot = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; @@ -26,6 +42,8 @@ }; treetop = { dependencies = ["polyglot"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index 65701dd45bf8..cd4e1407637a 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -2,19 +2,21 @@ GEM remote: https://rubygems.org/ specs: abnc (0.1.0) - cbor-diag (0.5.2) + cbor-diag (0.5.6) json + neatjson treetop (~> 1) - cddl (0.8.5) + cddl (0.8.9) abnc cbor-diag colorize json regexp-examples colorize (0.8.1) - json (2.1.0) + json (2.2.0) + neatjson (0.9) polyglot (0.3.5) - regexp-examples (1.4.2) + regexp-examples (1.5.0) treetop (1.6.10) polyglot (~> 0.3) @@ -25,4 +27,4 @@ DEPENDENCIES cddl BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix index 92aa41995051..a66833e27d9f 100644 --- a/pkgs/development/tools/cddl/gemset.nix +++ b/pkgs/development/tools/cddl/gemset.nix @@ -1,5 +1,7 @@ { abnc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig"; @@ -8,24 +10,30 @@ version = "0.1.0"; }; cbor-diag = { - dependencies = ["json" "treetop"]; + dependencies = ["json" "neatjson" "treetop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1"; + sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.6"; }; cddl = { dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047"; + sha256 = "16rmcrsxwx33pj25g1si0dhjdl2brfhy2vlpfwdb6qqkaikmzhpz"; type = "gem"; }; - version = "0.8.5"; + version = "0.8.9"; }; colorize = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; @@ -34,14 +42,28 @@ version = "0.8.1"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; + }; + neatjson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw"; + type = "gem"; + }; + version = "0.9"; }; polyglot = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; @@ -50,15 +72,19 @@ version = "0.3.5"; }; regexp-examples = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz"; + sha256 = "08s5d327i9dw5yjwv9vfss3qb7lwasjyc75wvh7vrdi5v4vm1y2k"; type = "gem"; }; - version = "1.4.2"; + version = "1.5.0"; }; treetop = { dependencies = ["polyglot"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix new file mode 100644 index 000000000000..919061c6d963 --- /dev/null +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, graalvm8, fetchurl }: + +stdenv.mkDerivation rec{ + pname = "clj-kondo"; + version = "2019.07.31-alpha"; + + reflectionJson = fetchurl { + name = "reflection.json"; + url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; + sha256 = "1m6kja38p6aypawbynkyq8bdh8wpdjmyqrhslinqid9r8cl25rcq"; + }; + + src = fetchurl { + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; + sha256 = "03ipl7br9pgx2hdbiaxv9ip0ibafkyzkc8qlx8xyi528bcfi54bf"; + }; + + dontUnpack = true; + + buildInputs = [ graalvm8 ]; + + buildPhase = '' + native-image \ + -jar ${src} \ + -H:Name=clj-kondo \ + -H:+ReportExceptionStackTraces \ + -J-Dclojure.spec.skip-macros=true \ + -J-Dclojure.compiler.direct-linking=true \ + "-H:IncludeResources=clj_kondo/impl/cache/built_in/.*" \ + -H:ReflectionConfigurationFiles=${reflectionJson} \ + --initialize-at-build-time \ + -H:Log=registerResource: \ + --verbose \ + --no-fallback \ + --no-server \ + "-J-Xmx3g" + ''; + + installPhase = '' + mkdir -p $out/bin + cp clj-kondo $out/bin/clj-kondo + ''; + + meta = with lib; { + description = "A linter for Clojure code that sparks joy."; + homepage = https://github.com/borkdude/clj-kondo; + license = licenses.epl10; + platforms = graalvm8.meta.platforms; + maintainers = with maintainers; [ jlesquembre ]; + }; +} diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index f17399747f9f..93809551f1d7 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloudfoundry-cli-${version}"; - version = "6.45.0"; + version = "6.46.1"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "1nq78670limq8lydysadk0kb1r88w55fr8cqxqxw0zy58vy1jzr4"; + sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq"; }; makeTarget = let hps = stdenv.hostPlatform.system; in diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0f4b6b73de31..62c682a1608f 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,17 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.1.0"; + version = "12.2.0"; + # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 + docker_x86_64 = fetchurl { + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; + sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; + sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir"; + }; in buildGoPackage rec { inherit version; @@ -19,16 +29,23 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn"; + sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3"; }; patches = [ ./fix-shell-path.patch ]; + postInstall = '' + touch $bin/bin/hello + install -d $bin/bin/helper-images + ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; homepage = https://about.gitlab.com/gitlab-ci/; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm ]; + maintainers = with maintainers; [ bachp zimbatm globin ]; }; } diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 299e7d9d4992..5554455b8894 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,12 +1,18 @@ { stdenv, fetchurl, makeWrapper, jre }: +let + zshCompletion = version: fetchurl { + url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; + sha256 = "0gfr1q66crh6si4682xbxnj41igws83qj710npgm2bvq90xa8m49"; + }; +in stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.1.0-M14-6"; + version = "2.0.0-RC3-3"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7"; + sha256 = "1qrybajwk46h6d1yp6n4zxdvrfl19lqhjsqxbm48vk3wbvj31vyl"; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,6 +21,9 @@ stdenv.mkDerivation rec { install -Dm555 $src $out/bin/coursier patchShebangs $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin + + # copy zsh completion + install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 99f8d55bd87e..85d49667a9af 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -3,14 +3,14 @@ with python3Packages; buildPythonApplication rec { - name = "cppclean-unstable-${version}"; - version = "2018-05-12"; + pname = "cppclean"; + version = "0.13"; src = fetchFromGitHub { owner = "myint"; repo = "cppclean"; - rev = "e7da41eca5e1fd2bd1dddd6655e50128bb96dc28"; - sha256 = "0pymh6r7y19bwcypfkmgwyixrx36pmz338jd83yrjflsbjlriqm4"; + rev = "v${version}"; + sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0"; }; postUnpack = '' diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 14d07a0108fa..9dff0cc3ebed 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "easyjson-unstable-${version}"; - version = "2019-02-21"; + pname = "easyjson"; + version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003"; - sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib"; + rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e"; + sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/electron/6.x.nix b/pkgs/development/tools/electron/6.x.nix new file mode 100644 index 000000000000..5d412848d2d6 --- /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/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 24eba03946ac..3f3f77795281 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.1"; + version = "1.1.4"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "0m618rvjh8h8hnbafrxsdkw8m5r2wnkz7whqnh60jh91h3yr0kzs"; + sha256 = "020b6w2vhqgkpbrc1d08zh6mkh704mqhqqly14hir2bvay9rr9li"; }; patchPhase = '' diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 442ae4d15ec9..70fa18ceddb5 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl_1_0_2, cmake, perl, pkgconfig, zlib }: with rustPlatform; @@ -27,7 +27,7 @@ buildRustPackage rec { ''; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib ]; + buildInputs = [ openssl_1_0_2 zlib ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix new file mode 100644 index 000000000000..221058a461ef --- /dev/null +++ b/pkgs/development/tools/gofumpt/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gofumpt"; + version = "2019-07-29"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = pname; + rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b"; + sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf"; + }; + + modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g"; + + meta = with lib; { + description = "A stricter gofmt"; + homepage = https://github.com/mvdan/gofumpt; + license = licenses.bsd3; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index c287e40d823a..2bac15403038 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.hostPlatform.system == "x86_64-linux" +}: stdenv.mkDerivation rec { - name = "icestorm-${version}"; - version = "2019.04.16"; + pname = "icestorm"; + version = "2019.08.15"; + + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "95949315364f8d9b0c693386aefadf44b28e2cf6"; + sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2"; }; nativeBuildInputs = [ pkgconfig ]; @@ -55,7 +58,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.clifford.at/icestorm/; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index ebb875c92984..e7c5955ef417 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A lightweight and flexible command-line JSON processor''; license = licenses.mit; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin globin ]; platforms = with platforms; linux ++ darwin; downloadPage = "http://stedolan.github.io/jq/download/"; updateWalker = true; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 1bc9aa14e449..202c57f9106d 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.34.0"; + version = "0.34.2"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1mry999aqmbljp2ybkgf9hps8z4aa254b1bsivi559gzsvdkmqh7"; + sha256 = "1v1s4y8ads2s8hjsjacxni1j0dbmnhilhnfs0xabr3aljqs15wb2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e1534..43cb6e6c2c75 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/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index e66d92e34d65..66e972826cb9 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl, cmake }: -let - name = "astyle"; +stdenv.mkDerivation rec { + pname = "astyle"; version = "3.1"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz"; sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; }; - sourceRoot = if stdenv.cc.isClang - then "astyle/build/clang" - else "astyle/build/gcc"; + # lots of hardcoded references to /usr + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace ' /usr/' " $out/" + ''; - # -s option is obsolete on Darwin and breaks build - postPatch = if stdenv.isDarwin then '' - substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" - '' else null; + nativeBuildInputs = [ cmake ]; - installFlags = "INSTALL=install prefix=$$out"; - - meta = { - homepage = http://astyle.sourceforge.net/; + meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + homepage = "https://astyle.sourceforge.net/"; + license = licenses.lgpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 281463528354..ddc15f856b53 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 b4c7558885bb..991d0249e169 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 31e720b13f29..6de69a34b290 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 904119bd6ae3..a3579b734084 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/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index b96f65c2ecc2..cc256bc23bdf 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,22 +1,64 @@ -{ stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobject-introspection }: +{ stdenv +, pkgconfig +, fetchurl +, meson +, ninja +, glib +, gtk3 +, python3 +, wrapGAppsHook +, gnome3 +, libwnck3 +, gobject-introspection +, gettext +, itstool +}: -let +python3.pkgs.buildPythonApplication rec { pname = "d-feet"; - version = "0.3.14"; -in python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; + version = "0.3.15"; + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f"; + url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz"; }; - nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ]; + nativeBuildInputs = [ + gettext + gobject-introspection + itstool + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gnome3.adwaita-icon-theme + gtk3 + libwnck3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + mesonFlags = [ + "-Dtests=false" # needs dbus + ]; - propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { @@ -26,17 +68,15 @@ in python3Packages.buildPythonApplication rec { }; }; - meta = { + meta = with stdenv.lib; { description = "D-Feet is an easy to use D-Bus debugger"; - longDescription = '' D-Feet can be used to inspect D-Bus interfaces of running programs and invoke methods on those interfaces. ''; - homepage = https://wiki.gnome.org/Apps/DFeet; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ktosiek ]; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ktosiek ]; }; } diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e37824d241cc..f7dc2874aff5 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; - maintainers = with maintainers; [ pierron ]; + maintainers = with maintainers; [ pierron globin ]; }; } diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index b6758cb0bc2a..a1a02632478c 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -1,17 +1,25 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, texinfo, help2man }: stdenv.mkDerivation rec { - name = "gengetopt-2.22.6"; + pname = "gengetopt"; + version = "2.23"; src = fetchurl { - url = "mirror://gnu/gengetopt/${name}.tar.gz"; - sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1b44fn0apsgawyqa4alx2qj5hls334mhbszxsy6rfr0q074swhdr"; }; doCheck = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ texinfo help2man ]; + + #Fix, see #28255 postPatch = '' - sed -e 's/set -o posix/set +o posix/' -i configure + substituteInPlace configure --replace \ + 'set -o posix' \ + 'set +o posix' ''; meta = { diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 782bff68e349..f4c3237ee7a5 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; license = licenses.asl20; - maintainers = with maintainers; [ offline rickynils ]; + maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 0d052f340958..46a72a32722e 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline rickynils basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index e8435549f4aa..9fba3b43e11c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline rickynils basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed7445..0424b9012519 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 a5e4ac461b48..013ac5180afa 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 7ef1c7a319ca..4ba883f01130 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/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 9532b6e34421..7a3ccaa9fbc4 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mkcert"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "1aadnsx5pfmryf8mgxg9g0i083dm1pmrc6v4ln2mm3n89wwqc9b7"; + sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7"; }; - modSha256 = "0snvvwhyfq01nwgjz55dgd5skpg7z0dzix7sdag90cslbrr983i1"; + modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd"; meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 0d2e813071e6..0c994e88e23f 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/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index b094f05e9516..247733b81baf 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "texi2html-1.82"; + pname = "texi2html"; + version = "5.0"; src = fetchurl { - url = "mirror://savannah/texi2html/${name}.tar.bz2"; - sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n"; + url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2"; + sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; }; - buildInputs = [perl]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ perl ]; - meta = { + preBuild = '' + substituteInPlace separated_to_hash.pl \ + --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + meta = with stdenv.lib; { description = "Perl script which converts Texinfo source files to HTML output"; homepage = https://www.nongnu.org/texi2html/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix new file mode 100644 index 000000000000..10d067e2c618 --- /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/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix new file mode 100644 index 000000000000..6b2c944f7016 --- /dev/null +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, libusb }: +let + version = "0.2.8"; + src = fetchFromGitHub { + owner = "xobs"; + repo = "wishbone-utils"; + rev = "v${version}"; + sha256 = "0v6s5yl0y6bd2snf12x6c77rwvqkg6ybi1sm4wr7qdgbwq563nxp"; + }; +in +rustPlatform.buildRustPackage { + pname = "wishbone-tool"; + inherit version; + src = "${src}/wishbone-tool"; + cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2"; + buildInputs = [ libusb ]; + + meta = with lib; { + description = "Manipulate a Wishbone device over some sort of bridge"; + homepage = "https://github.com/xobs/wishbone-utils#wishbone-tool"; + license = licenses.bsd2; + maintainers = with maintainers; [ edef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index efd6e562c29a..19432843218c 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 570edd8223bb..e6f9da869a7c 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.1"; + version = "1.11.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz"; - sha256 = "0hizfaidl1bxl614i65yvyfhsjbp93y7y9qy1a8zw448w1js5bsp"; + sha256 = "1lmvsis6dk8mccbwpypz9qdxr134gjhdwshxw6q12mi4x3kn6fn8"; }; buildInputs = [ ocaml findlib ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; license = stdenv.lib.licenses.mit; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix new file mode 100644 index 000000000000..137f56bee59e --- /dev/null +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, qtbase +, qtscript +}: + +mkDerivation rec { + pname = "ofono-phonesim"; + version = "unstable-2014-04-22"; + + src = fetchFromGitHub { + owner = "jpakkane"; + repo = "ofono-phonesim"; + rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a"; + sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz"; + }; + + patches = [ + ./qt5-compat.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + qtbase + qtscript + ]; + + makeFlags = [ + "MOC=${qtbase.dev}/bin/moc" + "UIC=${qtbase.dev}/bin/uic" + ]; + + meta = with stdenv.lib; { + description = "Phone Simulator for modem testing"; + homepage = https://github.com/jpakkane/ofono-phonesim; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch new file mode 100644 index 000000000000..e2e9dcebd6bc --- /dev/null +++ b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch @@ -0,0 +1,48 @@ +diff --git a/configure.ac b/configure.ac +index 2436292..993df87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], + fi + ]) + +-PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes, ++PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes, + AC_MSG_ERROR(Qt is required)) + AC_SUBST(QT_CFLAGS) + AC_SUBST(QT_LIBS) + + AC_MSG_CHECKING(for moc) +-MOC="`$PKG_CONFIG --variable=moc_location QtCore`" ++MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`" + AC_SUBST(MOC) + AC_MSG_RESULT($MOC) + + AC_MSG_CHECKING(for uic) +-UIC="`$PKG_CONFIG --variable=uic_location QtCore`" ++UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`" + AC_SUBST(UIC) + AC_MSG_RESULT($UIC) + +diff --git a/src/control.cpp b/src/control.cpp +index e1838a6..880da68 100644 +--- a/src/control.cpp ++++ b/src/control.cpp +@@ -22,7 +22,7 @@ + #include <qslider.h> + #include <qcheckbox.h> + #include <qcombobox.h> +-#include <QtGui/qmessagebox.h> ++#include <QMessageBox> + #include <qfiledialog.h> + #include <Qt> + #include <qbuffer.h> +@@ -31,7 +31,7 @@ + #include <QFileInfo> + #include <QFile> + #include <QDir> +-#include <QtGui/QHeaderView> ++#include <QHeaderView> + + #define TWO_BYTE_MAX 65535 + #define FOUR_CHAR 4 diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix new file mode 100644 index 000000000000..a867e3850e2e --- /dev/null +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libgsf +, pkgconfig +, openssl +, curl +}: + +stdenv.mkDerivation rec { + pname = "osslsigncode"; + version = "unstable-2019-07-25"; + + src = fetchFromGitHub { + owner = "mtrojnar"; + repo = pname; + rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7"; + sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8"; + }; + + nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mtrojnar/osslsigncode"; + description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix new file mode 100644 index 000000000000..7064cb8285ee --- /dev/null +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchgit, qemu, docker, which, makeWrapper }: + +buildGoPackage rec { + pname = "out-of-tree"; + version = "1.0.1"; + + buildInputs = [ makeWrapper ]; + + goPackagePath = "code.dumpstack.io/tools/${pname}"; + + src = fetchgit { + rev = "refs/tags/v${version}"; + url = "https://code.dumpstack.io/tools/${pname}.git"; + sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx"; + }; + + goDeps = ./deps.nix; + + postFixup = '' + wrapProgram $bin/bin/out-of-tree \ + --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" + ''; + + meta = with stdenv.lib; { + description = "kernel {module, exploit} development tool"; + homepage = https://out-of-tree.io; + maintainers = [ maintainers.dump_stack ]; + license = licenses.agpl3Plus; + }; +} diff --git a/pkgs/development/tools/out-of-tree/deps.nix b/pkgs/development/tools/out-of-tree/deps.nix new file mode 100644 index 000000000000..28c6af4586ce --- /dev/null +++ b/pkgs/development/tools/out-of-tree/deps.nix @@ -0,0 +1,120 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "5dd71670cca4bc0ee90371eabd0f1bdba1ac6f35"; + sha256 = "1zq7gq5bhf5w9g43680v2z6j0px366a3gmmk5dyxqv0gyrgcpm17"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/naoina/toml"; + fetch = { + type = "git"; + url = "https://github.com/naoina/toml"; + rev = "9fafd69674167c06933b1787ae235618431ce87f"; + sha256 = "0mpvdnidgab48k7dfq1vaiz1wny8n29y7zxpipnp1zm8ibxpism0"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "e6d60cf7ba1f42d86d54cdf5508611c4aafb3970"; + sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; + }; + } + { + goPackagePath = "github.com/otiai10/copy"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/copy"; + rev = "7e9a647135a142c2669943d4a4d29be015ce9392"; + sha256 = "1fpjyk6zrcdwgw3w93v3sb4xf0gq8w5py6vvlljxgf4gi7k96klj"; + }; + } + { + goPackagePath = "github.com/remeh/sizedwaitgroup"; + fetch = { + type = "git"; + url = "https://github.com/remeh/sizedwaitgroup"; + rev = "5e7302b12ccef91dce9fde2f5bda6d5c7ea5d2eb"; + sha256 = "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a"; + }; + } + { + goPackagePath = "github.com/zcalusic/sysinfo"; + fetch = { + type = "git"; + url = "https://github.com/zcalusic/sysinfo"; + rev = "fbadb57345c2ba8d05d75e81206f665d322c0bb2"; + sha256 = "0556jj50aw2an6a4s4v2n0kk42hbkpgcvd4gbahkdlh4qrqg2r0j"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/logrusorgru/aurora.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/logrusorgru/aurora.v1"; + rev = "a7b3b318ed4e1ae5b80602b08627267303c68572"; + sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; + }; + } +] diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 4c213ed1c4c2..6fa6323d3e87 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 4e73c820912b..9b3fd86b5552 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/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix new file mode 100644 index 000000000000..989107a2fbef --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv +, fetchgit, fetchFromGitHub, fetchurl +, writeShellScript, runCommand +, rustPlatform, jq, nix-prefetch-git, xe, curl +}: + +# TODO: move to carnix or https://github.com/kolloch/crate2nix +let + # to update: + # 1) change all these hashes + # 2) nix-build -A tree-sitter.updater.update-all-grammars + # 3) run the script that is output by that (it updates ./grammars) + version = "0.15.7"; + sha256 = "0q6w8wl4a4s49xlgbv531pandzrj3n12hc1cwfshzcgikx303dg0"; + sha256Js = "11ig4cc2m85siyhafh4hq9sjb5if4gfwsf9k87izkxpiyflda0wp"; + sha256Wasm = "1zm4bvjri8ivhah3sy22mx6jbvibgbn2hk67d148j3nyka3y4gc0"; + cargoSha256 = "0ls9cb2p6cgqvnrmx72n79ga7687n8mzhh7n8n1pzv11r6cah9ki"; + + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter"; + rev = version; + inherit sha256; + fetchSubmodules = true; + }; + + fetchDist = {file, sha256}: fetchurl { + url = "https://github.com/tree-sitter/tree-sitter/releases/download/${version}/${file}"; + inherit sha256; + }; + + # TODO: not distributed anymore; needed for the web-ui module, + # see also the disable-web-ui patch. + # TODO: build those instead of downloading prebuilt + # js = fetchDist { + # file = "tree-sitter.js"; + # sha256 = sha256Js; + # }; + # wasm = fetchDist { + # file = "tree-sitter.wasm"; + # sha256 = sha256Wasm; + # }; + + update-all-grammars = import ./update.nix { + inherit writeShellScript nix-prefetch-git curl jq xe src; + }; + + grammars = + let fetch = + (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; }); + in runCommand "grammars" {} ('' + mkdir $out + '' + (lib.concatStrings (lib.mapAttrsToList + (name: grammar: "ln -s ${fetch grammar} $out/${name}\n") + (import ./grammars)))); + + +in rustPlatform.buildRustPackage { + pname = "tree-sitter"; + inherit version; + inherit src; + + patches = [ + # the web ui requires tree-sitter compiled to js and wasm + ./disable-web-ui.patch + ]; + + postPatch = '' + # needed for the tests + rm -rf test/fixtures/grammars + ln -s ${grammars} test/fixtures/grammars + ''; + + passthru = { + updater = { + inherit update-all-grammars; + }; + inherit grammars; + }; + + inherit cargoSha256; + + meta = { + homepage = "https://github.com/tree-sitter/tree-sitter"; + description = "A parser generator tool and an incremental parsing library"; + longDescription = '' + Tree-sitter is a parser generator tool and an incremental parsing library. + It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited. + + Tree-sitter aims to be: + + * General enough to parse any programming language + * Fast enough to parse on every keystroke in a text editor + * Robust enough to provide useful results even in the presence of syntax errors + * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application + ''; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Profpatsch ]; + # Darwin needs some more work with default libraries + # Aarch has test failures with how tree-sitter compiles the generated C files + broken = stdenv.isDarwin || stdenv.isAarch64; + }; + +} diff --git a/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch b/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch new file mode 100644 index 000000000000..6065aa9e7fdb --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch @@ -0,0 +1,37 @@ +diff --git a/cli/src/lib.rs b/cli/src/lib.rs +index 33a9904f..633032d7 100644 +--- a/cli/src/lib.rs ++++ b/cli/src/lib.rs +@@ -8,7 +8,7 @@ pub mod parse; + pub mod test; + pub mod util; + pub mod wasm; +-pub mod web_ui; ++// pub mod web_ui; + + #[cfg(test)] + mod tests; +diff --git a/cli/src/main.rs b/cli/src/main.rs +index 23e7fc1a..9d784c8a 100644 +--- a/cli/src/main.rs ++++ b/cli/src/main.rs +@@ -4,7 +4,7 @@ use std::{env, fs, u64}; + use std::path::Path; + use std::process::exit; + use tree_sitter_cli::{ +- config, error, generate, highlight, loader, logger, parse, test, wasm, web_ui, ++ config, error, generate, highlight, loader, logger, parse, test, wasm, + }; + + const BUILD_VERSION: &'static str = env!("CARGO_PKG_VERSION"); +@@ -250,7 +250,9 @@ fn run() -> error::Result<()> { + let grammar_path = current_dir.join(matches.value_of("path").unwrap_or("")); + wasm::compile_language_to_wasm(&grammar_path, matches.is_present("docker"))?; + } else if matches.subcommand_matches("web-ui").is_some() { +- web_ui::serve(¤t_dir); ++ print!("ERROR: web-ui is not available in the nixpkgs tree-sitter-cli at the moment."); ++ std::process::exit(1); ++ // web_ui::serve(¤t_dir); + } + + Ok(()) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix new file mode 100644 index 000000000000..b6451bce7282 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -0,0 +1,15 @@ +{ + bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); + c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); + cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); + embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); + go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); + html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json)); + javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); + json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); + python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); + # wasn’t able to check out with fetchgit + # ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); + rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); + typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json new file mode 100644 index 000000000000..c367d24d09f6 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-bash", + "rev": "7b8adcf484e27b6c1a707ce28123e55dd4b7a844", + "date": "2019-07-26T14:05:41-06:00", + "sha256": "047p51ab4fqm55xqss6z74iyj1hlndql97dv9fifckczx3d5xn5g", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json new file mode 100644 index 000000000000..1342f7d092b0 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-c", + "rev": "22decdc361767838dd36f1da4125b35b5b9a3c28", + "date": "2019-07-02T15:49:42-07:00", + "sha256": "03f9g49l4g2l4hlafr3xhvi8d3a491k5zz4bxpq7391l5wgjy3zi", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json new file mode 100644 index 000000000000..8c7d10f2654f --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-cpp", + "rev": "f5afa0ee48ad1dc067ed6fe1aa2cfd2a3ea5d443", + "date": "2019-08-06T17:23:46-07:00", + "sha256": "1w9zjqj232fcagqfqd8qi4kmvr655s4ivllrm27973sda4xq557h", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json new file mode 100644 index 000000000000..89940ffec8cb --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", + "rev": "71955edec8cb762f63e94cf062fc96b52b9ae609", + "date": "2019-07-17T15:55:22-07:00", + "sha256": "1ar2n1z2h194lb3isbdkmvhn8w78j4a62nbh105w3jl1sxb4qpsa", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json new file mode 100644 index 000000000000..6a354f5c2e23 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-go", + "rev": "475571bb5bdb9b229c6be3843d4c71ba747688fd", + "date": "2019-07-17T15:51:06-07:00", + "sha256": "1cg5qpifrvpnsi0iy26g156xib2qa55vlna41hw6c70kx8ibvl9z", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json new file mode 100644 index 000000000000..732d2dda40b6 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-html", + "rev": "aeb2f456b8c6a60b8475d075889d476a165cde57", + "date": "2019-07-17T15:57:54-07:00", + "sha256": "0ba8zi65kja6p7f5h7pa7kxqa3mj29ysjrvl84am24vy5ik4zz3z", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json new file mode 100644 index 000000000000..a1e29e1504ea --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-javascript", + "rev": "a730b5c210904e2e3c1f601125a059fde1b35850", + "date": "2019-08-08T14:13:17-07:00", + "sha256": "1cr0vikbzrklksjj07fh34a5cabkgbpkbxwiw2alnana3zzzdhnq", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json new file mode 100644 index 000000000000..2bb0dcd4d8f2 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-json", + "rev": "337f55be9b9b1ccb0baa7763bfe014a94acea7ea", + "date": "2019-05-23T11:02:26-04:00", + "sha256": "0amh4qrjj3fli9c0z6p61z9d7496sqq54i1gh2vrghgnbbyaa6mz", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json new file mode 100644 index 000000000000..f46695edfa85 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-python", + "rev": "4c22de0944cd42a5c86ade7ef7097033604796f8", + "date": "2019-07-30T15:35:03-04:00", + "sha256": "1p12h7hj1ak15fyk4gw9wcmgzydd4z5mikhjp54mn1q4vfw175p3", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json new file mode 100644 index 000000000000..e2f9928c8702 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-ruby", + "rev": "db91c934ff9d3d4ea67111a0f581532c49c3a6b3", + "date": "2019-07-26T15:51:54-06:00", + "sha256": "1ir1nqpz0c0hnsqzp90w2iw1gy3z3nqil2fm4n3zmid5di7c98dg", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json new file mode 100644 index 000000000000..328b337ed5a7 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-rust", + "rev": "3f956b18a6b0a576ed238cc69d5e3f413bd547b1", + "date": "2019-07-18T11:44:02-07:00", + "sha256": "0dwxg3pqirqm1lvl5x0q9djavfri9ffk5diygqzjnx53rwqhyzj8", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json new file mode 100644 index 000000000000..61507888154d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-typescript", + "rev": "ab9ab6cced868ee3e096f33fa21fd9d356c92e1a", + "date": "2019-08-08T14:27:32-07:00", + "sha256": "11r0vj1dhv0my2cr442mwvaav8ljygsns20w51mwg7328vlz90q3", + "fetchSubmodules": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix new file mode 100644 index 000000000000..aa87df6bed10 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -0,0 +1,68 @@ +{ writeShellScript, nix-prefetch-git +, curl, jq, xe +, src }: + +let + # print all the grammar names mentioned in the fetch-fixtures script + getGrammarNames = writeShellScript "get-grammars.sh" '' + set -euo pipefail + sed -ne 's/^fetch_grammar \(\S*\).*$/\1/p' \ + ${src}/script/fetch-fixtures + ''; + + # TODO + urlEscape = x: x; + # TODO + urlEscapeSh = writeShellScript "escape-url" ''printf '%s' "$1"''; + + # generic bash script to find the latest github release for a repo + latestGithubRelease = { owner }: writeShellScript "latest-github-release" '' + set -euo pipefail + repo="$1" + res=$(${curl}/bin/curl \ + --silent \ + "https://api.github.com/repos/${urlEscape owner}/$(${urlEscapeSh} "$repo")/releases/latest") + if [[ "$(printf "%s" "$res" | ${jq}bin/jq '.message')" =~ "rate limit" ]]; then + echo "rate limited" >&2 + fi + release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name') + # github sometimes returns an empty list even tough there are releases + if [ "$release" = "null" ]; then + echo "uh-oh, latest for $repo is not there, using HEAD" >&2 + release="HEAD" + fi + echo "$release" + ''; + + # update one tree-sitter grammar repo and print their nix-prefetch-git output + updateGrammar = { owner }: writeShellScript "update-grammar.sh" '' + set -euo pipefail + repo="$1" + latest="$(${latestGithubRelease { inherit owner; }} "$repo")" + echo "Fetching latest release ($latest) of $repo …" >&2 + ${nix-prefetch-git}/bin/nix-prefetch-git \ + --quiet \ + --no-deepClone \ + --url "https://github.com/${urlEscape owner}/$(${urlEscapeSh} "$repo")" \ + --rev "$latest" + ''; + + update-all-grammars = writeShellScript "update-all-grammars.sh" '' + set -euo pipefail + grammarNames=$(${getGrammarNames}) + outputDir="${toString ./.}/grammars" + mkdir -p "$outputDir" + updateCommand=$(printf \ + '${updateGrammar { owner = "tree-sitter"; }} "$1" > "%s/$1.json"' \ + "$outputDir") + printf '%s' "$grammarNames" \ + | ${xe}/bin/xe printf "tree-sitter-%s\n" {} \ + | ${xe}/bin/xe -j2 -s "$updateCommand" + ( echo "{" + printf '%s' "$grammarNames" \ + | ${xe}/bin/xe -s 'printf " %s = (builtins.fromJSON (builtins.readFile ./tree-sitter-%s.json));\n" "$1" "$1"' + echo "}" ) \ + > "$outputDir/default.nix" + ''; + +in update-all-grammars diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 6b1918a5d982..8f711e14654d 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/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 9292d124545a..6af444c7ce04 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "quicktemplate-unstable-${version}"; - version = "2019-01-31"; + pname = "quicktemplate"; + version = "unstable-2019-07-08"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; - sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; + rev = "840e9171940bbc80bb1b925c880664cababae022"; + sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04d..43b3a88f6ee3 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.15"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "155b4azkrr0qfg52mk7934zavwsbl28i28hi1inb23d509hrr5ky"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "050q4rk1x3jghinxg6gszi993a6zbg41vg535dlvvsqi36l278qc"; + + 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 56f550e37a21..5b73752659bb 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.1"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "1wsams41zl56mkb8671n5fqkkchs68jd9nvfzry8axxiv7n175gc"; }; 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/850e9830f4ab4bc65da6eb5cd8b0911970a7739f/cargo-make-Cargo.lock"; + sha256 = "0knmzplxmh8vksmpg56l2p1a10hpqbr9hmbk3hv0aj63125rhhqy"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "18j0nflf997z4nwdxifxp1ji1rbwqbg6zm2256j21am4ak45krsy"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index b1ab9253fd8b..b2f6701be876 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/racer-rust/racer; license = licenses.mit; - maintainers = with maintainers; [ jagajaga globin ]; + maintainers = with maintainers; [ jagajaga ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0190283e7916..79afb54bfb70 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.0.0"; + version = "2.0.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "18mf23ssy4lwvsi4pg6m4b003paz5yds5vs7nhl0bfcq57xg6qj1"; + outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d5a6f3915f2e..58dde8386921 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -1,10 +1,10 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "skaffold-${version}"; - version = "0.30.0"; - # rev is the 0.30.0 commit, mainly for skaffold version command output - rev = "fe31429012110e6fd70f97971288bd266ba95bed"; + pname = "skaffold"; + version = "0.36.0"; + # rev is the 0.36.0 commit, mainly for skaffold version command output + rev = "1c054d4ffc7e14b4d81efcbea8b2022403ee4b89"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1"; + sha256 = "1d7z36r33lmxm5cv1kby6g9zbsr88prgsp32x4jcs9l1ifwblhng"; }; meta = { diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 35ba9f8c006b..e0a078415eb5 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitLab, cmake, luajit, +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, qtbase, qttools, glm }: -stdenv.mkDerivation rec { - name = "solarus-quest-editor-${version}"; - version = "1.6.0"; - +mkDerivation rec { + pname = "solarus-quest-editor"; + version = "1.6.2"; + src = fetchFromGitLab { owner = "solarus-games"; - repo = "solarus-quest-editor"; + repo = pname; rev = "v${version}"; - sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c"; + sha256 = "0dq94iw9ldl4p83dqcwjs5ilpkvz5jgdk8rbls8pf8b7afpg36rz"; }; buildInputs = [ cmake luajit SDL2 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { openal libmodplug libvorbis solarus qtbase qttools glm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; longDescription = '' Solarus is a game engine for Zelda-like ARPG games written in lua. diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 0ad7d7f78d4a..d24c3e88b8cb 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "statik-unstable-${version}"; - version = "2018-11-28"; + pname = "statik"; + version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "rakyll"; repo = "statik"; - rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; - sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; + rev = "925a23bda946b50bb0804894f340c5da2b95603b"; + sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index a348e295933e..1deb2c7a8fc0 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"; }) ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/symbiflow/prjtrellis; license = stdenv.lib.licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ q3k thoughtpolice emily ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 0768e98f73bf..b0ede63fb6c1 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "3.4.0"; + version = "3.4.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1j59az9j37a61ryvh975bc7bj43qi3dq0871fyambh1j2mby00qn"; + sha256 = "1gyl5c86gr5sv6z5rkg0afdxqrmsxmyrimm1p5q6jlrlyzki1bfs"; }; # don't remove runtime deps diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 4b8a79c6190b..91b4fe15e5a0 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/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 22404481f35c..24e04842dc9e 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://remarkjs.com; description = "A simple, in-browser, markdown-driven slideshow tool"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; broken = true; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 4bdfc87d8da7..435329bdc4ab 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/anki/default.nix b/pkgs/games/anki/default.nix index 2530202a565e..b0efc54db363 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -92,12 +92,9 @@ buildPythonApplication rec { checkInputs = [ pytest glibcLocales nose ]; + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; buildInputs = [ lame mplayer libpulseaudio ]; - makeWrapperArgs = [ - ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"'' - ]; - patches = [ # Disable updated version check. ./no-version-check.patch @@ -157,17 +154,23 @@ buildPythonApplication rec { cp -rv locale $out/share/ cp -rv anki aqt web $pp/ - wrapPythonPrograms - # copy the manual into $doc cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki ''; + dontWrapQtApps = true; + makeWrapperArgs = [ + ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"'' + "\${qtWrapperArgs[@]}" + ]; + + # now wrapPythonPrograms from postFixup will add both python and qt env variables + passthru = { inherit manual; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://apps.ankiweb.net/"; description = "Spaced repetition flashcard program"; longDescription = '' @@ -185,6 +188,6 @@ buildPythonApplication rec { license = licenses.agpl3Plus; broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ the-kenny Profpatsch enzime ]; + maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ]; }; } diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 085bad674c79..8cb583e07d2b 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/btanks/default.nix b/pkgs/games/btanks/default.nix index 9de90069a375..5bb7cfa215bc 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,34 +1,43 @@ -{ stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGLU_combined, zlib, smpeg -, SDL_image, libvorbis, expat, zip, lua5_1 }: +{ stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGL, zlib, smpeg +, SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { - name = "battle-tanks-0.9.8083"; + pname = "btanks"; + version = "0.9.8083"; src = fetchurl { - url = mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; }; nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; - buildInputs = [ SDL libGLU_combined zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; + + buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; + + enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; patches = [ (fetchpatch { - url = "https://sources.debian.org/data/main/b/btanks/0.9.8083-7/debian/patches/gcc-4.7.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks"; + sha256 = "0ip563kz6lhwiims5djrxq3mvb7jx9yzkpsqxxhbi9n6qzz7y2az"; + name = "lua52.patch"; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/gcc-4.7.patch"; sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4"; }) (fetchpatch { - url = "https://sources.debian.org/data/main/b/btanks/0.9.8083-7/debian/patches/pow10f.patch"; + url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/pow10f.patch"; sha256 = "1h45790v2dpdbccfn6lwfgl8782q54i14cz9gpipkaghcka4y0g9"; }) ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; + homepage = "https://sourceforge.net/projects/btanks/"; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index c77e0c8b4850..e0f35fe6d6dc 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/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index c8b85da213a5..68dbe12bb733 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "easyrpg-player-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "0b0c4wwqldjf37sf7zldnbgvfmyqcvpjvhs949gb3r8i5cffzm58"; + sha256 = "0w4a4jg3py0phsp99nl7abyd31salnc57w4l05a228imvyy0maia"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix new file mode 100644 index 000000000000..7a720239182d --- /dev/null +++ b/pkgs/games/gnome-hexgl/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, ninja +, meson +, pkgconfig +, gthree +, gsound +, epoxy +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-hexgl"; + version = "unstable-2019-08-21"; + + src = fetchFromGitHub { + owner = "alexlarsson"; + repo = "gnome-hexgl"; + rev = "c6edde1250b830c7c8ee738905cb39abef67d4a6"; + sha256 = "17j236damqij8n4a37psvkfxbbc18yw03s3hs0qxgfhl4671wf6z"; + }; + + nativeBuildInputs = [ + ninja + meson + pkgconfig + ]; + + buildInputs = [ + gthree + gsound + epoxy + gtk3 + ]; + + meta = with stdenv.lib; { + description = "Gthree port of HexGL"; + homepage = https://github.com/alexlarsson/gnome-hexgl; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index ed24f44356ae..043be5e23d9b 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "07mkh50gnprrq11kifibvf5yq1hgcqkj7nzprl5kjgjwwlwd76x6"; + sha256 = "0ifc10y8pdxb6ra38m55k26wb2cwdbjrblx3s24xivmsnkpbn7f6"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index a95f88e59b2e..e6fa064f387c 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,12 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; rev = version; - sha256 = "0a9ciqi73ihw17qmp8l5134py5gjjrdnrk50syl2mllsc1iqj4kf"; + sha256 = "1i160rmsdvrcnvlr6m2qjwkfx0lqnzrcifjkaklw96ina6z6cg2n"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0f045faf371e..d2f1e27b10ec 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/openmw/default.nix b/pkgs/games/openmw/default.nix index c57fe642dc3d..8cfcb1478288 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +{ stdenv, mkDerivation, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let @@ -10,7 +10,7 @@ let sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); -in stdenv.mkDerivation rec { +in mkDerivation rec { version = "0.45.0"; name = "openmw-${version}"; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 1049b10d0b19..68d0f642aefc 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitLab, cmake, luajit, +{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, qtbase, qttools }: -stdenv.mkDerivation rec { - name = "solarus-${version}"; - version = "1.6.0"; +mkDerivation rec { + pname = "solarus"; + version = "1.6.2"; src = fetchFromGitLab { owner = "solarus-games"; - repo = "solarus"; - rev = "v1.6.0"; - sha256 = "0mlpa1ijaxy84f7xjgs2kjnpm035b8q9ckva6lg14q49gzy10fr2"; + repo = pname; + rev = "v${version}"; + sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77"; }; buildInputs = [ cmake luajit SDL2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Zelda-like ARPG game engine"; longDescription = '' Solarus is a game engine for Zelda-like ARPG games written in lua. diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9f0ac916751d..5c73e458c1ac 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -48,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 @@ -83,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; @@ -246,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/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 76a472eb3b38..bb4decfda4d2 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,1854 +4,1854 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64"; - sha256 = "b07a7fb80789c44bbd3e6d13ea52a35bdba8c6763ff2f8467440358f9d247961"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_amd64"; + sha256 = "ffb6ecd54fcfa71c1b0e424993d0bda460c988b1794c71bd18a1b38fe20f518f"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64"; - sha256 = "b9e40df159aa578f88fde2f63abb78ead8bb8bf8ce1eb214e55330115aefb722"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt6_amd64"; + sha256 = "fd8f63c5b1b6ca45525c3fc8b47cdd4b2a9598825cbf0239dbbf6534c6c88ac3"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; - sha256 = "000b4548744f9268f48f7cc7511d4da4c17130c3ed2596a4f2d226df7e71b499"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64"; + sha256 = "5536b70afbf1d8337be4c3923feb6943210452a0ec0b813e761148f7c6754f66"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt1_amd64"; - sha256 = "9e49b2fade9ab9f7befdfe96655c4fa259d323ed70e948f81b49c9abd1a194ab"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt1_amd64.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "7a83c2837bedbf1713fcada1b662fe00fd35128a5b473a9476a6ef5117a8851f"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64"; - sha256 = "9eceb8364749a078932c022b4f5156e72e12fa6252d075b83be3b9cc5a534af0"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt6_amd64"; + sha256 = "b3662d8327d2125c131960fda3025ebaf4c8eee2d1050b29d00c07788185d7b5"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64"; - sha256 = "4ea2b5fdc76c0313307a4facee08b149ce4e29039ffbbf28311c7f018aa90b3b"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_amd64"; + sha256 = "5a080ffc6aaeaf534ec417690b38e0774b8ee2abef27e039d2bb99f003757746"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; - sha256 = "21db80f60a87a31e55cd5504f6100d5f0e85963799fdbaa7766e483a5019a415"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_amd64"; + sha256 = "ff475fb9fb6f99f2bafba816365d3c73b1d7c43a7757ba1cdaab83f0c1dd0e55"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64"; - sha256 = "5214d9a356e4ecd87875b460709f41f4d02e754ae8fe794db22aa672b737d72a"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_amd64"; + sha256 = "569b7e36f1cfe20320d2701573d16040e94f988e78cc5294ad308fe462d62af7"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64"; - sha256 = "b77ef6a82c1ffefc25a703ed7d1238117ab9cbe08040771e2b926dc2dcd043a7"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_amd64"; + sha256 = "6186fe0e57e9d19e6e3bd85786ebf0bbe0c85333d187d8fa4fb9ef7b1d24a0e8"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "68414d37c56ecd736f3f324e6f6de51a470a5862a79fdc00f97155343c4c2b56"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "482beec798f517ab4f58a898bc5ecec64572ad22e6f694a5f716c17289556484"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64"; - sha256 = "5e3dfdd7a5d318faa34af21e5536c3c02efe66a72577296a265a03c1a88ca415"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt3_amd64"; + sha256 = "66ef2c49e4d7a25ad0e3e04ef3105150f7a70a99f14d1ae7a1c1a8a6c324bb15"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64"; - sha256 = "95fb4fb8c570debe6da7f515b3aff2d33f6e06ec0a189506606938adcf4f4ab7"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt3_amd64"; + sha256 = "019bd4bf086b573eacf9ddc9c75527f3e8b91a338e6db50b6c9c97435bf55faf"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt5_amd64"; - sha256 = "f7a878597f1caff3c0e66f0e072b5711ef6c700d1bcaa76ef0c3fbac4fa5cf02"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb"; + name = "libasyncns0_0.8-4+srt6_amd64"; + sha256 = "308bdf466ad5ce87f2a27712d4e4a6e41747d001fc0ded53760238357e14dec8"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64"; - sha256 = "64828e036f68114544211ecedb15f558adb323c49aaad717a7fcd6ce6e9a49e7"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt2_amd64"; + sha256 = "925f2a756aaf0a5df10cd67f1cee965e813a1556076a1d72904d32531e37a675"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64"; - sha256 = "7643093860808413a2d844ec83577689a7e5c17b7d8442318e02d9df18c329b4"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64"; + sha256 = "d33b00c3e19337f3abbb070f646adda7420f171f5487dca5e253b68b63a4d8fc"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64"; - sha256 = "8894d3887993f940ad9c89b0506d480044f30f16bff32532ed79047a55543313"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt2_amd64"; + sha256 = "029084e3bf5b2a3756b80a1f01c544c59e20f940df025fab366315ee57362955"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64"; - sha256 = "333fad3b34baa24830a470ce52850c4e54562807da9ffc8a51561c30f4295da8"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt2_amd64"; + sha256 = "74e66fe1aa34c4c01b3f97ae66c8d70729041010239b9a29aa44e6a9267224d6"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "2202dd8649cc573a340685a02a8f6aae48515340e609cc63315bda82adb6f572"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "640d2e1da02b06f0eb07e8523c3e0b80e2cf8e2267e6a108e764608e8ea84567"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "26a07e0d0178450a5b30d63d2ae6f618a372537f9aca28dcb9eab00721acfdf6"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "ded33a41e70937a85e182146f9250de70afa82382ef9ca6cf5821fcbcf1a7bcc"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "4b28e98b1871fd88170f0965bd255e879d6738681d7e54ea8ed62f0d69e91b2d"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "917fddb6d84cc2d8653d231790fd0f6d156d9952dc7d5943594264b27e6123f8"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "4aa9573d39504d1c4173b4578e34063f48ebab82455e6ef3b7fc65a09d6d6bbc"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "8926a2b4ad3455bd52acd79a1856bc56f30dbe0ae707799145bc202d790d98a4"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt5_amd64"; - sha256 = "dfa6804a194a484d3a8a1a263447188149d26b287ad2a5326dfe7e663d01de10"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb"; + name = "libbz2-1.0_1.0.6-1+srt6_amd64"; + sha256 = "de6070b158a146130fbcb658c29e15b48b54fa9b30e36f63a624c38e8a37eb53"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64"; - sha256 = "04cfbe6905db98d012ef7bd6e2cb9f954a836f0bbddba1c5ccba3b98e87f02c9"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt6_amd64"; + sha256 = "ae0bccbd5b92c8973e217b4ef3d203f4a70bffaf9849218c70f869ff875abe41"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "26ee106ae63b85940b0ec5a997ed320875cbf55280b13585c54cf03ff4c4ae82"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "9daaabe65bf3a1f6c025f12dfe435a987ad1818c924581167d225c7ee1176e20"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "b8dbf6069f10c124e101827e9355fed29502605de339c536e394b743be51a7c6"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "42c3f2eae158e44c20969ae5faec17fe33732ff66ca4d21b824abd98b7adcebb"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "380ef6beaafb997365779c7e0f32b9dbac51e134407fc6b5bcd62c7fc26994ae"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "5897f63afef8ca38ccff2b9a3a125962515b0c662cbff6779520a1170381dcc4"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt5_amd64"; - sha256 = "fe725e13db6db7e45c960f560388380a4e5d84477acbdb0e37399e2bf6ba522f"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb"; + name = "libcap2_2.22-1ubuntu3+srt6_amd64"; + sha256 = "f662a8f54a17393aa3933d160c2622b1f5ce2524d791aa5555986c056842af47"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt5_amd64"; - sha256 = "2b570e1df87a75399006e0d4d48569ef8cc70c05e6935637ad1bde99276194b4"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt6_amd64"; + sha256 = "6e627aa3ff1724ec8759431f3ead530f4c1511eb2b881d168a1929c8eac2e196"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt1_amd64"; - sha256 = "326c086493ea51a5aad78d52994dcae849124d5ed52cb89de5da8c6e848b766b"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt1_amd64.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_amd64"; + sha256 = "c1169c34025975c72ea3f10034aab4d105d14ce345677c1736c951311433a787"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64"; - sha256 = "4950fbfe5fa9fe5f169fc4541df034aa51ad26eb61529c5b0f3f2251dad84e04"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_amd64"; + sha256 = "2e3156827d1d62c9aae38096114ad285c3b3e931b74248a9d88e3aca7f1661e2"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; - sha256 = "f1832f639bfdf46549ce6ca9d3578b2479946772f6858077575a27aff0365efe"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; + sha256 = "a3c56793a0751a819897d5cd40562e0bd04b0c1fe56e4f865f0f1653e7190bab"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; - sha256 = "28c646abb645155fd27feaa1aa1d77e72aca388b176087b94a9621336fb52995"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; + sha256 = "0692b46e931815d81421198c35b9c0923d7685c3d2541ad8cc3251d18981305d"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64"; - sha256 = "ea5b230bcab9e5be85315279f4c4c36eaa0650b3308cb97ee8282da3051638d4"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt2_amd64"; + sha256 = "dfe95df67d3777935d834a8008c10135e264c5d6f351e05bf8a716277b6dc27e"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64"; - sha256 = "132a5d8e900444de56fc9972304470f09f30f7a6f7fd082b76191650b0df66b8"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_amd64"; + sha256 = "99654df8544d529f99d7dd1c1f33130ee0559e9eea7d11be482ffc708df18be0"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64"; - sha256 = "7f4109719cec113c767e9ae69a88677cf29c8fdc6682e8af9c7cb72c17e69c18"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_amd64"; + sha256 = "306683272e142aca19af212f7cb880a8f61df049a03f3dfa98e7a0a6fd4e7af6"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64"; - sha256 = "b8ff1f1888345f142d7d6793cd3c9a65492b6e0ac2ebe464567119280f554f6d"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_amd64"; + sha256 = "abe8a9e28aae2486618c88807099f61a207993bf69fdfdf53241705a14697de9"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64"; - sha256 = "27972c0e43e0da7905f6bb99372fa0b0e5fa62d71d51ceee572678bd9d173397"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt6_amd64"; + sha256 = "adb05c68a77601a6c133d8bd2fcd0e6dccc7fd9e75b70b191e0fee26dd03c1ae"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64"; - sha256 = "c2eff4ec5f4a0178a815ed13db37f2523b2533e80351afb7a5b3ae0b842bb65d"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt3_amd64"; + sha256 = "a34f7459aec8881fac938cf0effae996731ad7de5ffa452747b890238e81a9bf"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt5_amd64"; - sha256 = "3a5977b1f1fed34698aaf547d21fafd15625e43e0d787d135095267d86428244"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb"; + name = "libffi6_3.0.11~rc1-5+srt6_amd64"; + sha256 = "20fd1ae66aec76d8e70bf144b910c5b5e2acb426bfaef0f91ab48002c31ef0dc"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "026eeff020f51920406340c0942bf1a9f3ab50523db01c92b3a3eabef88c138e"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "11299782d3bf532468cdd2c1599a170b8f2704a9efb44f703b68d7434a44dc57"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt5_amd64"; - sha256 = "12ed3c0a1796ebf9239d463c3d52d2076633b3a24f836ba067b0d05c56153d7f"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb"; + name = "libfltk1.1_1.1.10-10+srt6_amd64"; + sha256 = "d730436f36dfaa7084ae920b74c66e647d35824e5c15af5614a96ccb5681b4d1"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64"; - sha256 = "52ab410845cfa4fac8ed46fab34e25c24870ff09241ad496353d78d4549a7ae0"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_amd64"; + sha256 = "304987ffdaf6834666a1fadb7af2eeb9d73d9f07aecfccd3426d9b51c9a05d95"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64"; - sha256 = "1c84c28b782b2f1f05a5e6335286ccf0a012e5062b707f5038f1b4b4226fe407"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt2_amd64"; + sha256 = "d1450fd3f275513d5721d92f142439e88a5e544ccaa05b33abe5a68f802ee44c"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt1_amd64"; - sha256 = "900c11735725034c857c79b59f35f53bf0eeec8d3e59faef01163dd3ab7af4b7"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "5b62d49aa9ec9cd8ca7af2e677cba9714be641cbf6eed9835a48a65fc8cd79fa"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64"; - sha256 = "c736608948357993c1cf2619b0a0ea466de1bdec5a2cc0e347620ec756815edf"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_amd64"; + sha256 = "086f7ba27b92e13149970230a8ce6e30b41c9cd3585ad9dc075114e37d38ef6b"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64"; - sha256 = "0c266bcb26ee44170d2b912927ddcfd710c3935f40309457843fd1d21df73b5c"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt3_amd64"; + sha256 = "cfbaa394f5b70ef67bfe69dbe4b3e1232493f3f9558e9f325a82606c5ca10d95"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64"; - sha256 = "0557a2cd2bb5700725ed0242b7169c5f449f22e95973387fa28a2faf20e0a2ce"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_amd64"; + sha256 = "87c93570fafa2c53e86fb2b0e047823cfa59f4e704155b22865237e9bdb26e38"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt5_amd64"; - sha256 = "fc7c92ec95943ea6f904fcc477821e99f8127786dbebe19f39d562414684f341"; - url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt5_amd64.deb"; + name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "0b6d862d319bd494656d859847fd1e79cd67334ad26bed7a5d32580e28e42752"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgl1-mesa-dri.deb"; }; } rec { - name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt5_amd64"; - sha256 = "7257a5ef7a5e0bb0a70f435e17a50989e497dbe02bc0a15d9dd1747a2ae2cb39"; - url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt5_amd64.deb"; + name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "477764d0cccb49972bbabf3b23bed76fee194e95067d5e32e136e542388fb244"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgl1-mesa-glx.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt6_amd64"; - sha256 = "800aa6eb27c42dec4c429c45ccd58f0074e41c7686a3279f4c20e5ff1d2f89a7"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb"; + name = "libglew1.10_1.10.0-3+srt7_amd64"; + sha256 = "87b1eaba67db9b0bc95af86474cfb3ff58bcfde79dbe6b2109f4d2d8b3ce55f4"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64"; - sha256 = "9b39d3400ba9c837dcd01357bfb29a8082c795d65954c5f5acb88adb902a046e"; - url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64.deb"; + name = "libglew1.6_1.6.0-4+steamrt1.1+srt2_amd64"; + sha256 = "fe4a558b78d54fdd47cee908d49eccfae21cffa612e1f0c0ec5f6a56d8ac4ab3"; + url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.6.deb"; }; } rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64"; - sha256 = "630c47b0052c0dc25f5c76f9806d4736f3ba0c7ffcc8611e2c780fea2f030bfe"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_amd64"; + sha256 = "5668f2b4fc30179312c2b83117f692dfef97cfae8303c6336dd3f03289471c02"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64"; - sha256 = "5ee4bd6aef43b65cacb350ee51dfeb306cb2e585a0e18803cc93ca02d1e3de09"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "2e137819d70e788476d96532d59da39de8de084386d59e05c37ab0cc60723076"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_6.1.0+dfsg-2+srt1_amd64"; - sha256 = "5a1d6d3a757c1a670cafcd6795a2c2e97e051aee3b7058edfab788dfe87d18e0"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_amd64.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt2_amd64"; + sha256 = "c768e53e58f4baf44707c79cd3c00320f974674a544fd384a8575a4243773689"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64"; - sha256 = "2ff5639ce90b928b1f681424503a59e929f1129185444ea33159c040630e54a6"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt2_amd64"; + sha256 = "6dfc2c19deeaa0272a291d7b3d4fee5ee57b36806b578f1b43f82ab9708c5fad"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64"; - sha256 = "c4eb9fcb5bbc16a7bb13c886f1e623ce6506c64cb6697adcad9e29d00f0c35a8"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64"; + sha256 = "3fb1f7644d1c83c1cf2271dd6e30dde50adf5ada859530431d205ba24cef8734"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt1_amd64"; - sha256 = "2ce27527cf3da680305e7f1488ccb85a18b270551e69839b4dcbec817e8dd511"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt1_amd64.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "5cc4b7fbddaf915f8024038e13f4d3d13c939295857d5d771706063ef7c5ffd0"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64"; - sha256 = "fe26c864db847cef75147394f9a869be4c6de00d6b598ca78a5e6f9cb72efbdd"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt6_amd64"; + sha256 = "9119af854fbc1228975cebafbd1bf232c421b4929a8928d2a47d3adbbffc047e"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "ecff8ea7262cc7b03b45b520d30e99687b729168adf94e75b5752708f43869db"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "cf5f6fcc04896db6d215edcd5503a71460ac4f5109fa74036147aa9bb93a1a35"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "3e2e86ebbe7fe999836bc526ed472703aa63008472358316fa579ec73976070a"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "6492aa21a54ef1c9123df4e30cd35f5ecc096bf519f359bc1a19a93513d42646"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64"; - sha256 = "2e7cac14196492d42674f819f42367d3a4736f4aa43bb3419c7dbd2d81ecd0a0"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_amd64"; + sha256 = "4ef292b7e2e1e449f795a7204bc114c4f4cfcc3a8d34aaa85f7effbb967033b6"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64"; - sha256 = "5d8715e20919cbf2e857d190b7d7bcc0edf604d45e44d5517b7280138c69aeb5"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_amd64"; + sha256 = "0d3c7975c6ad6306a8010d807ceb31e3b90804c9cca39d639362e8d5c72e7f8c"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; - sha256 = "20d2ee6de2943353b3becb0af5c591b68f7738d5289bd5aa4a2aa54687f367ad"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_amd64"; + sha256 = "bebf7d4a6e0629873dab280de0189bf2d6add5b1816715153aba5ecaba33bf10"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; - sha256 = "9db44526834e0f1ba54822d42e7140bf2c74780f531242e05206c968828f8867"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all"; + sha256 = "ee703928f39124739c01a456c727376378b9e75ed1a3f3c1d7022a2299350262"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64"; - sha256 = "1c0c1887a4526e9721d0ae03d2a985c99f02673235f279c2da437e62883f13c5"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt2_amd64"; + sha256 = "a2cf13c7c60f1deb922471ccac26f5674df0f54cf19e7f1ca50f79b573a345de"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "e8c778117583c8ed05547d1fed131373c2c9a9a94aa38e3bcf2b530fe3681fc6"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "d1e22d92539b1af50bb7d32f8e15418092b51e6578012eb1a52080cf89433a83"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "f1ce5484fcd75d7f697a64956a1023c9dba99b45fe47d708de3ec102db3790fc"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "5774c538993d0a7e23cc5e8863bb9243f17899b2a861b8029c44110d80228f4c"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "e9d8aa4374e99969a3196ffadcc84093646e407274771878a161317f10aacf8d"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "f4dc8cc860389827d82aa1d2983ae8b6afd2553132253d6da79d618e1ea1d00c"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64"; - sha256 = "cd39b0bc4c85f8814a5bf53c9c6c0c45f26aa80358248144734a2aee962127b5"; - url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt2_amd64"; + sha256 = "a8411a24f3314b11a25f249bb5390a31e7485d81e5941b8823ad0e67af033c32"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhogweed4.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "492e6e3bb321862ef08c1652d48ee33fd1a8d3daadc568500e28c0e3f47c8a2a"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "90943a0b1fa563555b3b92805b4ef24cf82557ca3b6cda3aac8d703a008b4372"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt5_amd64"; - sha256 = "1ee9db50c4a2c9e597604c558c03844dca8d31d1b80f11fdb0c82fa357232a6c"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb"; + name = "libice6_1.0.7-2build1+srt6_amd64"; + sha256 = "b4971686dc20fabbaf3cda5685e627ce9605318eb5ab4b3e5a9895680dba7290"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64"; - sha256 = "b462a6d8e49c4dd234da2afac81f589f4171201969d21c4811a792be397497e2"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_amd64"; + sha256 = "18011ae05a4dbe00d4deafb63dabdf0416c1fa2c202d3c0e6ce840d96001f4f6"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64"; - sha256 = "ef82de181ae81cc610be9fe8e84f2d8ee72fac8a2de5c56490c88333ab0b9239"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_amd64"; + sha256 = "ee7da6dda4a701bb1e98b22233c27e923050f4cfe6055c96e31b7a13fa96743a"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64"; - sha256 = "0fc64bd185ee8760010feab0965633d10ea8b3aaf67b1daaf1c43bab42bef162"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64"; + sha256 = "9a419baf1b88386cf643ca64965de607321e5d27f13c5bd68be0eb1a803fd7a9"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64"; - sha256 = "be8c07bb78b01a3d22b433748434cc2c20a096ddced27da16912f75eea482383"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_amd64"; + sha256 = "682e8d47031aa046787624eb5af560093f6cade3fdc5edcb5875e89ff7cb9d31"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64"; - sha256 = "34eb4c70782fdfb60445aaa0bf861e371689404aba6134cb64fb95c4f0a3c972"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt6_amd64"; + sha256 = "5c931fb6c272af3cefa723a6ba30f55d477c50bd07f6695be4216f2a13ea49f0"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt3_amd64"; - sha256 = "0af664e4baabdadce80ae8ca06597652e5e8ef5574e21ec89383a73f0c6316df"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt4_amd64"; + sha256 = "a72824685bfa0dc7fab313606d1fcba41565363c8f90d22c7e90d3f35a74859c"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "08a23bedf307f22f3977fb74651a69571da313dd35e720f34a7f68025889aea3"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "9d638fd0f44307dfab7b295a53715b199854b71f52b269369f6bb492d7da295c"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt5_amd64"; - sha256 = "5748dbad8f83e13e9cbf66f082c7ce57d5caf9514a923ce89adf815c4026bb92"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb"; + name = "libkeyutils1_1.5.2-2+srt6_amd64"; + sha256 = "2fcb1c31e273de0780db4a07b4ec6272adba221ec3ea40821e4744b86adf5313"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "78ac69fee15abca007c6a6c4c49615a8727942025c48eb74324c5b7a9c201f76"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "374b317da50e4ab1688a3514649fbe572d8d73d0e0430c4bd739ce0443c04f5f"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "e3f847f9ea9e58bb0e4241d6be999e27534c5ba5c51e9d8e07c1aa5cce096dcc"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "3071c486de82102fa73ac263c5d78cb8df1ff6ced3450fd9baf564c4b345b89a"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "b9eeeb7c88c47b56fe30abceb5f2dea087ac1310474cac70f3741461dd1bb4f6"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "ba1732a8fb0f64c0cc8eb2ddf5512ad246ec0c31962d84fa91db55fae5756c45"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64"; - sha256 = "af26e984bd3590ad96212e83b1ad98fe85bc72c20bc40bb4a322682ea2274272"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_amd64"; + sha256 = "e55aacce445cf1ac31d1ef35a3b9aa983e9ca18626b0aa28cdfdc3a81ccd5cc3"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64"; - sha256 = "407ce3cd7a9356638c416e2d9b5851d9a6fa23e366234394d79c5fb5e081850b"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_amd64"; + sha256 = "487df425cab50adae8d9129eaabf4b52f2332f574a200a582fc808cd72bc3ba7"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64"; - sha256 = "6bfdc9ae5b436158a3fef1376456a83dd8379835a9e74a8268c0691a7bb9c953"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt6_amd64"; + sha256 = "f9c6d0ae41527a42576fa16bb170f90e8deb86ffb16c3b78ac8e237400901a33"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-5+srt1_amd64"; - sha256 = "7535ce4399ceb6e8c54cdab7221805ea2e03ff5c2e994a215c57fff71b8fb04e"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt1_amd64.deb"; + name = "libmikmod2_3.1.12-5+srt2_amd64"; + sha256 = "d9fc387579b30b3c555ba2a1706db3956957c0f2e25ef896c4d5bb8c13ff7a6b"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libmpg123-0_1.25.10-1+steamrt1+srt1_amd64"; - sha256 = "a35b2bff30345f6c128214b76144e9d6011b533a525e09d0a4acee433364f4eb"; - url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_amd64.deb"; + name = "libmpg123-0_1.25.10-1+steamrt1+srt2_amd64"; + sha256 = "4dff7550d1eb7666fe53d4705736c7c4760dbbfe8b24483956ca1da62a0876c8"; + url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmpg123-0.deb"; }; } rec { - name = "libncurses5_5.9-4+srt5_amd64"; - sha256 = "d73125573141201c3760677b79dfaa53e466e619921dce9c3212367ced0992ac"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb"; + name = "libncurses5_5.9-4+srt6_amd64"; + sha256 = "6c342c8e35ab535c2dd20e1f26001e46363ddd4e55b1abbb94d3eee9688b6dbd"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt5_amd64"; - sha256 = "46138edfc5800cac3213eed1a765be1fd14ed53ae526d0478ee6430473f95b3d"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb"; + name = "libncursesw5_5.9-4+srt6_amd64"; + sha256 = "8efe94b4cb6fb8b137ce87996b263a02d0ca97572025874df0f67ce3072a12ed"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64"; - sha256 = "9cb7f91d3f244605a3da652beed1840f50a9e08157e8ea3a14ddda3a71f5c9a1"; - url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt2_amd64"; + sha256 = "18f8ac5721849072980c7f8cdffdf2eac3c8621f3aff02bc32fe1945e2abf0ec"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnettle6.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; - sha256 = "63b22c6872057c5a97cc9bbc68c933efc42adbeba89400248be60f15b9ab8037"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64"; + sha256 = "3bff5db8467fe7289dc6569e6bd78c733dadb4569ebb2e6e6484019d347a53cc"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; - sha256 = "7a43a5cb670c8969707f3b130f1015ce0f97b64773a54c8dd4f1a3d12be038e5"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64"; + sha256 = "2b301b4616aa92f1c1ce9d729255f5314e0307155275213fbed7fe5b6d1df2a6"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt5_amd64"; - sha256 = "ae5e746f951be6e87cbfe9c9525372b2bd8f9040c83e92460536f322522dde96"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb"; + name = "libnotify4_0.7.5-1+srt6_amd64"; + sha256 = "a367220da9ac0918a37799231225a1156bb4431a319242d73d5562bac73a4da9"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64"; - sha256 = "07b73ef8aca21e2082dc843044b4a7a8fba0210705dedeecd08f24768fb4c087"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt3_amd64"; + sha256 = "2824614abe02323087b5d73313aa9ef3e0f3308095bd1f508f78503d2ba10c63"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64"; - sha256 = "26872bcaa6ad113c0ef42a420980ad479ff7ab31db1d61ef9326f9ecccc4b528"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt2_amd64"; + sha256 = "c9edceea356f57bfc6aa8df7263da54f465313e1e3949a8b7b5771f591dd5788"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.3.2-1+srt1_amd64"; - sha256 = "b744f7577f039ced9645a66aac9ea097bafb96aec8b787bf49c98efa08ce16f5"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_amd64.deb"; + name = "libogg0_1.3.2-1+srt2_amd64"; + sha256 = "d5999d3f774c2c3fbb8998d7ed686b38505a67a1fb45ec07aa288fad9c0210b8"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.16.0-3+srt1_amd64"; - sha256 = "f219b8aef459a59acc966ed9ac1a44c47ba1971f2f724241855506c85d07ac09"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb"; + name = "libopenal1_1.16.0-3+srt2_amd64"; + sha256 = "649d2fc817024719e6d53078053e956c4c0848b7a26606e8e85188bd0c8e379a"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "libopus0_1.3-0+steamrt1.1+srt2_amd64"; - sha256 = "a92492ece08cfb08d5b3c44b43faba7c9148b3858ce32a671e5aee54e9714ec2"; - url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_amd64.deb"; + name = "libopus0_1.3-0+steamrt1.1+srt3_amd64"; + sha256 = "2c41ceb74b0da8d6a8e2adbd537ca15b42544a951ccf42454a14abef369a210c"; + url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopus0.deb"; }; } rec { - name = "libopusfile0_0.11-0+steamrt1.2+srt1_amd64"; - sha256 = "f8e1d893b372799d456a9ee086526317b79a295b67850c7ba1609abcc821b6e0"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_amd64.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt2_amd64"; + sha256 = "f45cdaa7b22e8042434f1a5fe72c13b69f031cee9fa1d97970acb072e644212c"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64"; - sha256 = "28d87263fdfee93644c3f23d126a7594994129b323b4a159ddb3bd4844b4478f"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt6_amd64"; + sha256 = "aa26e347d687d40d0e8efff51e45dc1aeb071efd93ab2147baef993aa024bb27"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64"; - sha256 = "98c85df1fca87276c4bdc4ecba0d3f1cd312263abf7bef7f981bdc062fa6a1c2"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_amd64"; + sha256 = "e994e62fcffb23ec006563ec4a6e184d4f508d70f2b08a567c2e52afa25b497c"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64"; - sha256 = "eea37452f9f18cbc51c5794483e2bc7b50ea004a7cf1ad260d6547bd8dab9135"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_amd64"; + sha256 = "19343aeada8b22381b29d8ff0752ed9475b1ed92cae1fd18e691b9b505e42c8e"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu6+srt1_amd64"; - sha256 = "de204d686476581a1d6f5b54e975a92026e4f7a16aba03b421476bff5f2eea98"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt2_amd64"; + sha256 = "a7fecb6f3e9657b8a03b70ddfea1c384de5cb65feebe5102339e41d0bd1b8f69"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; - sha256 = "00b4d8f037c5d8f7a15ef81d6d17f7271bc248de7b80aa85f75d3cba7bfd7e74"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64"; + sha256 = "b7554d1381c7580a7897657b3ecf11c7554f319c1034da70121d4fa724589be1"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; - sha256 = "30a99cf50aed7ed6b8245f485f4c8023ec90b19f5623007e053d252e509293e6"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64"; + sha256 = "053a4754d48e96ff4849fc99232ac74b5d5b58440eb367b3422a5e56d698065b"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64"; - sha256 = "e3c2b2686da306e78a358896ff225268b7430e0332087429a346a8e886414a97"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_amd64"; + sha256 = "0d05b046b8870873f8aa4e9f51ac3f9c902b4364a6bd14fa35279b7546b7de29"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64"; - sha256 = "81b60677ac384c3e60cb3fb6d37ffc98d54b4739dd95e992108127260ed4d23e"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt3_amd64"; + sha256 = "6d0689067d8476c45918c8c848ffea495e26d118890f040ccd3596b121d4d824"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64"; - sha256 = "02a2b44a4e41c0e9ec154ef3e461cde8724f24040eb5b55001d6b7c59f71a39d"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_amd64"; + sha256 = "e302a51cfeacd982683bd530a36d8142edf416d6812c02bd9a13939addf9a235"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "229d45756ac43419820d4c768baeee0a98ca6a8349b7e4df62b1208aa631469a"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "e55b129066b92ab99f518d2f857b54e8754c3c873b5fb603270e3c4c36564a7b"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64"; - sha256 = "199d232f644a19e34ef13a3bb6ae3d0e2b98ef612eeb7d14705d097f5b4b9517"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_amd64"; + sha256 = "27526dac26e2b323ec6dc764671839c3a2c5476fb16c7980959b17af4177486b"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt5_amd64"; - sha256 = "398789224c691be20acc41199a1e2c048cb14f3be52d6d74611471e7bf9925f7"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb"; + name = "libsamplerate0_0.1.8-4+srt6_amd64"; + sha256 = "cfb983b7a89dd8ec43cca84883fc44367d74d341ba4bad2b106793abad7ae145"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64"; - sha256 = "40b6ebd0d4502dc518cbd25a27d1b66ab18af40055d656860fafa9e80681f0c4"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_amd64"; + sha256 = "8a12f971d3905b5b84fd9c3fca3c7afe1867f8f5db8359157b0cd1c45dda8fc7"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt5_amd64"; - sha256 = "95453e6c26ad4db11076219cca75621f3f5015badceb4087131e11f68d8a1aa0"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb"; + name = "libsdl-image1.2_1.2.10-3+srt6_amd64"; + sha256 = "a90b7182e92af49e4a2c3c76b5dd85b2f0df334933070c035d48724aafd8d199"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64"; - sha256 = "e0cafbc73c26f5c2a2b21f6c1a49fd53e6989227b8f89defd67f5bbaf5ee7f7c"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_amd64"; + sha256 = "bc30e755796872bf7a4a3e7dc84f41a265ff1893ea777f809663f76dfeb047fb"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64"; - sha256 = "cab4a662cb4f9085309f75cc527b95e7ffd907984d9666e515d390f763387a86"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_amd64"; + sha256 = "b3e18a7fe335cd623410f3eb3c86a2abda8d83d287e8304c0c7df9e8219938fe"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64"; - sha256 = "8b9f7e964e15d62e892b0a77c44d37d8f48d717335d58eef493f57f9b93840c4"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_amd64"; + sha256 = "5641a948c70a41a7ade79de001376686acee7b5a678aaf24be29dbbdefbde7d7"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "cc0b6f8f55fee25448aabd459641f6a32a7856aa08f180ed7fede2f241b35045"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "907391ea4512c3372f86afd8a9a409632d90b9e260de43f8082f90175e08c56c"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "ddf1ee016ec8ae53daafb507393b1cfcb75d0a7842fb37c1df20f7fc25a0c9f7"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "136a0c68b520f4eaec9ff81321785b09dc6843431b10ba6941faee82af3b215d"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "e5dfe269994b556fbf6e5653896b25ca933e17cd44d0f96e4de2549c4f78231a"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "98f77bb9019649440a96e9c70bd160fa03aa0bd306fa51110b861882cb62df0d"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt2_amd64"; - sha256 = "9b2474f074f9aeee27389d898e1e71a05e30a69d65da61cbb6ebb2b47fb0a0a0"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb"; + name = "libsdl2-net_2.0.1+srt3_amd64"; + sha256 = "492a6e5f4efc454dd720be4028efd89a212e039d3f3f7b01c94c0144d8d8d621"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt2_amd64"; - sha256 = "8ad4bd4b23261c88823bd8f4c1710abd2a2dbc1d754829bf168540fc51a990af"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb"; + name = "libsdl2-ttf_2.0.14+srt3_amd64"; + sha256 = "f117047ffeaf77a93fc0932470e80ace2d07d7e672191c9dd50ca5f2a033f56c"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64"; - sha256 = "18dc2e6b9f23be06382303eed01b9777a353c777689386037c8994e673763c00"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt6_amd64"; + sha256 = "7172d53c8baf857ed8909eb9bbbda93d0ff177b2f3ca723c716d3af34690135d"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt5_amd64"; - sha256 = "0301b9537ef475f78f3f05feb276e3605d71313d8e08ad91659b9bb10cf4104c"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb"; + name = "libsm6_1.2.0-2build1+srt6_amd64"; + sha256 = "e22295663740d88bcc92f8fa67eb55750b0855be98474de76a3e2bf796eb3c12"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "c40949a4d8aaa512ff84cf3f34d3814cf7922358ad41d44dcdee6ecf40d14d9f"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "042a5c518bdd3152ef8052bd7a88babb31077840ce85383034c0e54d29f6ed07"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64"; - sha256 = "3b1b97162eb3542e7eefb038dc6f668b1239202340f90f03fbdae6accecb142c"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt6_amd64"; + sha256 = "a22fc321ca4a9c35109d48a74a2cc5b60131d1ebf7b09683d66e14aff728eda1"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64"; - sha256 = "6cd55db575d03288983a1f08f82addbc6570e4bf137a459668ecbd1b47347aee"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt6_amd64"; + sha256 = "7cd488929976b818160d4c6a043468d08ebaf7cec9dfcd44bf36907adc428052"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64"; - sha256 = "48bb285754e0feb56f23e39e860e48b9f2f49641dab828dd3dc24d53fafd5b79"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt3_amd64"; + sha256 = "72cd1300cb4725894778d453d9a9a25aa96f033864306c8cc1726078480437ca"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64"; - sha256 = "6b96d797b6882b1b8c1a3e5f3735e6ffdb51604b5bb6754ce96be94a7dd102e9"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_amd64"; + sha256 = "e6ccfb7c0505baa106abbab67af5f685e32d24d5cd6afe8468f69526b7a3db92"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt1_amd64"; - sha256 = "11f083de451efdda7a41385edcc110d4155e85233bd3d873e2d773b1e3caf655"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "ed886139ace433f0922c87defd922ec57e54c495e9a5b54a6aaf7c02762d27e2"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; - sha256 = "f716af21f84d5b6725fc50682c6dd8b739e8ad3277b6f3966e516aba529fb89c"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64"; + sha256 = "59e784845048714b6ddd02013cb1ccc8a819489a7081c3f479b7fa7121893a4a"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "c9534ad7a66d88de19fa98a61bc772918e93e71cb278acddc4326cd6348816ea"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "dda1950d7e1f50547ce57246bc7e19c3c1ab1166ee81ca637ff86d373e20253c"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64"; - sha256 = "77c7c67b18e7c9755495dd51c30acef28d6ef8601044868fdeb99e9334a453ea"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt3_amd64"; + sha256 = "f9c6c9b2cd83aaff5e07e0e7a99be8110f8b1b4be0f7ec9cf96aaa097b4da386"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64"; - sha256 = "ca164b8ea8e07d6d55889906ab2477c47042929d424d728ae65cb1b79fa4d968"; - url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64.deb"; + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_amd64"; + sha256 = "93f7e1764a6db1e22b33476eb5f9367eca21a61d0d04a2a0cd0de170f21356d6"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-6.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; - sha256 = "9b5c549360dcc831c8e8b679022bcf2dc3282b54cefd2478ded8e23ba1342ca3"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt2_amd64"; + sha256 = "6e91c619b891ef51a53cb86b83b67cc3ba1c223af58e166375c26622efd9575a"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt5_amd64"; - sha256 = "3ccf9fd729ba3ffe01299d3d484a9ab2e5d00ec6fb5df64e833fe12a4d4902f3"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb"; + name = "libtdb1_1.2.9-4+srt6_amd64"; + sha256 = "d35843de8c8847850477318d00f0159e76492d71d2817f81fc512a56376e3efb"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64"; - sha256 = "283abc8d43448bbdc74c8241109707faaae222a77f7024b07ab42ad8c6d36695"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_amd64"; + sha256 = "f8e9e796fd307689143b54e5b4c451c19c0970575241587e8c3a24ce6947c7a3"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64"; - sha256 = "54b035ec9bbbf67b766c592a6c5b794a4b6f966d0e4fcef4f042de73ce651c0d"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt3_amd64"; + sha256 = "e9f8da291dc5dd48ea5f0f94e628f1e17ace6d1e655b7ffcbca175d85db98d8a"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt5_amd64"; - sha256 = "a41f20614673597b2fa22d1887a5a743c269f97f2de6b9996345d19f2a5642f0"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb"; + name = "libtinfo5_5.9-4+srt6_amd64"; + sha256 = "c12b7f27206ba4541468ff5f134973b2f5bb69a4e86d3c2e43f111eaa7db76a0"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt1_amd64"; - sha256 = "55b812f82eef7eed9cefb1e42e6f2c8da112f9fe909a4d8ecc7b90901c29b01f"; - url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt1_amd64.deb"; + name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_amd64"; + sha256 = "f3dbcab81697c5206f5b8dbb3176093204a9a8ba1611ddde7e156f844947c763"; + url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtxc-dxtn-s2tc0.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.10+srt1_amd64"; - sha256 = "0157b79f5558eb799dca194f7a5f172a9585f1d19f822776916fe6148e6cd390"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb"; + name = "libudev0_175-0ubuntu9.10+srt2_amd64"; + sha256 = "6690f89862ebf2104f0d3c477cdfaf46fa99a7060913eb46776536daa64ef0f0"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt2_amd64"; - sha256 = "48bcb787481a6b222095b4c06420dd68e5529bca6143538656549de635c9da6e"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb"; + name = "libusb-1.0-0_1.0.19-1+srt3_amd64"; + sha256 = "db8f1014d3642c8d01fcdc319e1cbbf16db4a922bb7abe66b83bc4ce41ee3a39"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64"; - sha256 = "70e0f0a324765d317f2269c86e9886f6dfa3482fa28d18a6f2a93a201c66c89d"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_amd64"; + sha256 = "5c2bb10e8a541dd20eac84b7fb02c3ff513642bd1941f548fd2f906e00733fcc"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "22c5b1f0dba7e7fec65458aa93017772a202f496ebea872859cbf784d2b24c97"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "c25662535e0bcc1fc349c1f61710f31dcc1be846ea2ba4282225756809b13e15"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "0ac9111ca8f1e1f49ec6726d78b9f49b3604f6a97a08843acf3aa220c8af3038"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "ddfd440a2bfe3174b33ac5b459ce4261ddbcfa36d443ad237d41e5e41dd17bae"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "2d3703be33c2251e636947f6d9bcef65dcb87bbb18e7df6791fb10671d22655c"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "a06f1a3af4679bb44722458d956177468e78d662cf97dc1ec6c8ee38dc7408a2"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64"; - sha256 = "59db2a8fe54e71123d06cfad2c2f4b1ba55ba39be77c1517d2fdb86afc3930b8"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64"; + sha256 = "c40c31da412fec43c201e88458782dad6884e1eab9593815bdf0d9132eb76baf"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.5-4.2+srt1_amd64"; - sha256 = "ff1dd4cf7906756d93784dd3f849bacb1bb4cd1ce70fd09efaa9eed1cf4cb4b7"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbis0a_1.3.5-4.2+srt2_amd64"; + sha256 = "808411459a4e660ef5b459b19f145d34f6fd7750609e91985e34e95eaab62888"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.5-4.2+srt1_amd64"; - sha256 = "1f1ba6065e6e844fc829e2a10e929da213897aa6449752e008e1acc3eada89ac"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbisenc2_1.3.5-4.2+srt2_amd64"; + sha256 = "3273f701ce01742e8eb746b4b4102f05c6ea6771561b73292e94d8d42dad142f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.5-4.2+srt1_amd64"; - sha256 = "9b0d768401a1a12ebacd330d1959b668d4ead658a8b05f6f91792c822c219abf"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbisfile3_1.3.5-4.2+srt2_amd64"; + sha256 = "fdae8ab04379c397ea46df535f64a04b29dcdc46031cd077519c554740f0b156"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-2+srt1_amd64"; - sha256 = "3249696eb08839ce3870db10ed073c5871db6ed85130a0d34fcd82aee8f4280b"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb"; + name = "libvpx1_1.0.0-2+srt2_amd64"; + sha256 = "57dc793a94d5be476f84c66751f9b5923d9ee7a507b865fbc4607b6b66760432"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64"; - sha256 = "0728316d813d12aaa28d1f6da720895489f73b94d83b2f0cbe9d653750eca8b8"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64"; + sha256 = "a3820a7cdceef1cf070b762d81437ec87a4d3a2b41566dadaa1cdcb1f08dad3e"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "e0dd74023eda11463d84b196ecbb6867e37a4fc0d9580e292b53742bdb18da71"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "e72aabe5b6c20bb667e1746918a354cb6151e07a9892ea0735406966dff019af"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt5_amd64"; - sha256 = "29b55759002d1bf702e57b878d055b0991ac4fd28c51747ead63982a20af6fe7"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb"; + name = "libwrap0_7.6.q-21+srt6_amd64"; + sha256 = "a05d3c3bbdb0059b2693602dfc614ec458e53987d625a7712f3171fa53642f15"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64"; - sha256 = "f6c5b92f6a933b36bbafb47e6a5db6f7e0a8ff4b5bc927d31e2e9528409ac151"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt2_amd64"; + sha256 = "6217810de68a0fe252f15bb544346383bdd4ee946e34d0352f78c678186b6da6"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64"; - sha256 = "5fa7572bc96a094313087ba322d245ba6ee7a0abb5b590b022f6651f59be3f51"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt2_amd64"; + sha256 = "cd4fd2fb5ac913a752e20476e612629c802e448539fba9ed74d77b91fc0f47cc"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt5_amd64"; - sha256 = "c2f4776426f2177640fb9ba66f9a569fc93f404abc11b19d2765d767189291d0"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb"; + name = "libxau6_1.0.6-4+srt6_amd64"; + sha256 = "8934767e2168cc4e2508c091ec2264048ca6bef145383db191f203c09337c833"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64"; - sha256 = "e9156318656d93047ae3409832eb558be591fdb3d52370b034ef09607a5e25a8"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt6_amd64"; + sha256 = "781bdd4ff568750b5147b0242a91ffdb85167af482063883d29bb13d0309bfd2"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "e8dc9f6fa8694f90e37b248db630ab7a2cd719f98b53344007a928abc8761e40"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "2639fa857b7c4e75605d6a3c2c3a3f3b9bab478883cfa40ad780252f6ad9710b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "b4847e112e1ce035b2b7220730c9019ca0073c66cde9f4d46a75bc9972c66190"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "abdd286dfe7d74e3c98d2721528add00cf8967f0aea9e61534e19c38d09b654c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "33fc72f2ac3f9b6c41f05784dd179f07f226aa615701fdf6c4fb87f5496850dc"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "80b0a477b5e53fab89781181d937579e54cd1c8f5d3ea77fdd8ad1fa77df32ed"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "414d90b05f5e4253be1aa1518605f3cc6e2957a9319babc945c4b9937b6fb6c7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "bf6aefcf11b46e7c6c45408cd3c9d21028f3c0ddcc7a157c76ca1d81e02aca6c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "ef0d8c1dc10dc52c9901da233de92af13586c59608f2a52a2ff45bf79b2f9250"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "cbb423fab5493fdf1021e58ce1bfcbee1bfe8fe9ab0464d73b184993128da2f8"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "3160cce59363843f171075140e14b0ed7f7ca7a7e8bad9ebc5b0e03bc80b0dea"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "aaf25e7a0a3e501023a5826043581e9a1172e3f6cd68fb0b87a82f639d02f595"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "fd7c34bd6f4304a7dc9e562de7217aa5658e562853214f8ce751cc3537717dd4"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "fd2c110278edc2ba6c6bfab04947c16c54b7744af663429d9b32677289ae6ddc"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "859847b583530b45316e02217cd1d10007075729653ed150251a84412d02f210"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "1170a49cbf57d515981e32e26f0a2e9762af3ded254e98d4317992b903c271ac"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "3b8f62294a46fc7b61dcbfc83d62dd3a5ab588d23bfb7f54cae887d02c0fd061"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "58e7ff4e5a9bcaa50748e7df4719c71708982b2ea8e1811c26fffa6d745bd11c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "4fed958eb90fd461501c4e50787b5346deeeb93df50585fab41163d96a8749fa"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a7eed9a0c59b2a17d1431157f40e16bd3891769f13709e56df9c5025992aae42"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "d7862278484593fb71797b61f966b357958e18a0e80c9707abe2bca5e0ba11ed"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "d1beca464a4acaff0c8ac43c03a9ed260193678e0ee98a4b70f602c3fa7a2843"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "02e8e731dd5e796f506e59b382e092b3e8cdce4880636d7dac471cafea399511"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3d04ccf79785c5bb7ab5c6cfae56371a0b8cbbe4e5c7b5897f91a20ee4b516be"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "021b28f95d30736a5337179e955686553ab5dae5b7b26333d945f922f6a612fc"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a0f2dd0be89db8833493edb179974db702a6ec86ee4c15896605ceb6ddaa8e54"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "c73e411506de617a790a8b80f189849ef879dca18332968cbf78cfae8195aa69"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "0ee8a32a8a8bc96e374e5fe6980acb652d2ca846d1a0998f757e857320abbdbe"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "88bbda5ce9957bb5d378ccbdad778a65d6ca095b6b6d3c233c40ea2c833d78b7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "07e7b5267f9cfd1ea6ef1c0c4edec41fd19d1e02b9c6cac7898a3c496a427d10"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "e291a1c2178aa55b22800232daad553d8db1a84bf154634785fa90ea7d731a1f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "fa8a61680c23caee52ca7aa32ce8d46143e5d68e47cc5bd3092a3e32da2673bd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "944ad1b0aeed920101f5daa41247f0e6a7c3adabaa13f5b0b44116ad102a0a1a"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "6e0e4270580b1b46b32fbb02b1e2ccbea49c94c5463197c238d5410a61a74b7b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "9f9edf53525d3ec1fb6855e9b97d0563bcc854220e4a31614215432c660af3da"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "77e6ea5019c757a38fee80b4e4bcb54f1304299f8a557ed9b8116cc106d66930"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "cbf8c42fc42f2cf441f978558689782ccd11ed8708dd25a66987e2a1063f2168"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3ba7479a9d165f2a49b6ef8327a3bbcc1f6dad7e9bc26bc8819467aeb09337fa"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "30adfbc0f8e707af616b52b0a3bdf66adb6c06fa207cdb6bd442cf84e8adb14f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "c9d48121969c8607ad47b597be1d261a084fd907885ce0ef02a2dc6924e4421d"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "3167217f4840fd922ece2a7d2b92b0ce7b845dccab0f8b8c503a8970b9ed54d0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a27fbb11170f2fb9730ec935e598ea6d4e9b513d0e3c793a29e5f893501dfa09"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "046f79afe5996fd4de3396ff9db22a8b8a3bbb055607752859e6719e8d65cbdf"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3393b6248671421de17518320504f9593a25c202cc1a5c3d0fc127d259a7f472"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "02e14b55a779b0d040515f7b3e7f898921c2976dfdab63cd5f95a33f65695e8e"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "20d97a75903b62553b9b61a2a6c2c2a5d1c5476c470a606fde01627e3fd2d155"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "3cdcd0b9b5345d26f8b8b5ed1fa8a78c42a689d3214a9f1eca0aa760ee539c50"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3a35f1fb1a9550ffa5694f973cca72115254880514b519b547f1a8ac8d4c9150"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "bd75e56835fc4e78c6debc26bd3c0a33a5d8c8931156cd857fe9afb790081da9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "5c93e80460b2c672a785368995a0e2388400508a4d768c72193e19539f05dc72"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt5_amd64"; - sha256 = "6453ed0a577d28efcfa60cd4498f9fedfc3288cd9166a66eeaf8cfdfacdd7306"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb"; + name = "libxcomposite1_0.4.3-2build1+srt6_amd64"; + sha256 = "d84cff429e2f4cf5b201c13aa85586d74fc49114309fe9fbb57914b3ab8e187b"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64"; - sha256 = "e7093dfe6b46009d5feadb839120739365ed4bad5744ad6e2b3c2c88627b2d59"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt6_amd64"; + sha256 = "72f53a50de7ce5428291d3336aea501fd18c1a3d62832737590fba25cd8b98b6"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt5_amd64"; - sha256 = "93dc0348beade9b49d820bd5ae3cec74427cd21ddd1a867cb525587f3f470850"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb"; + name = "libxdamage1_1.1.3-2build1+srt6_amd64"; + sha256 = "ce251ec5482f25d3cb055dbaf34912ef26ccb8e752ea8fb426a269c70002c4dc"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt5_amd64"; - sha256 = "071395f50aae70856150a2116c8d0b126dd0630bc6a584b580a6e66d2288a1cb"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb"; + name = "libxdmcp6_1.1.0-4+srt6_amd64"; + sha256 = "baeb880ee5485b9ab28631254ad1c59dc0170294201bb01e0de7c42baf4a191b"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64"; - sha256 = "849158325c236989e3cb6fea5c43e5d5a9b0d06659bf959329e51193b417e746"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_amd64"; + sha256 = "716b73561d9df1b9370eecf3ee523f648cd743e730d6e14d63b9539c4f74949f"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64"; - sha256 = "3f33e4fc8e1c2fdbd49458705484e30caa616ade24f5f0e3d4e21dc85c2942f4"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt3_amd64"; + sha256 = "fdd22ee527c9f157bd53c4a2ac374531f0185e751ded24e255dde3cb41c54e6d"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt5_amd64"; - sha256 = "ed8cca63620e3cd24a936c05e937353edc5a5fba997aa605219f6324dade9a7a"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt6_amd64"; + sha256 = "4160f4dc1f4bde50e3ca6609029cc422078017e855e61b0eb986e75bc37fb02c"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64"; - sha256 = "3a9b0fdf07c38483361b563c69c9ab39b4743c20c0ea065848f81c6ef857763c"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt3_amd64"; + sha256 = "60603bcbd89af27f963bf15a662562c496bf989d7e18689a746c53be62e4cb62"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64"; - sha256 = "b7da215dc7317bb1fae4c7de82f5f8a71ac3a91fa01cba54bcfc39d8bd3e97c5"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt6_amd64"; + sha256 = "26ae823a08f8c79ca40cfdc5f7e561d10e7677f9012949948e1cbcd94f819e2b"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64"; - sha256 = "150aaac5d06d6db54f2ae5eeeee3af920118182a270df318d01e1837e553bc4c"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_amd64"; + sha256 = "d24a1daf4b399f9f99bb9c9a0047b95039fcf2d9010e4387001ca3f5b87f001e"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt5_amd64"; - sha256 = "543f44789cd1f1cd6cc8551e5b840062e3ec52a0649673b4c35a7fe5afe94b5d"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb"; + name = "libxmu6_1.1.0-3+srt6_amd64"; + sha256 = "42a5a58f0c809d5c761155ca311207970e98d38eb40cf50343a37bf8b84285a5"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "f270c513534e64d1b5176d39b69118c82e6d7b14156f460f1c450e58c1d8675b"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "99b0b9a684573156f7d062d6cbfac498b6c5902453d4f12cb7fed7f841c61774"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.5.0-1+srt1_amd64"; - sha256 = "62231bd5b7e5792de2783a8ee496735ecf7aab15859df82aa8b453a5dedfa5c4"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb"; + name = "libxrandr2_1.5.0-1+srt2_amd64"; + sha256 = "ef4b4a33192873f33d490f7fa8407b4044009c85f40fc10df22fa0e0e97cb2a3"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64"; - sha256 = "3feec8369c4d5dcad84b8378429823d77d462422f4395dcb297697214a9ba47d"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt3_amd64"; + sha256 = "3d0bba7e7cfa552d3770c43eae8a52a131ea1e59b6180b345e44113d310b3826"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt5_amd64"; - sha256 = "197aaeff33ea205f8da689de1f48f40a74f46a2e46c68f6d3ab40eb32022e2cc"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb"; + name = "libxss1_1.2.1-2+srt6_amd64"; + sha256 = "bdca1d17584edbae953d21c44b99a6d1e42f2f4733ff3969d39ea75e4964de1a"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64"; - sha256 = "6a56f59cd8df6fd5557db666a97e6d691b0d393c45bed5d84f4cfe25e60ea83d"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt6_amd64"; + sha256 = "7330731f3623bd177710a28c3a2becf8ec74c69e755686ca14d9b205ee1a5785"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64"; - sha256 = "0df56b7445f0cee8d64871d20634223370b23069c2153b99398da5350e1034d0"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt6_amd64"; + sha256 = "063b8c7e6187aac43b92731b5e06a5c78382ebd20e448a14b9c294198eda4d3d"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64"; - sha256 = "3533b1044f68e411fff05c9766888e59fa9000204941b304f8d4ce90248438b6"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt6_amd64"; + sha256 = "7f83864c72c692bb354974e0ebe30b67965810c292dc254d5a0a96c8967b4819"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64"; - sha256 = "845943c04ee21368b0c0c53e13499fc143e5552b27cb989346f0fcbefc232233"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_amd64"; + sha256 = "86c4f7c16ac0f6104dfa6c809469f20a750b7391a1e70e916afcbe472f11dc2a"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "steamrt-legacy_1.20190320.0+srt1_amd64"; - sha256 = "35ec5e34502ceb6b6bedbd22db8d3e1ab3bc3e3298d227a89a8edb8128bb86eb"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190320.0+srt1_amd64.deb"; + name = "steamrt-legacy_1.20190624.0+srt1_amd64"; + sha256 = "0a0e96fc8dbe806b2d0b4ac26f217ca5ff49188f295a9a4b0d39cbe0a4da52b0"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20190320.0+srt1_amd64"; - sha256 = "bdc4ea575b1227e830707ae5caddcf8ea10df6955e5591459607548e1bb9460d"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190320.0+srt1_amd64.deb"; + name = "steamrt-libs_1.20190624.0+srt1_amd64"; + sha256 = "ed7124e8d11d9dd435ec7b7516a0d0e2c766f677b2c5a1d0b257790c03f307a2"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64"; - sha256 = "e1cc592b076755ec0b6eaed6bc1585aea1e18c44db0f3c4d055c2abab1d3512a"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; + sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt5_all"; - sha256 = "27c90bd85c4ff3c9593088d62a19537f7250910dcdd28c278bd6c71157e8be88"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt5_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; + sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64"; - sha256 = "d26512b9721fcbe8b5d5b62b2fe1db083b100a1cf5ec69a3b4ddcef11a84c224"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_amd64"; + sha256 = "0cd05ea08abc9f30822a8eee0530d082938341fcd6c1a631b2237be7e1dcaae6"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; @@ -1860,1854 +1860,1854 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386"; - sha256 = "f12c846380b10661005d12241133ad432f7ecd88f569458275d4c2715ad88e8c"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_i386"; + sha256 = "44366cb9097377fdd517f93bca87181254cfc8acf93e655f80a373c9166885f8"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt5_i386"; - sha256 = "8baeb045fc6ad2642aa82b129cee0338065c3c4ba8c0c063daf0c22ab74db649"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt6_i386"; + sha256 = "9aecbd438ad4ed3a9ff5953b76d16c54599db5de983e1e7b701ae2f36b706307"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; - sha256 = "5983448af201f3cf65c53e9b4e0d5f39d6e019e18d62d9299b92ef33445d0253"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_i386"; + sha256 = "47ed7a8b051c6fc76025583cdc63d0b68c3052cd476e8c1343209a123e19f089"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt1_i386"; - sha256 = "f99dfc360aa9b1cd0dde113b8b81167b78dcb527fa3c5b7c10eb628720a2525e"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt1_i386.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "be247eb920a666907820863ef411003c50850ade57cc42fdbf53b503d4db9644"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386"; - sha256 = "e62883416cc46528b03ce99a02e84eda6c5dc9e3c5bf1ac769a655e19310051a"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt6_i386"; + sha256 = "d3c614c5bba71a50e67068b83f66d03516ec1baf9e8d43fb7433562322cae0ed"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386"; - sha256 = "0fe3bb57d5b519b41c33ee4dc17a62c3d06c5890bf6b2b9f115902281050d0bb"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_i386"; + sha256 = "c377c8be32a2f4f8163582a88f99f9226f44499b915c981c4d9bd2da8578db40"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386"; - sha256 = "24ea566c8776aa16745e86edd39ac57a42e821ae09a37d006adfb2d2e305a647"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_i386"; + sha256 = "73e5414fd8737e64745d886f2180c685e1cfbd78409322222dea4d470a0e8447"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386"; - sha256 = "a9e9c34b531a7cb79ac2a158866e36a96833122889b8d78197edf4ff685e9505"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_i386"; + sha256 = "89baeb400931b59ca75def2c7e747ac23d8e5adec22792b1e8b66490bb23fe77"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386"; - sha256 = "8dce3bca21c3c0f9df67157d0edeec6c5eb6c4fcb14561a526ae8d06ca4c6ead"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_i386"; + sha256 = "1dfff440099992bff06f5e01db3e298ac7272b6fc75786b75c1a5645d4d6df16"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "0556a4b542c48d05210752a779fcce9e12f8f3bdd709675df897eea220b8eae1"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "40f34e384d61dd305412a46bfe6fbd5df859ef0033b0326dc3b88d57265d5c5a"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386"; - sha256 = "6c4710ca0c3a4962ca04a8775f1b4ddc589788c0abaa241cd5263611400a4071"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt3_i386"; + sha256 = "9b7eedcafb01118a672a5b42790beec5cd8775cd585a4acaca2832c955511bff"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386"; - sha256 = "0d3e2287bb157ed9a7abda47d09b67cf9efde1e470185495db233c4eaebc3943"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt3_i386"; + sha256 = "d61bb958a41a1bdc2a664ba2a9a83865b874b3e96f8776fedba6ed5810be96dd"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt5_i386"; - sha256 = "a2cbfecec3327429d41d46af1aa963f814778ee30ecbc01c39659183e3b3194d"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb"; + name = "libasyncns0_0.8-4+srt6_i386"; + sha256 = "879d0f1173da5b064958150e071ccb5331b894962630546743e293e94bf100d1"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386"; - sha256 = "9f7e3db1e1784d1ccff554aa9d534b37aca0549d9f24bd825bd50457b51cb451"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt2_i386"; + sha256 = "67d9d72795c5b94a8980899739a59d2be2aa280cd6a2619f9fe342171d04e748"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386"; - sha256 = "4f732421cd1bf4a07fbf12ba80abf77670d5a9ed4c859e5e322bfcc4b9692f33"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386"; + sha256 = "bcea5d6f2743c617dac44c4d836b6937a64816f3c288a56b656ee4adbf63714a"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386"; - sha256 = "4753b23fedaad1bef1620e52873437342b5b509488920da15b1075fdcd20d8fb"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt2_i386"; + sha256 = "7fb0b94117ae07e44e89267c518d57c9c654f2cc24cef436dc1da41089d957f6"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386"; - sha256 = "98790394ba0d0ea04eca2ccc937b87133b919218d3cf7120051e371289911b52"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt2_i386"; + sha256 = "0b0463837ad36503c280bc64bd9bcb60648d826f1afeea5fb39c0a8f4332755f"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "8549391d2ddd67111eea1882cab64e4afe502e69fd269cbf7e456de29f442f89"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "56ff2ee6a4044ba8c6d180414828ad0c041a3c42c5667112003b0e0c1e421b0b"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "ee05b58eeb1d0a955ee7c4039371fe1698c9862e76c3d5e7a4dc2043f549d2ee"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "70d1b49e40f0cfee65eb20c9388d51c6e98c468830fcacd95276908279a3f29d"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "06cc35c3707604cf869a0f5338022cc9018c564394d83201db053397049df18b"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "034e3566a6e8f2b01726bb9d59b1130eb0a09af79ce9d934d040ae11e7923bb1"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "f446cdc75432a5b6734f1ba299adb34b4d23f3d293afac7cad30a8c7f1da2eaf"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "67001f81a336cb5480fd06043d9522d62e280022945d22a8be7f3e50ab4dfed5"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt5_i386"; - sha256 = "5f6e91a80fd1b98b3ec574b91f1c6ca829e7bc88232e5366b026650e0f60cfda"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb"; + name = "libbz2-1.0_1.0.6-1+srt6_i386"; + sha256 = "bbdc900e1531bf5e78256ead401624edb25c65c02dc904e73f61c683d86a94c7"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386"; - sha256 = "46334226fa343c41b0cbb6ab1a2bc67782ef19aeab47e133b2f3266c4c13df6e"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt6_i386"; + sha256 = "5e2efefd18a8750a22c1b688b0fd19558291fd82319feb58469aa743ae277fe3"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "91611d5aced3395fbe286fc8db3013734f7d55828ace3111c1d698cc4e47e9d1"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "3516a9992c803f770ad3f191dd50c926479300e57eb5ad944f3cc189cc17b2ff"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "5aa5679a42853a43fb071444faa3bb899b584ae26e60f68633c18506b5fbd84a"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "7dfe123753357fcf62367b07ab4dc0c8d98b640efd1f85833583c386850c6393"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "0cbd2de604789d3077b0bdf0e2845002c94408962fddcc13e7da1fb2e013dc4d"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "d5a6d693a17a615d89eacfb6ef3893c65e72ed34b61e368e9e311e90720be01d"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt5_i386"; - sha256 = "5565b14dee1c01c9fed868534a163e01b3451a3bcc67b53eb88b21caf57bc9e3"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb"; + name = "libcap2_2.22-1ubuntu3+srt6_i386"; + sha256 = "7224c9dacf70616e5531453b5b6dc0410c2b035366c98d02f8c51890780dd1eb"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt5_i386"; - sha256 = "b3008119c14897673471f075c30e66dee472f44b3be98c854702f34371c1423f"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt6_i386"; + sha256 = "a21ba20d03f43163c1222fbc6a570c20783a1d504dcf92306ab029c437fd0df9"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt1_i386"; - sha256 = "b971589adbdefc969637f8c9bb9dc76b196cb89dd663181a7a7d7a4bd22f7046"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt1_i386.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_i386"; + sha256 = "bf81884166576106fb8f73ac789674218b2a349af94edf3f4c3329e6ebd34240"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386"; - sha256 = "6f29d4117f5c319c95cb0a455abdd4d16cb3cbb40b0bf56ec122ffe2e0d6e20a"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_i386"; + sha256 = "069c28585b6acbab32e621c82969608eb326691f5168ff7d19c58c1dd58a65e0"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; - sha256 = "20b2dece179c3e37c72591467b8d084bb101e6bff06635a7554e22694dd57ea2"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; + sha256 = "f92d0bdda8d394104824fca2ac6d19cb9c95a863893ef604e45c43d0eeb16ac1"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; - sha256 = "5dd7ef27d44bfd6e57d61ab45060f49effcf6ceab8447d9be8d820c83366d598"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; + sha256 = "b210ce907bded1db660df24365861a10421d758cfd7fdb2fe64b058ecb92cdce"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386"; - sha256 = "93b6152d521ebb459703e4e1ca08d26fdc6bbeca4041ae170434df0dd3c20ad5"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt2_i386"; + sha256 = "a34a745ddad9cf76fc1878380dc68dd6a30f9dc5c17629ec4adf21c481e20336"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386"; - sha256 = "6af6b5f336233d1a6e449da01009d930ec0d740d2247fccba876e586d9999a6a"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_i386"; + sha256 = "c881add03cc07271b713b7d4607dfaa1def7b851338d35d807aeae8de7cbe908"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386"; - sha256 = "310e4521610c61b3bf1ceb4705aa392df7a0a2e7578730769f84ba7879ae9f3c"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_i386"; + sha256 = "f846eda12e233309c903865aee472567cb5b4c43214091b7a41f8c3801cdbbd7"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386"; - sha256 = "6c59b61c93244508ab67d44ec8d7a4a5b7c63f7b3865275759732effaebb464e"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_i386"; + sha256 = "f8fcd3d120593aff181181902191094c646a0747a2dd9c19f979aaaa69078220"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386"; - sha256 = "3cd56894e3b6bb51fd3b8dfc894ac993aec1fb1eb1a74330ed19826175227919"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt6_i386"; + sha256 = "b9a25a54b70c2294e96c447bf05775c89eb056ff8eb0b4840506a955fcf78d35"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386"; - sha256 = "1a6d486a6817e2b654ce1818d35b4c1b89b276bdfcd113d9355f12103ce3672b"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt3_i386"; + sha256 = "2ffae071d141e08e9dd5c486ba00f91830ca4a73c346c2e3096069c42d80e058"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt5_i386"; - sha256 = "cd288b5caaec5f1f8a828853386145e3696030c9ae80004f02f4135f72b3703f"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb"; + name = "libffi6_3.0.11~rc1-5+srt6_i386"; + sha256 = "2c6f1291894f467648b922421fa8555b96c02075d3d78f1472efbfa44576c203"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "3d37ca9657a3a6e76b5ade9822b68ddc8005efcd6cb63e12d2778f10eaf4aee5"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "64f1bfb240d700b9af09a9318ca335c9fd63e48f753fcc306b6071534708a770"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt5_i386"; - sha256 = "c557aaf13a1cfb5c956059f1da7afed8648f2c07e4621e3cbcd970a5df850bc8"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb"; + name = "libfltk1.1_1.1.10-10+srt6_i386"; + sha256 = "5f7149f85e892031d232de4d206b589d5fc204a05d313565016f8688295ee045"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386"; - sha256 = "7268b06927384f98a2bc87b241da2f2c8390559c5e5a02371748747081fdb8a6"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_i386"; + sha256 = "e1d4588b6426cd6fc685463da3c09e6b5483b7492debe4dea054dabb5e510ef2"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386"; - sha256 = "70a554523353df1d36e5a8ec86a34c9dfb86c496889877d9bd750c044bde50fd"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt2_i386"; + sha256 = "0143413faf66a0db49c7c478c6aff34bc08a13033b2093b2039fe3630ee01f30"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt1_i386"; - sha256 = "c406f08ae1033994424617cd9d07e8f13fc61e0728ecbb314325a540f9f21b3f"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "50d44e8b3821704e15af26322dccc365f1602ee9bda53dee47329974196d98c3"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386"; - sha256 = "3f0c981cc4a2e705252c5d730289fcc9289a294637160ada6ee0ca75fb24c6e5"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_i386"; + sha256 = "65f0222b28d6c9315c3ba067085e7b3512b447cedb5d362af9918016368f1766"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386"; - sha256 = "ec5e6074d550ba33c937305fa1d274a00c481ba3a02666b0623236c90cad6af1"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt3_i386"; + sha256 = "bc74344b1dc733817522853e7ac03f165440924be176b9dc0e6e5dbb11ff47c4"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386"; - sha256 = "a519b8df185260c2b49758383db5594d46c24f60b8edb4cbca01307b4b013a3a"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_i386"; + sha256 = "811794c91c9cd6d8bdcb23d8ab924a98c7a153dada9ec570a5e7abcc0e3714ce"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt5_i386"; - sha256 = "632514d7d5295fa89185050a3b6628f14bccea5602f5ebfcaec98d3581ec8cfd"; - url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt5_i386.deb"; + name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "de4d68a4288d8a2e48f49c0e56f3d8bad4e0a5b4a795a0a84938158404ce037a"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgl1-mesa-dri.deb"; }; } rec { - name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt5_i386"; - sha256 = "abfe42d2d9a41397571b8b04391e3b41b9ef75f41ff990e965de2c617dfb4fe7"; - url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt5_i386.deb"; + name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "a952436b43f8d1f0a80f9c8a03dea2363cdae927585ad981bcc017b598aebab7"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgl1-mesa-glx.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt6_i386"; - sha256 = "8e0ee758ff75af11fe0b1f74a92f1c995191c0f2aeedf31c20e12d4bd646719e"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb"; + name = "libglew1.10_1.10.0-3+srt7_i386"; + sha256 = "23a33aeff290e757ab78658a4c649842cf00d32dba32e8ce1fac66e4f89c69ef"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_i386"; - sha256 = "5f5b21f18c3b64a2025d4a7ac7b2e202efc68b3867eaf72733427ba00ac3fde6"; - url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_i386.deb"; + name = "libglew1.6_1.6.0-4+steamrt1.1+srt2_i386"; + sha256 = "aa6c99ae0af170e22e6073339b99552489ad1a0bcbe5e5c71b6dd5119548e1fd"; + url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.6.deb"; }; } rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386"; - sha256 = "07187708d651d2278568c0c927ec4a33a32cd91defc759760dbc1ae41c931b50"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_i386"; + sha256 = "c99c82abea66baededa6ce28bb6d330f39a6d0c8a9d9cea6a2e789417ecbafe0"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386"; - sha256 = "192688123f04291f2cb6538736363f3e22d826ce53679a7824b280c5c48282ad"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "393b1b93f7d10b35ecbe259860891c70b48b32a3f179f91863cc115d026a7ea1"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_6.1.0+dfsg-2+srt1_i386"; - sha256 = "4ed87d1642cb25243edb39fdb1adfe2cf4b77681e16a5e1c233afd139fba1174"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_i386.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt2_i386"; + sha256 = "a3838b71138cbb3e275b68fb3df63f880e122da10c9284354a80530254a45d55"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386"; - sha256 = "d09497c6efa91b6f7da2f009e2fbfbf645d1ab51429d2a1d6e343d3117d9adb8"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt2_i386"; + sha256 = "be4e85717069a5c9e3ef6644cd555f1122777910c6a855d912f71539c057a8b4"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386"; - sha256 = "66d17f9a42063b1af44fa86a365575695e91581b41a1e0fc6dd8d2ef049cbf8b"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386"; + sha256 = "a630adb25ecfa209aef8a1b14fac45293f044f652ee91249489dfe9bb0d5001d"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt1_i386"; - sha256 = "21d5c39c52a6d544ce3d8093858bbbbd960b37748ce004dd83e18c1bcd138fc9"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt1_i386.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "913bfbacb76700447d2edc359dbbf9c6720f5a62729fe040e215b013feed6f6b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt5_i386"; - sha256 = "b9aaa557d77f67938e6667b8e683b96c0959ca47b2722838328ed1721b4490a7"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt6_i386"; + sha256 = "91a8acb77d3beffca842257e1c6470618e2c0df24df723eda5d61170db12f6cb"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "f0a0dc3675db1a35831550b3687c45fa6e26877e574920af59278938eac27bfe"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "43de1faddc57d494f29ceb148aa98817b3e81326e6625076adf222020ffa3ff3"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1344cbfc9e0d3dedc54207d28c2e37c60342654c480403da8564507cab235960"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "55dde8ab3fab6899feb9ff4f2e04048a237e0a39afe24fed27cc4f3e625bc816"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386"; - sha256 = "5756039df908e87729ce3471b191e6d4f8649026d50aafaa2b7a2c00f686065b"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_i386"; + sha256 = "c8c58b2b6e6566a878b8f66ed75f13d5d41cec3d0969360bbab1b07821b58d96"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386"; - sha256 = "c17cc385fdde3d3bae251421588903b3cd7578c9e108d6318e6af33089bd3e2b"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_i386"; + sha256 = "0f8cb2b1a0f37745691f2390c1356f973e9904a2ab7732cfd0f6f3301fb00368"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386"; - sha256 = "e094eda1c42a52b65f639d547d2670db86f0aeeed1e93c96055f1c745cbb956b"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_i386"; + sha256 = "b3306b805c611cfca4e8aaa90f391ae5b4b9334aece7afeecca7a012e099e02b"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; - sha256 = "9db44526834e0f1ba54822d42e7140bf2c74780f531242e05206c968828f8867"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all"; + sha256 = "ee703928f39124739c01a456c727376378b9e75ed1a3f3c1d7022a2299350262"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386"; - sha256 = "8a76c9a682a4d4dfab93d39cb5ef5ba7d514aa956ff30ff7821c75fd8ca2f225"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt2_i386"; + sha256 = "a7e9be89ac14ec60774429f46530284463b0ecc21c452da8d51cc2e15d47c791"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "03e9185f7877958f9878dfb5ea6d8e6bc416b1511a915b045cb541ca14ce63a3"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "4f96dca07bce11f17c79ebe0451bf0d1a3937a59c8cd9f29ad389c5b64465dba"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "9908f097681d0d64df1e43648d94c79c94eee88526fafdd8d6fe8c5060898694"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "4ec845e9a562257953d0f15bd95adf534aaf37889cc133efe644b9a583980660"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "0229b68cefd94d7693a268c1e216b5704d31066f6ca7583e17b344cdd15560fa"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "d4b2942db295130d8b9fc441256e08bbbe56c416ea7c2cf33b2bce5cfcb608da"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386"; - sha256 = "57eba84a67698e4182ce45681013df3f4e94449f9c1c3bcd8ba12142550877b4"; - url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt2_i386"; + sha256 = "5d8bb7a98376f0e0c45e7387bad7ef165cb8057cd98f886de2334c94a3df751b"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libhogweed4.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "971d940aa0368590e3712c645b2ee9c284b1acfe2dd9b991c2a67042fde2ca78"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "d54ce7053229a9131a2b8b522d3ea7b02f633a70c05aa125e491480177bfacc7"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt5_i386"; - sha256 = "4a46a8e920879179129c313d7de67f759da4ae7486dcf55c7e128c81097fde0a"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb"; + name = "libice6_1.0.7-2build1+srt6_i386"; + sha256 = "4e6f06f6d57e62c4a779190a9287d18e47abf4f33bfcc3893d07bbfc51e8ea6b"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386"; - sha256 = "32973152c51317e5cd9831eb8ac20ad23d9f72387250464df175315f1a3aa07f"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_i386"; + sha256 = "4d92754e7610cd6013489ff03e4f78e31d64c402027cde05efc0c62f2dec4fa6"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386"; - sha256 = "784e94fa28471fb4bd9fec2788ccdb3e38889990b4edbfc3412a7be449e13ee2"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_i386"; + sha256 = "e623aa0f247ad95ddfcf480d2ae81a070080b703367f96ae378609210eabcf9e"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386"; - sha256 = "3a3e7095624ce80d0f618a98af9762eb6d2aa1a64c2b0d7982936e2d90748409"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386"; + sha256 = "a59a4de570335899d10f36b4b9552ee894fc0bb21c4ee4e06ed689f3fa55c2e6"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386"; - sha256 = "8881fa61488dd72491bb99e7e13c77ddf0104257f961f1327f6cb597fb32972d"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_i386"; + sha256 = "5c04f4da2038e4a9ae96e59b64386b598fda9952400b5dc40a0a5819dd328ab9"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386"; - sha256 = "bc452727baf09207131503ca44b5fdf95ab0131485c4ece5e25370306eaa70d0"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt6_i386"; + sha256 = "eed36437197122519201d4bf233ae3de7fd1b3cd81de286028bd4417dd0b6bc2"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt3_i386"; - sha256 = "f18fb7dafbc0e39c7902f656f78e61be75a9e60993b5b015f5b9ba238fe3cb4a"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt4_i386"; + sha256 = "ae3503b9871e27e98bfb37477c4b6e151dcf31fa7af757309d99e70ffe66e570"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "81999284fc9789940008cb3661aac71b5929944d3b75cd451193201cdc3eec33"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "4109aa8cab7e7915c226b5be6e4e334b65d896183be880b32777a18fe1b7cd8c"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt5_i386"; - sha256 = "3d276ca35a9f0dc09fe00f36bd082a804e4bd24d27b694a24ba7cc89d641ad6e"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb"; + name = "libkeyutils1_1.5.2-2+srt6_i386"; + sha256 = "5efe0be588ee8a4c41a4f34e30c5adf5b59cd3c71b1970f33099a5a2a1e45e37"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "cd9322b8ddb5ae1b753e4aa8fdf323e54bf9696b2d615955ec5aef8fb7764dc2"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "5661ba523b59f1426f5f4596ac892bd5ad626ab96f9080618a787e1bfef77fa2"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "310eadcabacc9cd7e46abc5bd5a3bf6edd6b709bda477305d29055b325f826b3"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "ffc2a0cd89ea2344ccb37a0d329380559fe5c4c6fab30f2eb004448212cd46c0"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "dcdfaac5d73f20e186b49d5a58d6dd14ec4a6b94c92c134f5f8a0887ae446687"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "40ff710cad27182ac2a419368bf11c03f884c362fb457b4dcb5d14ce91760046"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386"; - sha256 = "e040069a44f8bf9be89dec657f840c9cc236eb9955b4ff57b4e440a6dc43ebae"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_i386"; + sha256 = "5381665b17380271b4c605e22b8bc21cb7779b67fc116dae9677d667c7383769"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386"; - sha256 = "23f0bd39fa6472a020d973a9a1ac3a26873a48b06a6d501ec8bd9f13e69a5b1c"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_i386"; + sha256 = "e966ec5b3ddc132911a0bf1b789540e814b065ad3f8d77d0870e87a744ba6f7a"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt5_i386"; - sha256 = "da39ce7f16a051a61f9c95f1f6ab3dac468043fd407125115e1ab845660f60cb"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt6_i386"; + sha256 = "f7442bc77144e4c0930b82ed3c779c9ed0048fb025e02abe7ec2d8a03433a3f2"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-5+srt1_i386"; - sha256 = "4e0baef8a32d0688d9e45945ae140b42fe7974385c9e8817f95bd15399112ba2"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt1_i386.deb"; + name = "libmikmod2_3.1.12-5+srt2_i386"; + sha256 = "0db96db4334c39e4b6eb6d2c4b0350e8663047fa8a1a08258201d90d15da65bf"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libmpg123-0_1.25.10-1+steamrt1+srt1_i386"; - sha256 = "c53a28728693a75262c4d1bae4f8ea665db79a46ff2ab00995c6bfa1aff96766"; - url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_i386.deb"; + name = "libmpg123-0_1.25.10-1+steamrt1+srt2_i386"; + sha256 = "c686cb91855a4feb793bbae88c62ca18f5393c0f3b7e610f8372e7512e1d91a5"; + url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libmpg123-0.deb"; }; } rec { - name = "libncurses5_5.9-4+srt5_i386"; - sha256 = "ea81890441d53f2a71f022be6b1f26c8ae1f6fb990e2e46af80112cf373e51cb"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb"; + name = "libncurses5_5.9-4+srt6_i386"; + sha256 = "2f5b6f1c9b181e191142b55c4e910fd32b1f5ba457dfc436639551dd4d892e4d"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt5_i386"; - sha256 = "04128547b97aa17bd61d075b8ee195175f3978e49c5b728f0d3c337c92cb0e9e"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb"; + name = "libncursesw5_5.9-4+srt6_i386"; + sha256 = "0090723ceef27cd9ad30b5335cc2bde075f2958358ef84dfa59fdb779eb2b54c"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386"; - sha256 = "4eef9ef302cbe4e46ffa266856400e80ac2c8a32264a80d76e8cb92e9e4bfc66"; - url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt2_i386"; + sha256 = "41c26ae8c1022b141a1cd88c1ccb47dfa728e8a5bab9b6e4739c2299a070cdd4"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnettle6.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; - sha256 = "cdb420fbfc0a7d35ad1f5f89bcf8ce50ffea7aab2b638a3f411c6f0e3a004d6f"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386"; + sha256 = "6610f000cfcf032bf2fc325618f33ca8f8783cbb77faabbf105f484f8f650eae"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; - sha256 = "a6840b5ca36b77019130ff7abdedac0d59f7d5c9feeab61982bbc7fdfbc358ed"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386"; + sha256 = "666fc57f3747be75b0b8b0a1279f934b9dbd880b2c724cbb45f1fc7116b0c3bb"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt5_i386"; - sha256 = "9cb17f3c5619abc8135e3b5c8acf4706ae9764bbcaeecc2c922213ad1d574010"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb"; + name = "libnotify4_0.7.5-1+srt6_i386"; + sha256 = "5bace16f956c9160d5334631e4a67741675f9d4b5ff07fb7bbd6c28e7c06b54f"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386"; - sha256 = "62e36a3da1c1af1568598611c0c4d31dd1fd17fb9c36739754d065ac9c1adacd"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt3_i386"; + sha256 = "30c5eec8a06104bb4be77a2c21e553ad67a2daeb9005d762e50d97cd87175cba"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386"; - sha256 = "2945bcf1a00e5a08d48a7c63de1ba0efdb2a38d5169e1462f63dc148822ba502"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt2_i386"; + sha256 = "ed32e7feae1b0116d49412393f773ab2e85a8e94e974b915a6f459d7ee433a83"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.3.2-1+srt1_i386"; - sha256 = "21fb9c97ec166b04a9439b296c83c63a990faf5bd8e6ad9871196cf8cc554c25"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_i386.deb"; + name = "libogg0_1.3.2-1+srt2_i386"; + sha256 = "03c55a830197401e910417322e64a68fb732bb0b314857dbfe35beded40767e5"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.16.0-3+srt1_i386"; - sha256 = "3139573cf945b12f86a5100078526fd55e4409166ba61dd852edd249e0c659ad"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb"; + name = "libopenal1_1.16.0-3+srt2_i386"; + sha256 = "6c51952f61eac87b2077bbff461898c2dca61cb0b12675d4a4c7d5cebd5e8915"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "libopus0_1.3-0+steamrt1.1+srt2_i386"; - sha256 = "6c208835f9418ded17b548af02fcd43827c4e296a5da4fececaca829a14196e8"; - url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_i386.deb"; + name = "libopus0_1.3-0+steamrt1.1+srt3_i386"; + sha256 = "9e75dedd1f3b7a26f2ee8ccab28652d292e2e5a3cf646fd8dbaf0b9d7b09a683"; + url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libopus0.deb"; }; } rec { - name = "libopusfile0_0.11-0+steamrt1.2+srt1_i386"; - sha256 = "348ac5a19e53c7023654d584c1cde402dfc82a91effea809c3a6bf0b20a01aa6"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_i386.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt2_i386"; + sha256 = "e21bc67e69dd8da3e444558b7969b2d0b2bbdc9e58571bb1bd3349ea1561bc47"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386"; - sha256 = "9b687d2e89070e4d81202a3e2631a7ca07ce25b594335221afa44d3c749f2e59"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt6_i386"; + sha256 = "7b666cf8cb3c085c7814bf43c1282ecc2f429f73c2ce45c9328b578a51512f3f"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386"; - sha256 = "730107639994d75eaaf8c50cb942c00799b31ad50f42efee144fb94e7547772f"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_i386"; + sha256 = "7964bb2eed3474552410febb241b389ead233483f48f763530892d775562c253"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386"; - sha256 = "3cae021c2ad82960572205c4f4ac5c04416d6ee040cab3361739d27a994fd570"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_i386"; + sha256 = "5ca733d41934a821211a9f19df88fc6ac6ce0de9dcda489b857850aecc134599"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu6+srt1_i386"; - sha256 = "68b2c47fec325158a16c591b52d8d11e47a528670a8407a09bb74334c09faac9"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt2_i386"; + sha256 = "dc2a159788b32126fc54de57c6bdfa2cd9562d10f1fd00f82463dd322810113a"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; - sha256 = "e53ed5da97acdd8abf4edde365fcbe6246bb5fd50626f4168690767e916ccc8b"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_i386"; + sha256 = "ae551ed76da8280b86afd5d802b2ae9a69091b297cee80f94d1f41d8d8b13f5d"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; - sha256 = "1420bf86a15305952908597de22211c978d3bdd0c8f80fcbb1335ab50e5c8656"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_i386"; + sha256 = "2b851e8a0d6bad221bebd9ff4ca05cd8e675ffb85b61dae5eb75da8304ea6499"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386"; - sha256 = "2722ac47e3f18cd45907ccbabe0d8d2c58ae3218498ce48e61a2cb2a753b9019"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_i386"; + sha256 = "90a0b2a9949791775f042d24547fe170c5ccedcd4b6fc72f15c3b549b7d6fa16"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386"; - sha256 = "a8b972b6e3efe75bb2ea86b1cbee5178ab3c5360897272c3adce76dcff02616f"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt3_i386"; + sha256 = "0d4e60f28c9c034db42ba3c1332ce1898280aef31bc7d997c9bd473ef174557a"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386"; - sha256 = "4c99fee1fa5c14219e7023f324c0320f1a272198ade607882caa46c119e2303b"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_i386"; + sha256 = "0299290b5f4170cbdc60ff2336f06ac3fec72888419ec93c570c171d2abe7abb"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "cd3555e0c01f7e21e27e5d9dd65bc12d62704b2146bff7326e4026fce8eb0489"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "8827d782d8fedf7fe0285bbab14914e61d2ac5fe5e7ea297fbff916c7fd73939"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386"; - sha256 = "67af751a534cf05de2516c9f4b3c8677d6808c3fb7da24ebd19059eb4f453e31"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_i386"; + sha256 = "dd5c06e9754fa7fb48a9d16eb5ee2e4a5e8562140bd95c8367f1b967aa162b94"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt5_i386"; - sha256 = "1d0d056544eeb7b047354f649508586cceffcfbd36f9a4082a49da0f0efa0c1c"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb"; + name = "libsamplerate0_0.1.8-4+srt6_i386"; + sha256 = "3d412bca2cf9d8748332cf75ec3abb98bc6afc6997f11eecf7918a013dc42a52"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386"; - sha256 = "faa7f501c8d67b73e3880d767757db6596d070787b41ca879ae2adee3ecc1682"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_i386"; + sha256 = "a69496b285f0a647b7ea65cc6cb78515380a34b0b2d59b60ce66ee20862837fa"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt5_i386"; - sha256 = "0864eed9e3a4da55cbfb82ce4299fa65753c58494c9e61b73a3a126abb2a5545"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb"; + name = "libsdl-image1.2_1.2.10-3+srt6_i386"; + sha256 = "32e12a48d336867d123dfe51931291bc29226a6f5d79183f2857f2aea1877409"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386"; - sha256 = "66bc658b9c48fea4cb8b1d38607665d4008d885401335f3f78c20f720e8e64ff"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_i386"; + sha256 = "f9200b6e6167f98379cce33579778ad48e6b64326de3aab4760f55eb380031ce"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386"; - sha256 = "48798ad231645f1d76f8abc866e523728e8a5062453402991a05bcbafea02b97"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_i386"; + sha256 = "9e60d12dbeb8ff45a506beff802e7d9848e8c2c9d034e8a40dafdbd8d79b16fe"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386"; - sha256 = "8a20885501792887807f9a8cc896619aa8dea3758d68db1b35a8274bcc7b46b5"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_i386"; + sha256 = "7308d759f752130d80153e0407ade1c20c8cfa4b60844eac11242a5cff90148c"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "e3e9b9b92a6ee42f52e00ee59198696e77ed2a8cdcccdd209df86f9d7db7b8f8"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "b33446315351af70d2cfd602d5ee9e2390e2805b10f199dff383917469a3b344"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "fa72e7f49489dc6fcbef4642dcf41e7c7a490407b62c213f0d4e8aea8a417dd0"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "4783fc8d0012b5a1b917336af3fd7db097c0c43153bb088df0fdd9018b8c4072"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "33c919cc33761956be7a7c69ffae327b5c76246a5f1aab9a3ba069bdd87b2735"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "4c7f511b947e416898b169694ef112d137674c9add49162ba1185c36e83b3604"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt2_i386"; - sha256 = "8a703e299c2fdded892259e0881d182cd4cc46f2996eb4c2d0410063462b643a"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb"; + name = "libsdl2-net_2.0.1+srt3_i386"; + sha256 = "f5eba8169255366fdfc809183c89cd6d7ce88da96c6a56cd3da5f8af68cb31d0"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt2_i386"; - sha256 = "3acdc6a1fe3417ed00fbd4fba59fb5fc1a47c593d804d193ce0512d0d2f6356d"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb"; + name = "libsdl2-ttf_2.0.14+srt3_i386"; + sha256 = "db1b89ffc678d7845adb3fa57b04865921521bd97603d28751248fb8f367d909"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386"; - sha256 = "6fafb8e99d2772e38fd3a66b60a8cf24feef3f756bac7d139106830e8910bd68"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt6_i386"; + sha256 = "ea30a8bf5aa90d59c134b9c5167af679043412ef24f82135fd56471d305dcca8"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt5_i386"; - sha256 = "cd708785ecfde8fb25fc118c2b763bfa1889c6ba183b6f001e50c9acf2d0791f"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb"; + name = "libsm6_1.2.0-2build1+srt6_i386"; + sha256 = "2eb05653d4ab704b9cf3c6c30f904adefd049f226bdaf09e2666b5e12856ac70"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "4908af941ea4c79fcff1a8b4a8957e08b22dead6520fc0b5638f36768ca39078"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "5eb7acd671c15410fbf4cf92259683d5393e9c2c557ee83a10b618462f5cc4e9"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386"; - sha256 = "37a96e440aa0597be8d3077025c1ec62a2866b88f126f2ed6e06b6927b13c634"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt6_i386"; + sha256 = "3829a1931ffe4eed8631662fec5929e343d38b6f04d33ec05b3192d16aab6c02"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386"; - sha256 = "459cf9ebb3dc15b39b5180c31f80f0a34106ecf6e7d6159375b46b513f6b44a4"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt6_i386"; + sha256 = "e78b470eaeee57a603778caab2f674113442a3cc5aa8362d010e4a3d52a7f078"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386"; - sha256 = "fb2de44fef3d09c25052727d10583475ad8c57e383ee4aede53d5c35a4839115"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt3_i386"; + sha256 = "354c0f27b4b09df3f189e376c061919e8a58a7cb7b45aaf115b4efc6ba522133"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386"; - sha256 = "27ef1fd95e3b62fe704410be940f0282263d4d9b50bc1f04f84f38e9bb4991cf"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_i386"; + sha256 = "01bb99e42c7bed8c60f1ef10411b9183e506f207b54a86ff8d8de339b2545d58"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt1_i386"; - sha256 = "27521064164b077fa43707dedce92a1c07205163e1095cb823d9e848eddcfd7e"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "9f2fa400eff42b165314f024359d843c5509eda6433ec6ca82bd21d638a228ea"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; - sha256 = "fc6f70751ab28bd4384f75ecc4123de0cbb355356e220e8981d01514caf7b0a8"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_i386"; + sha256 = "1785346063763eac850d46dd7db1736e0ec1b6d8ebc84090f54f5b2b1380829c"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "4da505f2728eda75c54a9a0958506b5928c9830ed85c8b9aded5acdca1fb47b2"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "938ac8ecc9f75f070b65b5d8bddea58d89ba8e1673d004d1b20ca0e1f677ba14"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386"; - sha256 = "942d327c7037f3ee33a66e8a698fcbcff9a91f885bb716e1c18a9a33b38d8e8a"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt3_i386"; + sha256 = "53b976faaa1439908e3c6863a4bed431f6eb245aed96219ddbd9d7f996651484"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386"; - sha256 = "3486c3a3f64ea9a23c811618c2178f018f87f98139e60c2e51bdf8ff3de46d85"; - url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386.deb"; + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_i386"; + sha256 = "d61296eafece7f6117d0693e0e321ea78d7131475941e82ace9af4d6727bee6b"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-6.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; - sha256 = "ff5e8715cb6c331d2ea468eace228d659be4ff0eea4d73d1085b52b25156e52a"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt2_i386"; + sha256 = "f17214134f0deda6e8340163bc4224c7768f7f6f81dce1f9b6c1444b310ee1a9"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt5_i386"; - sha256 = "d8c8b7c003f113a455ae5c357bc88007dbbf7ad347b9ff84ee586a673a02ce6a"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb"; + name = "libtdb1_1.2.9-4+srt6_i386"; + sha256 = "83649ae1b0da1d92a5efa5eca63e8b1656cf902e2f84b6b4c90d8a2a579c2fe9"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386"; - sha256 = "37b3eda60503684c08c94d583170053855ee1fd18335bd2d2fbb70efbd694bca"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_i386"; + sha256 = "f1f8063d04ce6d4d98f0f7bb44afa87e299f391140167a45486a6aff5d1b740e"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386"; - sha256 = "5b32618324da00f7be2b5aa8d21d05ff1be970a7cb3837fda351956823115c51"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt3_i386"; + sha256 = "8bf74e45a2a6c7a254d5da76e1671d95e4a3ab2a9d769c352409a6b0b0a9e162"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt5_i386"; - sha256 = "add6d819972b17dcc9501830677bdb7d7e9ffe00cb31c49cba91d5d2e697e690"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb"; + name = "libtinfo5_5.9-4+srt6_i386"; + sha256 = "9c186721047492fe4b95305921a9cba162b645379625251ea8a6f55ea5ac1212"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt1_i386"; - sha256 = "780c81b3238a510da420b7e463b9dce4a8eded30785b02ab313a93dbd57f5b5c"; - url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt1_i386.deb"; + name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_i386"; + sha256 = "973a3a2dcedad45fb714a4ba39b10b9bc847c2e29f7ecd955e38256669e2139f"; + url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtxc-dxtn-s2tc0.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.10+srt1_i386"; - sha256 = "6a7ab631a7db18f19e5a3fd4e81ea20c0bcb7b8f4f71fead7d862721f63e3f21"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb"; + name = "libudev0_175-0ubuntu9.10+srt2_i386"; + sha256 = "113ae87943a82a200dddbd954400054a285a17a5eb41204d3c26bcab88759384"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt2_i386"; - sha256 = "b0320fafbb50ffdef121eb53abbd6b4b711355cb64614a2cecc89cfa428e56e6"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb"; + name = "libusb-1.0-0_1.0.19-1+srt3_i386"; + sha256 = "92a1d5c358c4be0afe7467cf81d9662a2ba74a8d36d0bb6254fae756adfd2e1d"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386"; - sha256 = "68eded768044331021fb8c04d43e69f6e2ad09ab8a013d6dcdcb8741c84745f7"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_i386"; + sha256 = "1ff9ef3e7f5bb52c9ec5ff8c403610d42dd82c68a58c062ff7c089062195edd6"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "5d4f636116bdec7368a39af6d6fc9173204b3473f5b809259090528abd562ae0"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "d9e84658add810853ef5c07729afa864ea07be31b513a2eb5fd569328a9555a9"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "17f9b3c990e984868a3badd5634255e0c8b1c94d454608e817127121ce4367de"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "1d2e3d83d02dbb83156edba8f6b1564baf795e84bf9c4549db100722f42d4a04"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "252e512620fc7b8b55ec5c8bf8a89c0ead5726ad61227642ab1ea3ad11d4349f"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "f32d8049e071903b6b20648b0a30c4300603b2eb0635c71243beb58d9746dce6"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386"; - sha256 = "5217adc401afeba22d45b174265e677d7e4e215cd7dd747897de66c2b55e46e1"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_i386"; + sha256 = "8ec0513551e19a25934d113cf2f9d68cf2c4b3b65a6ba786f7aa780f81fe2cde"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.5-4.2+srt1_i386"; - sha256 = "c457c17ee9f79914a36650a09c8adb1e474e8a14f54726f53c539c190ce2a0f7"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbis0a_1.3.5-4.2+srt2_i386"; + sha256 = "31d23a2774150163005db54371ba02eccaebfa5e1904360242eeeab922f02b5f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.5-4.2+srt1_i386"; - sha256 = "c1cf17a3e263e50391aaa2ed8b8800b7263f8e574533cede6a5ddb164ec5ec0b"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbisenc2_1.3.5-4.2+srt2_i386"; + sha256 = "7ac2c4e1fe34f2208b0fcc57ddbbf997368a003bea15f22efd34afcc6abde75f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.5-4.2+srt1_i386"; - sha256 = "64b1a4584a1af2339e35a4d4dc409c08d5d2873896dd5fad21355371e2bb031c"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbisfile3_1.3.5-4.2+srt2_i386"; + sha256 = "84dde5077123a8904c4977830382b608c85a4a50b63b5b5de0469682d93030db"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-2+srt1_i386"; - sha256 = "51a92fef20fda32b9baab8ce52f4ecd1707fdf44e9307d993fe85491327fd623"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb"; + name = "libvpx1_1.0.0-2+srt2_i386"; + sha256 = "9d31c1bf683110d48f7e720751430f2bdd4b58d22d10f7b29962d727bfbcc596"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386"; - sha256 = "06491a171a10791cbfbd117adf2dee3f8973d3e0f462a331b613e125a61d2e3d"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386"; + sha256 = "cac788c3fd6cea1ff7235f9b14f82eb8121e209743f08d15529e54732e692e05"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "709ed89faae658cf29269b3fd9a44ba869844ee8aca0863175f286c90b26f2f7"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "6eb4a6d45a5a37f96c0b96dd08f9d7dbbf5d67c4dc9627472e5c7f6e8dcdecd2"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt5_i386"; - sha256 = "760c09052f66c122a292f64986bc23743cb040c93be6c6c17cadc4cbd24e17d2"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb"; + name = "libwrap0_7.6.q-21+srt6_i386"; + sha256 = "f16e36075faa59bb1322cfbbfbebf99f858f84e31583c8037377f998d1bacaef"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386"; - sha256 = "f50a68ea2d1ff298e68f9d9e3cf887d0fe2c635d4888e2b071f60725d1196f57"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt2_i386"; + sha256 = "8b227320572f1bae0f64fca805558c6dde6b9aab9a8c1276ea8f787ff4d621d0"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386"; - sha256 = "86b419f07b4551e8a00313897acd0f9f5eb5166285bec442b0717b4594b6f66e"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt2_i386"; + sha256 = "7da5d7a8704f93ee4b001797bf92377d82effcc9323382e619d253df4378a94d"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt5_i386"; - sha256 = "b84259e6169e916b6bfad689358f2dadcb8646ebb87caa9864e0d9a2a0cfb8e0"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb"; + name = "libxau6_1.0.6-4+srt6_i386"; + sha256 = "7a8f2c897f4dbca167589e631ed5a2330da95739901a83de227fb73179a1cd7c"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt5_i386"; - sha256 = "74d6893cdcd0d0b1d3fe5389de3e37ee046b23895a16dedf6216a67ea42f089c"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt6_i386"; + sha256 = "bebb30c03a8d2ec3e9c7761467d240884ea9c8af974ccc420f2b68f4dfb25f46"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "45190c7a113fb0c2e7632984f4ec72587fce8267540811e5d10f1d670df0ee03"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "14dcce8eae67f17d6d118f516716c3c37b377e792c70ba8d5eee024330c6cd55"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "67b91f165db7b3be9ffcb8763463de5a67a890bc9cafb41b5515dc498c46c427"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "eba4177cc53cc9a962021248ed9e10f9644ec9dc0c82ded1d88c741e0db4b281"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "06696f4c7edcc4003b56b14a034af5eecc4c6e9768eaaa6be26a96e02006ab20"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "6aa16d10d782109331c253e0ad2c34e4b253b035851d9b9d3d1ebc53cb761fdd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "3887788a0d5792adb6296734df1f725f78b2647a83a141ee51ac77054ac98ddb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "4d93975e2ca271f08a5c3767b4cc0732d1bde19d3d316ae86887ec2b219a2330"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "f919baabd248c97e2726e2e2ae8b90eca16e81482021db108933b779e9a253ee"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "716024b99a5a9ae8ac2f25bf138872467b2d878457d064d80ed9c123554890f4"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "262f4ab2b926b1421dcf0946de4ad4f7167c034627665922376a2e9310438c7f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "dfc32f406c1b8e7d388da08eb44219f2ac0dea671cc904fce2848e5207c01517"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "fe0d9948ea9c593c780c6602d642fbf039d59013649887aa3dcbe420bd96a431"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "178eb8ef45f7905e7dda7d072c45ed22ff258a1271b4aa23fa288a6e8f3df259"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "c77398b3c64fd98fed35cbc50467cde9094d1b65121c898e0057621cf05cd9ed"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "80c961ca3c4f65731395f28382563b35716fec8ba1821b67b3d82b676dada3db"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "f2b49520eff6e373e1165a17e8596895db9967c00f6e848d4a85b5184ca0c73f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "647639154c1395f23e9f211b72463855db0514b7773c2f9cf1d3fb2cbc05c867"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "2e2737b97454bd568ffefa2b58a1c47af74928af1b6d30ee68eede02131a873e"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "a6d472270333f97a16fd53b91131c24f2ba041638c64e7102e5cf1d7eabc904d"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "39fa631d842c6375cde4a90d6bfd5881f4e20af567c9a9e47499592cc2a445b1"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "e775fa90992262b7c95bf7f87a7798b66860a220695658a7126493ce3a6539fd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "7a83feb1fae11a41404cd297f19548332efd25257c1ac74eaf82fef3814ce46b"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "b1db9ac5b0769b942b77a848d81192fa7a6ac256a929cf4c2041e9effb514593"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0d2e221bc8db24d7794efb5b913eeeb23148635e9ba84a1862c7b61ed1d4ccd7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "408ad0ffea7751ac9284fc98ed4aa515493f2b1bea81ea6cb25f18db66dbbadb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "8371d4075f12bdda28340a0702ae5bc65b735523fde898282ef93f88da280df0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "4974ac189d90500e577b17beec8ea8c6a2cab4dcad1cfe8e81864b23df42602b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "6099cb5221431daa4d35e9554d1997735f77704b08116824b848c0830bbfa0dd"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "9cd68cc830a6ccf81bb2e1e24227bbd6a94b2b0e3f80cd287a1761fe2d58eceb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "b7207cf6e72cad418ef777b09d57bd423afea89b5ba55dd152fa16e764d1c359"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "8b538e6e9f305fa25f93f706dbee2fbc5d4ae68ae7e2219a3c8ecd4bccccf767"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "30c430d9f91b43c4ec936673bb291574740907d5793738a57c1642e3a87e2d91"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "642e4b1fb439e5da1d19cd79e4e3baf5ff2a45095c7943338b5f0c2dc2f9053f"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1fcc8ab92ec80c2c803c2e58ad15bf651d0d3120d8f57e402ff5f7eef6b25ee6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "bfd93b091ee389375bbd5f4a8b8dcd310fc0dfe865ee70036311af2b87a1c1fc"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "69facf32640f99705d6f8a7ab17b1880fa3ef6709aedd4e1148c80000a231b54"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "9f98414285c57d89aa589967e7fb1c15baeb41d1a4029ad1e658cfc16d41f666"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "fc0c14b7eb5b3c544e982c1576ba73847bf67e4d76ddb103b36a7aa277dca634"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "f2bbade8fa986997e27e4b4f6d58f8d13cf89046f30832d25a2ad2a5bf5b2deb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "359ab9cac3f861fb8ba8a9f1e1d1a8e0f6e997524362bc8040c198f6f471943d"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "ef3b153da4e557139326e3fe5725a6e81c405a870cfeac0c2b449cb3a57dcb08"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "d57578d1eebfc6ffcb487ecfec57b0caee4d76830db18c472936b59746bf936b"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "1e2e21f204725e8db972eb252d35a44d446f82e7b1fd63e49832f243c90f5270"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "39189288273815947d2017bc5bc40f43b37389e70993abc2e9644cd7c14c2456"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "f76bde000e9035f4a3ae98c97f7a8cd0fbdd4061476c33d92d7c82ea7b4e8951"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "d00a775a2a7ad96173c16d7ee099f86e2a6afe21eaeb4698a390f89c3c181e19"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "8f86701038d861ab35144640fe811493050e7c66d0b126acaa1d1cf0841026d6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "6662608d7fc07035bff0ceaa54d3fed75dd85c87c203dc2ae065ae92652dea69"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "ac86d7cc48e543a8314df90e22ab5f2f6441c5a9592885075f3ded255f566215"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt5_i386"; - sha256 = "4e53794b2180898535cd74a6d502957ff6cdaa9b73500ccbebaa44cfb88e43b0"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb"; + name = "libxcomposite1_0.4.3-2build1+srt6_i386"; + sha256 = "b340871ae381d5c88f548ea401e8716fb2c0ab5f545f20bdaa53c1b86fcb5657"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386"; - sha256 = "7df99c62b0374e5bc9134e2c329f1f093bbac494812bf57f1c5a4042a70e62a0"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt6_i386"; + sha256 = "033134cc5bddecff760d23f900fbf82160ae9913d8a775d8449d76521a225523"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt5_i386"; - sha256 = "1871be08fccd3bdc6b56209263eea0f1f56bff74565398b3dfa3019935a9ea06"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb"; + name = "libxdamage1_1.1.3-2build1+srt6_i386"; + sha256 = "2312ed64ac73865703a2d52426468e04ab9051e7dca7ee2b5f6adba7465ee5dd"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt5_i386"; - sha256 = "b071a102fb1181d5c480091c243d31ed697cfae71c993816887134ea43e0e66f"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb"; + name = "libxdmcp6_1.1.0-4+srt6_i386"; + sha256 = "770dd69e60b9480853807ce666efd456ed33a1cc1ef6211120f7ffca5ce0aeb8"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386"; - sha256 = "ce53e48d1f2ba1fc51e25ea594a93463a5acb1b005de6c08e99ba7898d6e5286"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_i386"; + sha256 = "07b6198a9e98a0f2995043ca6801eeb10ab1b448182ac96aa6edec9d5d0a999f"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386"; - sha256 = "064ab5059492364f6a3c6768301e91a5170208606ae94965d47e1fdc824635a7"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt3_i386"; + sha256 = "8821073c0b8742d9376e97040ae57b99350f501ddeb11559c0ab22b575f79c85"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt5_i386"; - sha256 = "27bd10e6d1130f6d90dcfecb668fb66f456aaa0634cfb67a5c8140daf6428d5d"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt6_i386"; + sha256 = "d5321b1d50842e1fdea5d6ddffc68deb04561c3113b1999f175ff3b890460ad4"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386"; - sha256 = "3775122a6eb2cd9a1764229cb6eec0d7169a9b101ccf5543baecc804a1bad35f"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt3_i386"; + sha256 = "403a6d281489c734eb221b4345445c85e1d08726de5424c0977eb075ad65c39d"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386"; - sha256 = "5b01bf5eb53f9d593d65c80b3e7dd0085547fc9ac546640d1cba0868b2cba075"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt6_i386"; + sha256 = "a1433017837dfef1e89a59da96fc762d777f424ec0576c844df299e1f8c1de23"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386"; - sha256 = "df88c9d85049584bc0084f2ea4ef3f9664574b4fa585fa5885a8be86db7547eb"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_i386"; + sha256 = "01c070b6cf8b9bbc89691680ecd283124a221f4f9a774b92da320a994ff9934c"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt5_i386"; - sha256 = "5c9c98f3820622581e52211f4fb3864dc7dacbe4a12ade5ec04ce88899fa697c"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb"; + name = "libxmu6_1.1.0-3+srt6_i386"; + sha256 = "8af5a4dbbd4543273660a993b5844fe3e4fe08039029cdb831cdfad913189784"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "58ffd6f5d6e632047bdad22b8638ebf58b5017d952bee3f004b410b18d05670a"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "fc122b2d9b319e2b2d6820f99991340be84c897934c215dd45992f1cdd93cc3e"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.5.0-1+srt1_i386"; - sha256 = "72fa2322756fb6138fb10c729edea5b46db4cf46c43704153740f72674cfd882"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb"; + name = "libxrandr2_1.5.0-1+srt2_i386"; + sha256 = "7cac5a272f54cbbe4d4a6ebec57f916ce27558ad4658e2a7bf7a0da821ea4814"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386"; - sha256 = "1bf3098bad2e51f0141638ccdc6883ab7a881a47b98214d86b206df7495c8844"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt3_i386"; + sha256 = "ca115703917963c881e4a5e2fdd46bf407750b2b21d5cb68f3d9de1848a37607"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt5_i386"; - sha256 = "9f38079ce4d805ef285eaaa9348694575c42a88ecff43fca7a7b130a030db604"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb"; + name = "libxss1_1.2.1-2+srt6_i386"; + sha256 = "b7eefbf2398837f0edc399a0814270549622309c70cea499ff8f360a0ed553e2"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386"; - sha256 = "4969e2c62de1d3686f5dcd7f6faaa6299c40dfcb306cbcdc2ac627988d340b7b"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt6_i386"; + sha256 = "2a0047b8b965e88e4102251adeaa8ee06f1f8a5c473b05b66780737c078e3a14"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386"; - sha256 = "ad1f4db35990af589fda23e8357dfd9a139fb753aad57ff31af5c52598b741c0"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt6_i386"; + sha256 = "3f71448e6e4c2268a6b7d2434857fad087dcf5ab7bffffabd4dac85cc9b6101f"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386"; - sha256 = "4f337d533cb29171b139bef48419f05d8df4313fdfa77e1168ec861750887d8c"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt6_i386"; + sha256 = "e35a581221121685d195a30fa8d9f380b97d4ceda381c6283dea2cc055b8a9b1"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386"; - sha256 = "52faa136a94f0e7d9e976e5c60114d4dcc1c8739fd2429a4088c85e83b98705b"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_i386"; + sha256 = "b1910781d9fc65f75cdf0c73aed63274185c6fcd9e9ee02ea5500fefa10e3dcb"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "steamrt-legacy_1.20190320.0+srt1_i386"; - sha256 = "d66cb2c0dd90b32198adf6700e22e2b2da7d5bfc2e7e6f25fdd1beeaac5f8caf"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190320.0+srt1_i386.deb"; + name = "steamrt-legacy_1.20190624.0+srt1_i386"; + sha256 = "22bb83259ee421abdb7cb9877365460619011c859eaf4119615e55726defa56b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20190320.0+srt1_i386"; - sha256 = "abe0f70b7b165e6d9a0aa4d8238921a5a9f32beb94c4a4bbce7a15c8c40a9d11"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190320.0+srt1_i386.deb"; + name = "steamrt-libs_1.20190624.0+srt1_i386"; + sha256 = "f9a38284deb9c08fbe6f3b8d1617bec74bb803d639a0a77d77736f19a1de765a"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386"; - sha256 = "8d2d8587abb10e2aa9b11befe931a2feeee5820953d1c1af0a09a1cddaaa4012"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; + sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt5_all"; - sha256 = "27c90bd85c4ff3c9593088d62a19537f7250910dcdd28c278bd6c71157e8be88"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt5_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; + sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386"; - sha256 = "07b25f5fb3b27058ba8eded04b5c8d05c7f2ee60052c2d5591dd71082d6578e1"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_i386"; + sha256 = "998b190f03be3de22d1e4822bb0b6e77db15a90321b4ae51abf1f0bd5b9f9190"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 3e29ceb5b01f..9bbdf0474e1a 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -2,14 +2,14 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.59"; + version = "1.0.0.61"; in stdenv.mkDerivation rec { name = "steam-original-${version}"; src = fetchurl { url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; - sha256 = "17yrziy2bmzcppp5v3ycdjll250k4idak4rjakmw8gvr96whs255"; + sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 1b51130768eb..5333dad68798 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.2"; src = fetchurl { - url = "http://sebastian.network/warsow/${name}.tar.gz"; + url = "http://slice.sh/warsow/${name}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 12832f2a4391..c42aa3198259 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation (libs // rec { version = "2.1.0"; src = fetchurl { - url = "http://sebastian.network/warsow/warsow_21_sdk.tar.gz"; + url = "http://slice.sh/warsow/warsow_21_sdk.tar.gz"; sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r"; }; @@ -48,5 +48,6 @@ in stdenv.mkDerivation (libs // rec { license = licenses.gpl2; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; + broken = stdenv.isAarch64; }; }) diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index 4076a8c3a3af..1975e2d37907 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/wavexx/acpilight"; description = "ACPI backlight control"; license = licenses.gpl3; - maintainers = with maintainers; [ "smakarov" ]; + maintainers = with maintainers; [ smakarov ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 11873e6f2a06..789aabce0435 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 000000000000..328e8ce45625 --- /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 000000000000..2bc9422b061e --- /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 000000000000..d4d444979210 --- /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 000000000000..06660ebde988 --- /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 000000000000..de0964c758b1 --- /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/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 392f5618b6e5..a14f18da4669 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined -, gettext, libpthreadstubs, libXrandr, libXext, readline, openal -, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev +{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib +, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline +, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: @@ -15,17 +15,26 @@ stdenv.mkDerivation rec { sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; + patches = [ + # Fix build with soundtouch 2.1.2 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; + name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; + sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; + }) + ]; + postPatch = '' substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ --replace " CHAR_WIDTH " " CHARWIDTH " ''; - cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DENABLE_LTO=True - ''; + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + "-DENABLE_LTO=True" + ]; enableParallelBuilding = true; @@ -36,11 +45,11 @@ stdenv.mkDerivation rec { libevdev libXdmcp portaudio libusb libpulseaudio wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; - meta = { + meta = with lib; { homepage = https://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ MP2E ashkitten ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. platforms = [ "x86_64-linux" ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4f48f1248f49..ab8ec6868cf2 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo -, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline -, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls -, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext +, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, miniupnpc, enet, mbedtls, soundtouch, sfml +, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin , CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: @@ -20,27 +21,27 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "5.0-10751"; + version = "5.0-10879"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f"; - sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3"; + rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b"; + sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml - qt5.qtbase - ] ++ stdenv.lib.optionals stdenv.isLinux [ + qtbase + ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; @@ -50,14 +51,18 @@ in stdenv.mkDerivation rec { "-DDOLPHIN_WC_REVISION=${src.rev}" "-DDOLPHIN_WC_DESCRIBE=${version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + ]; + # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = '' + postPatch = '' sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt @@ -66,18 +71,13 @@ in stdenv.mkDerivation rec { postInstall = '' cp -r ${desktopItem}/share/applications $out/share ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master - '' + stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/dolphin-emu-nogui \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ MP2E ashkitten ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 4ccdb254daa9..023e48fc991d 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "4.0.1"; + version = "4.0.2"; url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk"; + sha256 = "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.9.0"; + version = "4.9.2"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "04y7w57cgay74227qci1bjbzwvclkawwljqvgd7a5yhhdz7cfblf"; + sha256 = "0x7z0216j21bzc9v1q283qlsvbfzn92yiaf26ilh6bd7zib4c7xr"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.12.1"; + version = "4.14"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "09yjfb2k14y11k19lm8dqmb8qwxyhh67d5q1gqv480y64mljvkx0"; + sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1bvpvj6vcw2p6vcjm6mw5maarbs4lfw1ix3pj020w4n3kg4nmmc4"; + sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 20ba1295c422..bfca574cd497 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkgconfig +, fetchpatch , platform-tools , ffmpeg @@ -9,10 +10,10 @@ }: let - version = "1.8"; + version = "1.10"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; - sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443"; + sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb"; }; in stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7"; + sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq"; }; # postPatch: @@ -39,12 +40,18 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg SDL2 ]; + # FIXME: remove on update to > 1.10 + patches = [(fetchpatch { + url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff"; + sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b"; + })]; + # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' echo -n > server/meson.build ''; - mesonFlags = ["-Doverride_server_path=${prebuilt_server}"]; + mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ]; postInstall = '' mkdir -p "$out/share/scrcpy" ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix new file mode 100644 index 000000000000..aa88bd8a96c8 --- /dev/null +++ b/pkgs/misc/scream-receivers/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, alsaLib +, pulseSupport ? false, libpulseaudio ? null +}: + +stdenv.mkDerivation rec { + pname = "scream-receivers"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "duncanthrax"; + repo = "scream"; + rev = "${version}"; + sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w"; + }; + + buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio; + + buildPhase = '' + (cd Receivers/alsa && make) + (cd Receivers/alsa-ivshmem && make) + '' + lib.optionalString pulseSupport '' + (cd Receivers/pulseaudio && make) + (cd Receivers/pulseaudio-ivshmem && make) + ''; + + installPhase = '' + mkdir -p $out/bin + mv ./Receivers/alsa/scream-alsa $out/bin/ + mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/ + '' + lib.optionalString pulseSupport '' + mv ./Receivers/pulseaudio/scream-pulse $out/bin/ + mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + export PATH=$PATH:$out/bin + set -o verbose + set +o pipefail + + # Programs exit with code 1 when testing help, so grep for a string + scream-alsa -h 2>&1 | grep -q Usage: + scream-ivshmem-alsa 2>&1 | grep -q Usage: + '' + lib.optionalString pulseSupport '' + scream-pulse -h 2>&1 | grep -q Usage: + scream-ivshmem-pulse 2>&1 | grep -q Usage: + ''; + + meta = with lib; { + description = "Audio receivers for the Scream virtual network sound card"; + homepage = "https://github.com/duncanthrax/scream"; + license = licenses.mspl; + platforms = platforms.linux; + maintainers = [ maintainers.ivan ]; + }; +} diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index a75c6c1ec76d..d68ac0f9fc19 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/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix index 91584bfa1fe3..8adf6a1e4330 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/misc/themes/kde2/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules , qtbase, kcoreaddons, kdecoration }: let version = "2017-03-15"; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "kde2-decoration-${version}"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 54715c01a9ee..348b4ae4eb94 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig +{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation , gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes @@ -7,7 +7,7 @@ let version = "1.9"; -in stdenv.mkDerivation { +in mkDerivation { name = "qtcurve-${version}"; src = fetchurl { url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; diff --git a/pkgs/misc/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix deleted file mode 100644 index 50fa1a9ef0ee..000000000000 --- a/pkgs/misc/tw-rs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl, curl }: - -rustPlatform.buildRustPackage rec { - name = "tw-rs-${version}"; - version = "0.1.26"; - - src = fetchFromGitHub { - owner = "vmchale"; - repo = "tw-rs"; - rev = "${version}"; - sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia"; - }; - - buildInputs = [ perl zlib openssl ] - ++ stdenv.lib.optional stdenv.isDarwin curl; - - cargoSha256 = "00v0b2vjal1dar4kwqk246k44mjyi1zp18hyj15dsww2972bm3b7"; - - meta = with stdenv.lib; { - description = "Twitter command-line interface written in rust"; - homepage = https://github.com/vmchale/tw-rs; - license = licenses.bsd3; - maintainers = with maintainers; [ vmchale ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7ad6283c9308..4dcfbeecb76d 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"; }; }; @@ -2102,6 +2113,17 @@ let }; }; + readline-vim = buildVimPluginFrom2Nix { + pname = "readline-vim"; + version = "2019-06-10"; + src = fetchFromGitHub { + owner = "ryvnf"; + repo = "readline.vim"; + rev = "a7c754acaf0aec922d4a6bde908a636578ef82cc"; + sha256 = "16fawg7fnlipn1f41cn1qc83dhr63qhr1bwn3qmr8sy7rbk5lihr"; + }; + }; + riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; version = "2019-02-18"; @@ -2137,12 +2159,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 +2190,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 +2236,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 +2412,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 +2819,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 +2885,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 +2973,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 +3048,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 +3127,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 +3215,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 +3259,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 +3325,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 +3369,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 +3402,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 +3655,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 +3733,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 +3854,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 +4019,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 +4096,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 +4118,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 +4316,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 +4338,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 +4404,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 +4459,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 +4547,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 +4690,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 +4734,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 +4866,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 +4888,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 +4910,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 +5021,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 +5066,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 0281f9220e9e..d5a1ed67665b 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; @@ -122,12 +125,12 @@ self: super: { # Only official releases contains the required index.js file coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "0.0.73"; + version = "0.0.74"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; rev = "v${version}"; - sha256 = "1z7573rbh806nmkh75hr1kbhxr4jysv6k9x01fcyjfwricpa3cf7"; + sha256 = "1s4nib2mnhagd0ymx254vf7l1iijwrh2xdqn3bdm4f1jnip81r10"; }; }; @@ -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 65c0d02bdfc2..681f91f66486 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 @@ -320,6 +323,7 @@ roxma/nvim-yarp rust-lang/rust.vim ryanoasis/vim-devicons Rykka/riv.vim +ryvnf/readline.vim samoshkin/vim-mergetool sbdchd/neoformat scrooloose/nerdcommenter diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 14332c700780..44bc7ec3ced1 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/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index a5dad88b924e..73b533f368ef 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.24.1"; - sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra"; + version = "0.25.0"; + sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n"; }; buildInputs = [ 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 318e2728fc2e..2a2d4cbe4932 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/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index feee054c2ac8..9ca0f3b4e56d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,9 +1,9 @@ { stdenv, appleDerivation, xcbuildHook -, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: +, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ]; + buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ]; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cb240ba16953..1f24f4182de2 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 076c19cf400d..50c48098ab08 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/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 626e978f1f16..e018f4622b48 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -2,7 +2,7 @@ # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x -assert builtins.compareVersions "3.18" kernel.version == 1; +assert stdenv.lib.versionOlder "3.18" kernel.version; stdenv.mkDerivation { name = "blcr_${kernel.version}-0.8.6pre4"; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index f57fb1310c67..054236398769 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.7"; + version = "0.8"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = "${version}"; - sha256 = "0xn2c31kcjh1j76gq1qrcxwjyjyqnsxygkfrvh3xk07qc92f99xd"; + sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd"; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-skip-mkdir.patch ]; postPatch = '' - patchShebangs tests/test-integration + patchShebangs scripts tests ''; mesonFlags = [ diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7270877c52e4..f041d2b50429 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 dc704dc167e0..01e70fbb0407 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 1af37c2168d1..298f5e30d018 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 000000000000..13d819a08a5b --- /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 000000000000..a77200a68f7d --- /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 887c09691eb8..b10d45d8a4b6 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 000000000000..b494ba8b43c9 --- /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 495cd49e3f48..9b5d82b9f7b3 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 b8fec2f416a2..2508fb851a88 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; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21 gpl2 ]; homepage = https://www.displaylink.com/; - broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.18" || stdenv.isAarch64; + broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "5.3" || stdenv.isAarch64; }; } diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 0e8377141ed2..744ab80d74f9 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.04.06"; + version = "0.04.07"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1w0lb94rmyrcl03s6ajn7mcdbhh2s6xhsg7kfchy1bpwqcjh2yli"; + sha256 = "05gl060lgm6i10ayk0hri49k7vln1sdqkqqy1kjgck6gkbamk7a5"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e0d70b5d43eb..b4d5d54137cd 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,11 +44,12 @@ 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 = [ ./fix-paths.patch @@ -71,11 +84,14 @@ in stdenv.mkDerivation rec { # /etc/os-release not available in sandbox # doCheck = true; - preFixup = '' + 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 [ flashrom efibootmgr bubblewrap tpm2-tools ]}" + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" ) ''; @@ -89,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/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index eb218f36eb44..ebd69d1fe12b 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/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 5b398bcec9a3..c20206dc351a 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "fnotifystat-${version}"; - version = "0.02.02"; + pname = "fnotifystat"; + version = "0.02.03"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "14d6cikny9rn7fcc6ncwh02mg6jrgfi1abpxifr46gyvp3w38w55"; + sha256 = "1b5s50dc8ag6k631nfp09chrqfpwai0r9ld822xqwp3qlszp0pv9"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 8432f72e0c98..1594ddf288a9 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.02.10"; + version = "0.02.11"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "1nmnvgajvpas1azbr27nlgq5v3cwgrfwdhln3mr7dvhikz6rn0xg"; + sha256 = "06lj8fl4083rp40i3sn8zggj165nvs3cq9dca66wcp9glb1d6yki"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index e2ded7a8fd0c..cb882a0dc1fe 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, fetchpatch }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "iotop-0.6"; src = fetchurl { @@ -8,6 +8,13 @@ python2Packages.buildPythonApplication rec { sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; + patches = [ + (fetchpatch { + url = https://repo.or.cz/iotop.git/patch/99c8d7cedce81f17b851954d94bfa73787300599; + sha256 = "0rdgz6xpmbx77lkr1ixklliy1aavdsjmfdqvzwrjylbv0xh5wc8z"; + }) + ]; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 527edc5ea741..87b7de4736f9 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ primeos eelco fpletz ]; + maintainers = with maintainers; [ primeos eelco fpletz globin ]; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 387792b86313..ad965f95c94b 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 1ba463d1e9a6..a1bb98b82975 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 6bcc548ba521..8a860cc14679 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 f886fcfdc358..26fc07202bb1 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 79ee27c52b50..156a4cf44234 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 97df84f90b01..38078ea67282 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.137"; + version = "4.14.140"; # 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 = "0a72pab0zxy28i02glnzj6avzcf0a4gxxnadbdd343rh549yky4k"; + sha256 = "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"; }; } // (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 d8b5e2ee3180..1e3d14c140d1 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.65"; + version = "4.19.68"; # 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 = "1pyyhr2airxzk4c6n7140yl723dc7yw7igy5i5i2ih0nd4c3k6g5"; + sha256 = "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"; }; } // (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 2f4bb848aee0..0d3ce63325f6 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.188"; + version = "4.4.190"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1llxamm62kgqd7dig98n8m16qas8dd8rrkmwpfcdgyf8rag216ff"; + sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"; }; } // (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 5ae8743e9ffb..0008219efb9a 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.188"; + version = "4.9.190"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08p2cfc9982b804vmkapfasgipf6969g625ih7z3062xn99rhlr7"; + sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"; }; } // (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 c7980844ed98..6f6de115ad0b 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.7"; + version = "5.2.10"; # 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 = "1aazhf0v8bv4py0wnqkdmiy80fchnix431l0hda2fkwsdf9njgnv"; + sha256 = "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 76a0ae2fcf1f..4516af19a4e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.1.2019.07.13"; + version = "5.1.2019.08.21"; modDirVersion = "5.1.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "22776fe9902b0b06d6aa18cd4c7f0c5ad35a95fa"; - sha256 = "0ly4vxawj8skh55c541zll3b8g6igiaq7aj33fklfjh0icmgzs60"; + rev = "ece184f718c2b678738bc2c42906e90eeb8ba7dc"; + sha256 = "08cbisgcww8fklpxwqkm2c8ddz0mm7v11ycp7ch0kalwdv2f81lr"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index e834a769c78d..17063851cee2 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 = [ @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ globin fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 4299a8e9b377..7acee410a4e7 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/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 394dbf63f170..f7f2193eaa09 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "162"; + version = "164"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1zxj545wslp92npll0411grc49l53cgp8dqqn3zb4vcxrvfc4vh9"; + sha256 = "1i0f0zvxlzkfp0bvghm1z8z8bb8a5x97h56bwd7fdkrm00ivfw2k"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 4e0202cebf31..5aa9e9b43da6 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 303df98d44ae..7984e357c82c 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/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index b4878ff4eac1..23852559436d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,28 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45 -, flex, bison, libmnl, libnftnl, gmp, readline }: +{ stdenv, fetchurl, pkgconfig, bison, flex +, libmnl, libnftnl, libpcap +, gmp, jansson, readline +, withXtables ? false , iptables +}: + +with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.9.1"; name = "nftables-${version}"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; + sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza"; }; configureFlags = [ - "CONFIG_MAN=y" - "DB2MAN=docbook2man" - ]; + "--disable-man-doc" + "--with-json" + ] ++ optional withXtables "--with-xtables"; - XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + nativeBuildInputs = [ pkgconfig bison flex ]; - nativeBuildInputs = [ pkgconfig docbook2x flex bison ]; - buildInputs = [ libmnl libnftnl gmp readline ]; + buildInputs = [ + libmnl libnftnl libpcap + gmp readline jansson + ] ++ optional withXtables iptables; - meta = with stdenv.lib; { + meta = { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; - homepage = http://netfilter.org/projects/nftables; + homepage = "https://netfilter.org/projects/nftables/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 82ac359158b9..2290a7e80a1e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,7 +1,11 @@ { lib, callPackage, fetchurl, stdenv }: let - generic = args: callPackage (import ./generic.nix args) { }; + +generic = args: +if ((!lib.versionOlder args.version "391") + && stdenv.hostPlatform.system != "x86_64-linux") then null + else callPackage (import ./generic.nix args) { }; kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4bf1e41bd57b..76257f94fe76 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/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 88134da46a15..7f5b14ca72fd 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.19"; + version = "0.02.20"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0yh6l2mx5gfdgrfx406hxbi03c12cgi29pwlzgdfrpz6zs2icaw5"; + sha256 = "1qsxk055pfjqnd9w4nx6js7a8bzvq6nfjiwjs4h9ik6jlsrhb4v7"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index b6c169483393..1ef3b71884fd 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pscircle-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "0qsif00dkqa8ky3vl2ycx5anx2yk62nrv47f5lrlqzclz91f00fx"; + sha256 = "1sm99423hh90kr4wdjqi9sdrrpk65j2vz2hzj65zcxfxyr6khjci"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 6acd327ef0ed..e604f73de2dd 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/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 55336e3b2a04..10b33b176d21 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.02.04"; + version = "0.02.05"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "1kkdlnn3gahzd3ra2qc9vmc4ir5lydc3lyyqa269sb3nv9v2v30h"; + sha256 = "00586w6f1cq7rayv6galh9qxk7wrz62zbha9qhrb1cf85axchvbw"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 3001c8f07c56..cf1f2f242f47 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 39aa855e3cc5..b7f1af618feb 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/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 3df0023bd678..1c5678b81e03 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, lib, - libxslt, pandoc, asciidoctor, pkgconfig, - dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, - audit, + pkgconfig, libxml2, libxslt, + dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit, + withGui ? true, + qtbase ? null, + qttools ? null, + qtsvg ? null, libgcrypt ? null, libsodium ? null }: @@ -23,10 +26,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - libxslt - asciidoctor - pandoc # for rendering documentation pkgconfig + libxslt # xsltproc + libxml2 # xmllint ]; buildInputs = [ @@ -37,23 +39,20 @@ stdenv.mkDerivation rec { polkit protobuf audit - - qtbase - qtsvg - qttools ] ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ (lib.optional (libsodium != null) libsodium); + ++ (lib.optional (libsodium != null) libsodium) + ++ (lib.optionals withGui [ qtbase qtsvg qttools ]); configureFlags = [ "--with-bundled-catch" "--with-bundled-pegtl" "--with-dbus" - "--with-gui-qt=qt5" "--with-polkit" ] ++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt") - ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium"); + ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium") + ++ (lib.optional withGui "--with-gui-qt=qt5"); enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 61f487586767..fa7250f7cee8 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.8"; + version = "2.9"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6"; + sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw"; }; # TODO: Patch epoll so that the dbus actually responds diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ce2f788338e3..03e11d1a8ed9 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 226bbfb16df1..de0f36dac5fa 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/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 5bd91b14f32c..3a05c2d8d610 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "8.3.0"; + version = "8.3.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "10hnanvlnl1szp3qdcyrivhayydw8qbw1rq7vmvay434ch6wwgkx"; + sha256 = "0cqj7al9892psc5zqpfvj0gnjf8b4dpm2kx7sr21grczss1dkcs1"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7fdbfb6472c9..e54394a9a7d5 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -37,7 +37,7 @@ let description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.linux; }; }; @@ -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 4df24a6d60c0..8530d8cb068e 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 c18e71977d87..1b3e5466ec39 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/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 35c830dff8a5..5e78fe742ac3 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,46 +1,62 @@ -{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux -, file, libtool, which }: +{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux +, file, libtool, which, boost, autoreconfHook +}: stdenv.mkDerivation rec { - name = "torque-4.2.10"; + pname = "torque"; + version = "6.1.3h2"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880"; - sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; + src = fetchFromGitHub { + owner = "adaptivecomputing"; + repo = pname; + # branch 6.1.3h2, as they aren't pushing tags + # https://github.com/adaptivecomputing/torque/issues/467 + rev = "458883319157cfc5c509046d09f9eb8e68e8d398"; + sha256 = "1b56bc5j9wg87kcywzmhf7234byyrwax9v1pqsr9xmv2x7saakrr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl flex bison groff libxml2 utillinux libtool - which ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ]; + buildInputs = [ + openssl groff libxml2 utillinux libtool + which boost + ]; enableParallelBuilding = true; # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error" "-fpermissive" + ]; + + postPatch = '' + substituteInPlace Makefile.am \ + --replace "contrib/init.d contrib/systemd" "" + substituteInPlace src/cmds/Makefile.am \ + --replace "/etc/" "$out/etc/" + ''; preConfigure = '' - substituteInPlace ./configure \ - --replace '/usr/bin/file' '${file}/bin/file' + substituteInPlace ./configure \ + --replace '/usr/bin/file' '${file}/bin/file' - # fix broken libxml2 detection - sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure + # fix broken libxml2 detection + sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure - for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do - substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ - --replace "schedprivdir = " "schedprivdir = $out/" - done + for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do + substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ + --replace "schedprivdir = " "schedprivdir = $out/" + done - for f in $(find ./ -name Makefile.in); do - echo patching $f... - sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' - done + for f in $(find ./ -name Makefile.in); do + echo patching $f... + sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' + done + patchShebangs buildutils ''; postInstall = '' - mv $out/sbin/* $out/bin/ - rmdir $out/sbin cp -v buildutils/pbs_mkdirs $out/bin/ cp -v torque.setup $out/bin/ chmod +x $out/bin/pbs_mkdirs $out/bin/torque.setup @@ -50,5 +66,6 @@ stdenv.mkDerivation rec { homepage = http://www.adaptivecomputing.com/products/open-source/torque; description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids"; platforms = platforms.linux; + license = "TORQUEv1.1"; }; } diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 2199d62b4dd7..aefa3af83363 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An I/O forwarding server that implements a variant of the 9P protocol"; - maintainers = with maintainers; [ rnhmjoj rickynils ]; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 74d0d1341d66..0b40b99cfc16 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net - meta = { + meta = with stdenv.lib; { homepage = https://www.isc.org/downloads/bind/; description = "Domain name server"; - license = stdenv.lib.licenses.mpl20; + license = licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [peti]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with maintainers; [ peti globin ]; + platforms = platforms.unix; outputsToInstall = [ "out" "dnsutils" "host" ]; }; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index ac44dbbf04d1..d94f34ebd21f 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/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index cd6e3d5a45dd..4fa32050c682 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.2.0"; + name = "nsd-4.2.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "0k57xl3ybdnqjqw9a3dmi7l6qmhkiic6wsghkz08ir809aj1rpsi"; + sha256 = "07w753lfrmpf2rv0115pak2zqywv57mq6bwzwwmypc4cjsihwz6i"; }; prePatch = '' diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 105e9f232c16..3c63b6d8eb75 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.10"; + version = "4.1.13"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1iqmrg0dhf39gr2mq9d8r3s5c6yqkb5mm8grbbla5anajbgcyijs"; + sha256 = "09az5yp5d9wvzw8faifyzsljhmmc8ifm4j70m4n2sr83i9i9rsp7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 511aff05deaa..03f247e3bc5f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -144,6 +144,6 @@ in with py.pkgs; buildPythonApplication rec { homepage = https://home-assistant.io/; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ f-breidenstein dotlambda ]; + maintainers = with maintainers; [ f-breidenstein dotlambda globin ]; }; } diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index bd6570679390..775731babd69 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -47,6 +47,6 @@ in python.pkgs.buildPythonApplication rec { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = https://esphome.io/; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda globin ]; }; } diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c65d3b6de82a..13ea1b072652 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "Polymer frontend for Home Assistant"; homepage = https://github.com/home-assistant/home-assistant-polymer; license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda globin ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index ff71e460b2ac..a0fa4b4bca96 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python2 }: +{ stdenv, fetchurl, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2"; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python ncurses ]; patchPhase = '' sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index cb630c266880..b3c4abfed906 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/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index ceffd3e0260d..afa48eeafc2e 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { name = "h2o-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; rev = "refs/tags/v${version}"; - sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv"; + sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7"; }; # We have to fix up some function prototypes, because despite upstream h2o diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 12b873df6a40..d670e1592c27 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -110,6 +110,6 @@ stdenv.mkDerivation { homepage = http://nginx.org; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin fpletz ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ]; }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 47082bbeba0d..c5e0b47e238c 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 ffc6f81fdc24..31aeaa6f0843 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 7f14f6fff195..5da89200816f 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/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 39b9b31f7f0a..f802024ea876 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -15,14 +15,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.9.0"; + version = "1.10.0"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1"; + sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 9216464f1e49..280df5f00d2a 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { name = "icingaweb2-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "0akz2v9zfdchagnzdqcvzrxyw9bkmg8pp23wwdpwdrw67z2931zj"; + sha256 = "1awf0j4vlm9v7bsfk5a168446k7pa54yqc0k6phlaw772874g917"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 81eeae804d25..e60a1f54f424 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "oidentd-${version}"; - version = "2.3.2"; + version = "2.4.0"; nativeBuildInputs = [ bison flex ]; src = fetchurl { url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; - sha256 = "10c5jkhirkvm1s4v3zdj4micfi6rkfjj32q4k7wjwh1fnzrwyb5n"; + sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index d2ead585e7d0..8369cdce4d53 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.559"; + version = "0.11.589"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1ds263q92igvgn0dirl506cmrzy374msaxl1x13gax0i0ggf09mq"; + sha256 = "14lj33xmhf35pq781wvzyw983yff447mc253x0ppi3b5rwkrgkyz"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index ad1038bbc47f..218630180876 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.17.1+190408"; + version = "3.17.12+190823"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "0d6dgw9af492vn5yg2hq82ipq4p80c19lhky0dpwrm5kv67kxbhv"; + sha256 = "1i7jpxndrbya5ggl4babscwzmxx4c0jwri5kpl7h2ihqrn90m4b5"; }; phpConfig = writeText "config.php" '' @@ -18,9 +18,13 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/limesurvey cp -r . $out/share/limesurvey cp ${phpConfig} $out/share/limesurvey/application/config/config.php + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 69c1a85760bc..780264cf42b6 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz ]; + maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 30c6f2f44dd5..3d0f921409c6 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://pigeonhole.dovecot.org/; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index a537a4c6d00c..25a94cd27bfa 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -3,6 +3,7 @@ , enableMySQL ? false, mysql, zlib , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam +, enableSPF ? true, libspf2 }: stdenv.mkDerivation rec { @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableLDAP openldap ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot - ++ stdenv.lib.optional enablePAM pam; + ++ stdenv.lib.optional enablePAM pam + ++ stdenv.lib.optional enableSPF libspf2; preBuild = '' sed ' @@ -64,6 +66,10 @@ stdenv.mkDerivation rec { s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam: s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam: ''} + ${stdenv.lib.optionalString enableSPF '' + s:^# \(SUPPORT_SPF\)=.*:\1=yes: + s:^# \(LDFLAGS += -lspf2\):\1: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch new file mode 100644 index 000000000000..b8a5476c0559 --- /dev/null +++ b/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch @@ -0,0 +1,51 @@ +From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001 +From: Peter Simons <simons@cryp.to> +Date: Mon, 26 Aug 2019 16:10:04 +0200 +Subject: [PATCH] Find external tools via $PATH rather than hard-coding + /usr/bin. + +--- + src/mailman/config/mhonarc.cfg | 2 +- + src/mailman/config/postfix.cfg | 2 +- + src/mailman/config/schema.cfg | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg +index b00f93aea..096e9521b 100644 +--- a/src/mailman/config/mhonarc.cfg ++++ b/src/mailman/config/mhonarc.cfg +@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname + + # If the archiver works by calling a command on the local machine, this is the + # command to call. +-command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add ++command: mhonarc -outdir /path/to/archive/$listname -add +diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg +index cddda220a..934c9a977 100644 +--- a/src/mailman/config/postfix.cfg ++++ b/src/mailman/config/postfix.cfg +@@ -5,7 +5,7 @@ + # db file, from the associated plain text files. The file being updated will + # be appended to this string (with a separating space), so it must be + # appropriate for os.system(). +-postmap_command: /usr/sbin/postmap ++postmap_command: postmap + + # This variable describes the type of transport maps that will be generated by + # mailman to be used with postfix for LMTP transport. By default, it is set to +diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg +index fa06ccced..406999e13 100644 +--- a/src/mailman/config/schema.cfg ++++ b/src/mailman/config/schema.cfg +@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no + # where the substitution variable $filename is filled in by Mailman, and + # contains the path to the temporary file that the command should read from. + # The command should print the converted text to stdout. +-html_to_plain_text_command: /usr/bin/lynx -dump $filename ++html_to_plain_text_command: lynx -dump $filename + + # Specify what characters are allowed in list names. Characters outside of + # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed, +-- +2.22.0 + diff --git a/pkgs/servers/mail/mailman/core.nix b/pkgs/servers/mail/mailman/core.nix new file mode 100644 index 000000000000..fcd594270db4 --- /dev/null +++ b/pkgs/servers/mail/mailman/core.nix @@ -0,0 +1,42 @@ +{ stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython +, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib +, requests, zope_configuration, click, falcon, importlib-resources +, zope_component +}: + +buildPythonPackage rec { + pname = "mailman"; + version = "3.2.2"; + + patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ]; + + src = fetchPypi { + inherit pname version; + sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; + }; + + propagatedBuildInputs = [ + alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock + importlib-resources lazr_config passlib requests zope_configuration + zope_component + ]; + + # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping + # them in shell code breaks this assumption. The proper way to use mailman is + # to create a specialized python interpreter: + # + # python37.withPackages (ps: [ps.mailman]) + # + # This gives a properly wrapped 'mailman' command plus an interpreter that + # has all the necessary search paths to execute unwrapped 'master' and + # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is + # about to get a OS module that takes care of those details. + dontWrapPythonPrograms = true; + + meta = { + homepage = https://www.gnu.org/software/mailman/; + description = "Free software for managing electronic mail discussion and newsletter lists"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }; +} diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix deleted file mode 100644 index 91445afa97df..000000000000 --- a/pkgs/servers/mail/mailman/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, python2 }: - -stdenv.mkDerivation rec { - name = "mailman-${version}"; - version = "2.1.29"; - - src = fetchurl { - url = "mirror://gnu/mailman/${name}.tgz"; - sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; - }; - - buildInputs = [ python2 python2.pkgs.dnspython ]; - - patches = [ ./fix-var-prefix.patch ]; - - configureFlags = [ - "--without-permcheck" - "--with-cgi-ext=.cgi" - "--with-var-prefix=/var/lib/mailman" - ]; - - installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. - - makeFlags = [ "DIRSETGID=:" ]; - - meta = { - homepage = https://www.gnu.org/software/mailman/; - description = "Free software for managing electronic mail discussion and e-newsletter lists"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; - }; -} diff --git a/pkgs/servers/mail/mailman/fix-var-prefix.patch b/pkgs/servers/mail/mailman/fix-var-prefix.patch deleted file mode 100644 index 9bb735ecbed7..000000000000 --- a/pkgs/servers/mail/mailman/fix-var-prefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ubr mailman-2.1.16-orig/contrib/redhat_fhs.patch mailman-2.1.16/contrib/redhat_fhs.patch ---- mailman-2.1.16-orig/contrib/redhat_fhs.patch 2013-10-21 14:55:48.797631434 +0200 -+++ mailman-2.1.16/contrib/redhat_fhs.patch 2013-10-21 14:56:42.534310378 +0200 -@@ -197,7 +197,7 @@ - + else true; \ - + fi; \ - + done -- chmod o-r $(DESTDIR)$(var_prefix)/archives/private -+ chmod o-r $(prefix)$(var_prefix)/archives/private - @for d in $(ARCH_INDEP_DIRS); \ - do \ - Only in mailman-2.1.5.FHS: Makefile.in~ -diff -ubr mailman-2.1.16-orig/Makefile.in mailman-2.1.16/Makefile.in ---- mailman-2.1.16-orig/Makefile.in 2013-10-21 14:55:48.798631519 +0200 -+++ mailman-2.1.16/Makefile.in 2013-10-21 14:56:42.562313220 +0200 -@@ -87,7 +87,7 @@ - @echo "Creating architecture independent directories..." - @for d in $(VAR_DIRS); \ - do \ -- dir=$(DESTDIR)$(var_prefix)/$$d; \ -+ dir=$(prefix)$(var_prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ - $(srcdir)/mkinstalldirs $$dir; \ -@@ -96,7 +96,7 @@ - else true; \ - fi; \ - done -- chmod o-r $(DESTDIR)$(var_prefix)/archives/private -+ chmod o-r $(prefix)$(var_prefix)/archives/private - @for d in $(ARCH_INDEP_DIRS); \ - do \ - dir=$(DESTDIR)$(prefix)/$$d; \ diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix new file mode 100644 index 000000000000..871f2ea244dd --- /dev/null +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +, django-mailman3, mailmanclient +}: + +buildPythonPackage rec { + pname = "postorius"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1722lnscxfl8wdigf5d80d1qmd5gblr439wa989jxlww0wkjg9fl"; + }; + + buildInputs = [ beautifulsoup4 vcrpy mock ]; + propagatedBuildInputs = [ django-mailman3 ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test --settings=test_settings postorius + ''; + + meta = { + homepage = https://www.gnu.org/software/mailman/; + description = "Web-based user interface for managing GNU Mailman"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index cd48ab12e24e..2e1b3a4f7980 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.4.1p2"; + version = "6.4.2p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn"; + sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd"; }; patches = [ diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 10d3b397b26b..a4b0b921adb2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -96,12 +96,12 @@ in stdenv.mkDerivation rec { --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} ''; - meta = { + meta = with lib; { homepage = http://www.postfix.org/; description = "A fast, easy to administer, and secure mail server"; - license = with lib.licenses; [ ipl10 epl20 ]; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.rickynils ]; + license = with licenses; [ ipl10 epl20 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ rickynils globin ]; }; } diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix deleted file mode 100644 index 739270326e5b..000000000000 --- a/pkgs/servers/mail/rmilter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre -, libmilter, opendkim, libmemcached, glib }: - -let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { - patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; -}); -in - -stdenv.mkDerivation rec { - name = "rmilter-${version}"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "vstakhov"; - repo = "rmilter"; - rev = version; - sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; - }; - - nativeBuildInputs = [ bison cmake flex pkgconfig ]; - buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; - - meta = with stdenv.lib; { - homepage = https://github.com/vstakhov/rmilter; - license = licenses.asl20; - description = '' - Daemon to integrate rspamd and milter compatible MTA, for example - postfix or sendmail - ''; - maintainers = with maintainers; [ avnik fpletz ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch b/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch deleted file mode 100644 index 3ab61a6fab00..000000000000 --- a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch +++ /dev/null @@ -1,80 +0,0 @@ -Description: systemd-like socket activation support for libmilter -Author: Mikhail Gusarov <dottedmag@debian.org -diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html -index 70a510e..013f04e 100644 ---- a/libmilter/docs/smfi_setconn.html -+++ b/libmilter/docs/smfi_setconn.html -@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail. - <LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe. - <LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket. - <LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket. -+ <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor. - </UL> - </TD></TR> - </TABLE> -diff --git a/libmilter/listener.c b/libmilter/listener.c -index 48c552f..2249a1f 100644 ---- a/libmilter/listener.c -+++ b/libmilter/listener.c -@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name) - L_socksize = sizeof addr.sin6; - } - #endif /* NETINET6 */ -+ else if (strcasecmp(p, "fd") == 0) -+ { -+ addr.sa.sa_family = AF_UNSPEC; -+ L_socksize = sizeof (_SOCK_ADDR); -+ } - else - { - smi_log(SMI_LOG_ERR, "%s: unknown socket type %s", -@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name) - } - #endif /* NETINET || NETINET6 */ - -- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); -+ if (addr.sa.sa_family == AF_UNSPEC) -+ { -+ char *end; -+ sock = strtol(colon, &end, 10); -+ if (*end != '\0' || sock < 0) -+ { -+ smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon); -+ return INVALID_SOCKET; -+ } -+ } -+ else -+ { -+ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); -+ } -+ - if (!ValidSocket(sock)) - { - smi_log(SMI_LOG_ERR, -@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name) - #if NETUNIX - addr.sa.sa_family != AF_UNIX && - #endif /* NETUNIX */ -+ addr.sa.sa_family != AF_UNSPEC && - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt, - sizeof(sockopt)) == -1) - { -@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name) - } - #endif /* NETUNIX */ - -- if (bind(sock, &addr.sa, L_socksize) < 0) -+ if (addr.sa.sa_family != AF_UNSPEC && -+ bind(sock, &addr.sa, L_socksize) < 0) - { - smi_log(SMI_LOG_ERR, - "%s: Unable to bind to port %s: %s", -@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog) - # ifdef BSD4_4_SOCKADDR - cliaddr.sa.sa_len == 0 || - # endif /* BSD4_4_SOCKADDR */ -- cliaddr.sa.sa_family != L_family)) -+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family))) - { - (void) closesocket(connfd); - connfd = INVALID_SOCKET; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 25e7807659df..67a647b236b4 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = https://rspamd.com; license = licenses.asl20; description = "Advanced spam filtering system"; - maintainers = with maintainers; [ avnik fpletz ]; + maintainers = with maintainers; [ avnik fpletz globin ]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 07c7f5207171..8da9cef58a75 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0pr17n52vdq490q6c282nqnn51j5k0lf7mzaazpxjy4q86pxdfy5"; + sha256 = "1nz9bhy5hraa1h7100vr0innz8npnpha6xr9j2ln7h3cgwv73739"; }; patches = [ diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 75d12a5f66fe..33b7674cf9e5 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/meguca/default.nix b/pkgs/servers/meguca/default.nix index d983c0677191..06e9f3fc961f 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -46,5 +46,7 @@ buildGoPackage rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ chiiruno ]; platforms = platforms.all; + broken = true; # Broken on Hydra since 2019-04-18: + # https://hydra.nixos.org/build/98885902 }; } diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index cf4896bf56b9..76bd69891c18 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://metabase.com"; license = licenses.agpl3; platforms = platforms.all; - maintainers = with maintainers; [ schneefux thoughtpolice ]; + maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; } diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 1ebd852380c4..1445d0b523c6 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "miniflux"; - version = "2.0.16"; + version = "2.0.17"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "09fwhbcpp84l5lw4zizm46ssri6irzvjx2w7507a1xhp6iq73p2d"; + sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm"; }; modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 8dd294bcdf84..a7fb0b3b3a77 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 c9e6da89d93e..19807c3c2bd8 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.3.2"; + 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 = "03jhygd3h211dr3dgdg4mi13sj1rib333x436kv14v8xd8rsl162"; + sha256 = "006j39n42l91krd1p87dpan1s7dvjjhpidccpxkic189lwg7fbxs"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "18khy0ki128mswy4viwbb53904ljrgj0y0qv076nn8m2zbyddyp9"; + sha256 = "0n4fkzj3bnq3x08vw18a8lqxjggqsy5l2rgk494i87yaf1pa4gpf"; }; postPatch = '' @@ -36,8 +36,8 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = https://grafana.org/; - maintainers = with maintainers; [ offline fpletz willibutz ]; + homepage = "https://grafana.com"; + maintainers = with maintainers; [ offline fpletz willibutz globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 223026c3b411..97ddba0ff738 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "0.2.0"; + version = "0.3.0"; name = "grafana-loki-${version}"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "1f4g5qiarhsa1r7vdx1z30zpqlypd4cf5anj4jp6nc9q6zmjwk91"; + sha256 = "1b61fqk6ah4qps4nq7ypdax4i7pkhjxdw4qrhc1zvzzhxr7x13rs"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ buildGoPackage rec { description = "Like Prometheus, but for logs."; license = licenses.asl20; homepage = "https://grafana.com/loki"; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e104f31a74de..acdb3423107d 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.16.2"; + version = "0.18.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q"; + sha256 = "17f3a4fiwycpd031k1d9irhd96cklbh2ygs35j5r6hgw2130sy4p"; }; buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' @@ -33,7 +33,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1f342adebaa0..9803ba09e16a 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/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 8806a88693be..627186e47ac3 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -37,7 +37,7 @@ in rec { description = "Service monitoring system and time series database"; homepage = https://prometheus.io; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } // attrs'); @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.11.1"; - sha256 = "1d4kiv88v1p74cm1wg6wk1cs963xg2rlhkxw86slf9hmldlgww2l"; + version = "2.12.0"; + sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; }; } diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e43488bbaaeb..4e32630ae227 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 5a3fd23ec22e..6b9b2f6b799f 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix new file mode 100644 index 000000000000..06eba474c996 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gitlab-ci-pipelines-exporter"; + version = "0.2.5"; + + goPackagePath = "github.com/mvisonneau/gitlab-ci-pipelines-exporter"; + + goDeps = ./gitlab-ci-pipelines-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "mvisonneau"; + repo = pname; + rev = version; + sha256 = "0qmy6pqfhx9bphgh1zqi68kp0nscwy1x7z13lfiaaz8pgsjh95yy"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; + homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; + license = licenses.asl20; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix index aeacbb5cee8b..d439c9aab10c 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix @@ -1,21 +1,12 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "github.com/alecthomas/template"; + goPackagePath = "cloud.google.com/go"; 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"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; }; } { @@ -50,35 +41,53 @@ fetch = { type = "git"; url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; }; } { - goPackagePath = "github.com/go-stack/stack"; + goPackagePath = "github.com/google/go-querystring"; fetch = { type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/heptiolabs/healthcheck"; fetch = { type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + url = "https://github.com/heptiolabs/healthcheck"; + rev = "6ff867650f40"; + sha256 = "17aqrqhx2ibv6mcxsmli6m3hmvwi06cnpaly05daimay3cys5q0l"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/jpillora/backoff"; fetch = { type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + url = "https://github.com/jpillora/backoff"; + rev = "3050d21c67d7"; + sha256 = "1nxapdx9xg5gwiscfhq7m0w14hj4gaxb4avmgf1mx9zd3jnw9jxv"; }; } { @@ -104,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; }; } { @@ -118,6 +127,33 @@ }; } { + 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/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; @@ -194,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + rev = "v0.6.0"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; }; } { @@ -203,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } { @@ -212,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; }; } { @@ -235,12 +271,30 @@ }; } { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/xanzy/go-gitlab"; + fetch = { + type = "git"; + url = "https://github.com/xanzy/go-gitlab"; + rev = "v0.19.0"; + sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; + rev = "f99c8df09eb5"; + sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf"; }; } { @@ -248,8 +302,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + rev = "ca1201d0de80"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe45"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; }; } { @@ -257,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -266,8 +329,35 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "5ac8a444bdc5"; - sha256 = "00zdrighflwc4iyizsag184nvl1cbkk02v73kpl5miprdrvzqlr4"; + rev = "fc99dfbffb4e"; + sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "d0a3d012864b"; + sha256 = "1s2jbb94hbcb01hgkd9kzb9js13grj80a72il7467pm57b3rnggg"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.6.1"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; }; } { @@ -284,8 +374,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } { @@ -293,8 +383,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 129c2b333723..85720108def8 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Export Prometheus-style metrics about mail server functionality"; homepage = "https://github.com/cherti/mailexporter"; license = licenses.gpl3; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 9180a5113492..6108e0d9de39 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "mysqld_exporter-${version}"; - version = "0.10.0"; + version = "0.11.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,14 +11,14 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "1133bgyp5vljz2qvfh0qzq8h8bkc8vci3jnmbr633bh3jpaqm2py"; + sha256 = "1684jf96dy5bs0y0689vlcw82lqw8kw2phlnp6pq1cq56fcwdxjn"; }; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = https://github.com/prometheus/mysqld_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 94cb2f74cb08..9de720306d8d 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,14 +14,16 @@ 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"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz willibutz ]; + maintainers = with maintainers; [ benley fpletz willibutz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 80ad4a32be75..fd90e4c39bb1 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.17.0"; + version = "0.18.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,17 +11,23 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "08g4dg6zcr95j88apsxp828jfyx4vq271w1mgkf77c46c16d2nh0"; + sha256 = "0s3sp1gj86p7npxl38hkgs6ymd3wjjmc5hydyg1b5wh0x3yvpx07"; }; # FIXME: tests fail due to read-only nix store doCheck = false; + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version} + -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} + ''; + meta = with stdenv.lib; { description = "Prometheus exporter for machine metrics"; homepage = https://github.com/prometheus/node_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index eac962f75606..36009c421ef5 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -20,6 +20,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Prometheus exporter for OpenVPN"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 97df26aea4e5..9a34f0c948d1 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -51,6 +51,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index ffa71f3ad0c1..0887d971ddf7 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 18fa3f98db23..1cf4c022e8fa 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; homepage = https://github.com/mdlayher/unifi_exporter; license = licenses.mit; - maintainers = with maintainers; [ bachp ]; + maintainers = with maintainers; [ bachp globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 1a623a3171df..a629a2a27e26 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/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 1b4ffd61ec78..80fe9b2357f4 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "A Prometheus exporter for WireGuard, written in Rust."; license = licenses.mit; homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 globin ]; }; } diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 50325144fcac..b7221a9d8361 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "A network monitoring system"; license = licenses.epl10; platforms = platforms.all; - maintainers = [ maintainers.rickynils ]; + maintainers = []; }; } diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 2062dc6659f8..48b72dc0590d 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 7b6b5d8fcccb..a1799839b64d 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 04daa2f4a855..06cef9cefab7 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/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a78d2e26bf76..ac5e5cff94b3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "16.0.3"; + version = "16.0.4"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1"; + sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0"; }; installPhase = '' diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f3035e131409..c06b84324191 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { name = "EventStore-${version}"; - version = "5.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "1qdnkaxiryyz8yhwqncmshsg8wi4v69dcxnvgvl4hn81zsj6fasw"; + sha256 = "0hjc64lmi9x1sq8zk24iag14k424l72g1n4z7wf7gaygd07kx9k8"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 25dfa5f47bd3..9b173e538d34 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/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0ce948c715e0..20a6321e0a80 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "An open source, advanced key-value store"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.berdario ]; + maintainers = with maintainers; [ berdario globin ]; }; } diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index d6ee407e3418..a1a9072f5cab 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; + broken = true; # broken with openssl 1.1 }; } diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 05ee7f343523..7bd0ee2eede1 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -78,5 +78,6 @@ perlPackages.buildPerlPackage { license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; platforms = with stdenv.lib.platforms; linux; + broken = true; # broken with openssl 1.1 (v2.x might fix this) }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 84d4d04cac75..16007c3e8fca 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.5.1488-deeb86e7f"; 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 = "0kgcbq3jfvmigza8a9ak215q2cpi18vh96gx01hppk51m9ibkrwi"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 76f3ded78086..b037524f67f2 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -2,7 +2,7 @@ common = { edition, sha256 }: stdenv.mkDerivation (rec { name = "rainloop-${edition}-${version}"; - version = "1.12.1"; + version = "1.13.0"; buildInputs = [ unzip ]; @@ -35,10 +35,10 @@ in { rainloop-community = common { edition = "community"; - sha256 = "06w1vxqpcj2j8dzzjqh6azala8l46hzy85wcvqbjdlj5w789jzsx"; + sha256 = "1skwq6bn98142xf8r77b818fy00nb4x0s1ii3mw5849ih94spx40"; }; rainloop-standard = common { edition = ""; - sha256 = "1fbnpk7l2fbmzn31vx36caqg9xm40g4hh4mv3s8d70slxwhlscw0"; + sha256 = "e3ec8209cb3b9f092938a89094e645ef27659763432bedbe7fad4fa650554222"; }; } diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index a490acb1f739..0b774a4b5add 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Webmail Software"; - maintainers = with stdenv.lib.maintainers; [ vskilet ]; + maintainers = with stdenv.lib.maintainers; [ vskilet globin ]; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix new file mode 100644 index 000000000000..1a168608bec2 --- /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 000000000000..19c5c8161296 --- /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/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index f86596150eab..b296fb3b425c 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "9.0.5"; + version = "9.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3"; + sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 48f5847b1117..fd888de60dec 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ rickynils domenkozar aanderse ]; + maintainers = with maintainers; [ domenkozar aanderse ]; }; } diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index ddd46299a9cb..c94b11c91dde 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ]; + maintainers = [ maintainers.domenkozar maintainers.aanderse ]; }; } diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 6ee119520b41..f4a37f85c6cb 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -29,6 +29,6 @@ python2.pkgs.buildPythonApplication rec { longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; license = licenses.gpl3; homepage = https://sickrage.github.io; - maintainers = [ "sterfield@gmail.com" ]; + maintainers = with maintainers; [ sterfield ]; }; } diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index deeeabda7451..a8a00f37f3fb 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ primeos fpletz ]; + maintainers = with maintainers; [ primeos fpletz globin ]; }; } diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 12cd3bfaad93..116d687ad269 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5322"; + version = "2.0.0.5338"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0vwljxnlrrssbdzxqq4yr93v323gr3x6jmg30gki58anf012q9pw"; + sha256 = "05l7l4d1765m01c14iz8lcr61dnm4xd5p09sns4w8wmanks9jg3x"; }; buildInputs = [ 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 000000000000..8785e052224d --- /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 000000000000..de45d9c3ea21 --- /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 000000000000..fa1a35e12f23 --- /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 3b4a0543e189..dcaa8d5e1fad 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 3db62aa491ce..ba75bd28bccc 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.0.5"; + version = "4.0.6"; name = "${pname}-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4"; + sha256 = "0blmbqczyrgzykby2z3xzmhzd8kgij9izxv50n5cjn5azf7dn8g5"; }; patches = [ ./pgpool.patch ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 711ad35bcc1b..7e536e22d947 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -3,7 +3,7 @@ let generic = # dependencies { stdenv, lib, fetchurl, makeWrapper - , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid + , glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid , pkgconfig, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. @@ -32,9 +32,10 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl libxml2 makeWrapper ] + [ zlib readline libxml2 makeWrapper ] ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals enableSystemd [ systemd ] + ++ [ (if atLeast "9.5" then openssl else openssl_1_0_2) ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; @@ -133,7 +134,7 @@ let homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice danbst ]; + maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index f2e814543dbf..2866c94d3d7f 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 f37e347e89a1..ae72b164b845 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 a8e5a54bc29a..055d1de3c788 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 d2d2a00ffd5a..15d670171899 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 bccec1107b9a..040ff8b80fe7 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 38e86fbfd8d6..5fbe757598cc 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 1a5aa91ae6ec..b9015be781e9 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 01dcd54d95e8..4a80e5cafcb7 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 3a4e0cba6026..590d46b430ea 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 ac0299208f81..7a4b1ed88fc4 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/squid/4.nix b/pkgs/servers/squid/4.nix deleted file mode 100644 index 69a46533ba5d..000000000000 --- a/pkgs/servers/squid/4.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl }: - -stdenv.mkDerivation rec { - name = "squid-4.8"; - - src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq"; - }; - - buildInputs = [ - perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; - - prePatch = '' - substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2" - ''; - - configureFlags = [ - "--enable-ipv6" - "--disable-strict-error-checking" - "--disable-arch-native" - "--with-openssl" - "--enable-ssl-crtd" - "--enable-storeio=ufs,aufs,diskd,rock" - "--enable-removal-policies=lru,heap" - "--enable-delay-pools" - "--enable-x-accelerator-vary" - ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; - - meta = with stdenv.lib; { - description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; - homepage = http://www.squid-cache.org; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz raskin ]; - }; -} diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index fde29dc7e80c..72a7fff7c475 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,22 +1,16 @@ { stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, fetchpatch }: +, expat, libxml2, openssl, pkgconfig +}: stdenv.mkDerivation rec { - name = "squid-3.5.28"; + name = "squid-4.8"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz"; - sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx"; + url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; + sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq"; }; - patches = [ - (fetchpatch { - name = "3.5-CVE-2019-13345.patch"; - url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch"; - sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3"; - }) - ]; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; @@ -38,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.squid-cache.org; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz raskin ]; }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index a65bf5bd916c..f793f05fef42 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.7.12"; + version = "1.7.14"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1nrr0a0ibrd346i6jdxzvbgj5frcrwwm2rk3c6fpck42a6mw6plz"; + sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index fcea0f398e4e..48cf589e55d1 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak mmahut ]; + maintainers = with maintainers; [ canndrew jb55 prusnak mmahut maintainers."1000101" ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bae43412e784..3358973fc4eb 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -5,22 +5,16 @@ with builtins; -let - # ttyd hasn't seen a release in quite a while. remove all this - # junk when a new one happens (eventually) - revCount = 174; +stdenv.mkDerivation rec { + pname = "ttyd"; + version = "1.5.2"; src = fetchFromGitHub { - owner = "tsl0922"; - repo = "ttyd"; - rev = "6df6ac3e03b705ddd46109c2ac43a1cba439c0df"; - sha256 = "0g5jlfa7k6qd59ysdagczlhwgjfjspb3sfbd8b790hcil933qrxm"; + owner = "tsl0922"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "16nngc3dqrsgpapzvl34c0msgdd1fyp3k8r1jj1m9bch6z2p50bl"; }; -in stdenv.mkDerivation rec { - name = "ttyd-${version}"; - version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}"; - inherit src; - nativeBuildInputs = [ pkgconfig cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv ]; enableParallelBuilding = true; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 76c4bfc428e4..5a04d2317f41 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -35,24 +35,26 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ erictapen globin ]; }; }; in rec { - # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions + # https://community.ui.com/releases / https://www.ui.com/download/unifi + # Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { version = "5.6.42"; - sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; + sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; unifiStable = generic { - version = "5.10.25"; - sha256 = "1v03r7qd09s6lz37wwlsrqiy1jcwxnvj1q87jwpmhdipjprcjfdx"; + version = "5.11.39"; + sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj"; }; + # TODO: update as it is outdated unifiTesting = generic { version = "5.11.18"; suffix = "-996baf2ca5"; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1e8464874727..6f5f7170dbd9 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = https://uwsgi-docs.readthedocs.org/en/latest/; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; - maintainers = with maintainers; [ abbradar schneefux ]; + maintainers = with maintainers; [ abbradar schneefux globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 40d08841eac5..c9f0f2b84bbe 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 711bc1cf78f5..b3e86387ee32 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 7775221d1638..16c74956db7e 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 99c0bb176597..c27633a2d333 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/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index 2be8a3f5d687..ab4065597ae2 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, which, nodejs, yarn2nix, python2, phantomjs2 }: +, which, nodejs, yarn2nix, python2 }: yarn2nix.mkYarnPackage rec { name = "codimd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "codimd"; repo = "server"; rev = version; - sha256 = "0cljgc056p19pjzphwkcfbvgp642w3r6p626w2fl6m5kdk78qd1g"; + sha256 = "1sd7r5ws1k7dxmr57m67c1k23pzbkn25k2wvcnbrqn7gza6mhlf0"; }; nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python2 phantomjs2 ]; + extraBuildInputs = [ python2 ]; yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; @@ -45,10 +45,6 @@ yarn2nix.mkYarnPackage rec { unset OLD_HOME popd - pushd node_modules/phantomjs-prebuilt - npm run install - popd - npm run build runHook postBuild @@ -77,7 +73,7 @@ yarn2nix.mkYarnPackage rec { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; homepage = "https://github.com/codimd/server"; - maintainers = with maintainers; [ willibutz ma27 ]; + maintainers = with maintainers; [ willibutz ma27 globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/web-apps/codimd/package.json b/pkgs/servers/web-apps/codimd/package.json index c189f0477bf6..172822a26b30 100644 --- a/pkgs/servers/web-apps/codimd/package.json +++ b/pkgs/servers/web-apps/codimd/package.json @@ -1,12 +1,12 @@ { "name": "CodiMD", - "version": "1.4.0", + "version": "1.5.0", "description": "Realtime collaborative markdown notes on all platforms.", "main": "app.js", "license": "AGPL-3.0", "scripts": { "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite", - "eslint": "node_modules/.bin/eslint lib public test app.js", + "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js", "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit", "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", @@ -31,7 +31,7 @@ "codemirror": "git+https://github.com/hackmdio/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", - "connect-session-sequelize": "^4.1.0", + "connect-session-sequelize": "^6.0.0", "cookie": "0.3.1", "cookie-parser": "1.4.3", "deep-freeze": "^0.0.1", @@ -81,14 +81,14 @@ "markdown-pdf": "^9.0.0", "mathjax": "~2.7.0", "mattermost": "^3.4.0", - "mermaid": "~7.1.0", - "meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.2", + "mermaid": "~8.2.3", + "meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5", "method-override": "^2.3.7", "minimist": "^1.2.0", "minio": "^6.0.0", "moment": "^2.17.1", "morgan": "^1.7.0", - "mysql": "^2.12.0", + "mysql2": "^1.6.5", "passport": "^0.4.0", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", @@ -113,8 +113,7 @@ "scrypt-async": "^2.0.1", "scrypt-kdf": "^2.0.1", "select2": "^3.5.2-browserify", - "sequelize": "^3.28.0", - "sequelize-cli": "^2.5.1", + "sequelize": "^5.8.12", "shortid": "2.2.8", "socket.io": "~2.1.1", "socket.io-client": "~2.1.1", @@ -195,6 +194,7 @@ "mock-require": "^3.0.3", "optimize-css-assets-webpack-plugin": "^5.0.0", "script-loader": "^0.7.2", + "sequelize-cli": "^5.4.0", "string-loader": "^0.0.1", "style-loader": "^0.21.0", "uglifyjs-webpack-plugin": "^1.2.7", diff --git a/pkgs/servers/web-apps/codimd/yarn.lock b/pkgs/servers/web-apps/codimd/yarn.lock index 3b7e3f02b1e2..7c9d4997d79e 100644 --- a/pkgs/servers/web-apps/codimd/yarn.lock +++ b/pkgs/servers/web-apps/codimd/yarn.lock @@ -9,6 +9,228 @@ dependencies: "@babel/highlight" "^7.0.0" +"@babel/code-frame@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" + integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw== + dependencies: + "@babel/highlight" "^7.0.0" + +"@babel/core@^7.1.2": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30" + integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.5.5" + "@babel/helpers" "^7.5.5" + "@babel/parser" "^7.5.5" + "@babel/template" "^7.4.4" + "@babel/traverse" "^7.5.5" + "@babel/types" "^7.5.5" + convert-source-map "^1.1.0" + debug "^4.1.0" + json5 "^2.1.0" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.1.3", "@babel/generator@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf" + integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ== + dependencies: + "@babel/types" "^7.5.5" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + trim-right "^1.0.1" + +"@babel/helper-annotate-as-pure@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" + integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" + integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-builder-react-jsx@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4" + integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw== + dependencies: + "@babel/types" "^7.3.0" + esutils "^2.0.0" + +"@babel/helper-call-delegate@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43" + integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ== + dependencies: + "@babel/helper-hoist-variables" "^7.4.4" + "@babel/traverse" "^7.4.4" + "@babel/types" "^7.4.4" + +"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4" + integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg== + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-member-expression-to-functions" "^7.5.5" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-split-export-declaration" "^7.4.4" + +"@babel/helper-define-map@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" + integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/types" "^7.5.5" + lodash "^4.17.13" + +"@babel/helper-explode-assignable-expression@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6" + integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== + dependencies: + "@babel/traverse" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-function-name@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" + integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== + dependencies: + "@babel/helper-get-function-arity" "^7.0.0" + "@babel/template" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-get-function-arity@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" + integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-hoist-variables@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" + integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w== + dependencies: + "@babel/types" "^7.4.4" + +"@babel/helper-member-expression-to-functions@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" + integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA== + dependencies: + "@babel/types" "^7.5.5" + +"@babel/helper-module-imports@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" + integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" + integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-simple-access" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/template" "^7.4.4" + "@babel/types" "^7.5.5" + lodash "^4.17.13" + +"@babel/helper-optimise-call-expression@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" + integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-plugin-utils@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" + integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== + +"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351" + integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw== + dependencies: + lodash "^4.17.13" + +"@babel/helper-remap-async-to-generator@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" + integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-wrap-function" "^7.1.0" + "@babel/template" "^7.1.0" + "@babel/traverse" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-replace-supers@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" + integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.5.5" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/traverse" "^7.5.5" + "@babel/types" "^7.5.5" + +"@babel/helper-simple-access@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" + integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== + dependencies: + "@babel/template" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-split-export-declaration@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" + integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== + dependencies: + "@babel/types" "^7.4.4" + +"@babel/helper-wrap-function@^7.1.0", "@babel/helper-wrap-function@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" + integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/template" "^7.1.0" + "@babel/traverse" "^7.1.0" + "@babel/types" "^7.2.0" + +"@babel/helpers@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e" + integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g== + dependencies: + "@babel/template" "^7.4.4" + "@babel/traverse" "^7.5.5" + "@babel/types" "^7.5.5" + "@babel/highlight@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" @@ -18,6 +240,716 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@babel/parser@7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77" + integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w== + +"@babel/parser@^7.4.4", "@babel/parser@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b" + integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g== + +"@babel/plugin-proposal-async-generator-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" + integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-remap-async-to-generator" "^7.1.0" + "@babel/plugin-syntax-async-generators" "^7.2.0" + +"@babel/plugin-proposal-class-properties@^7.1.0": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" + integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-proposal-decorators@^7.1.2": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0" + integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-decorators" "^7.2.0" + +"@babel/plugin-proposal-do-expressions@^7.0.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz#ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a" + integrity sha512-xe0QQrhm+DGj6H23a6XtwkJNimy1fo71O/YVBfrfvfSl0fsq9T9dfoQBIY4QceEIdUo7u9s7OPEdsWEuizfGeg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-do-expressions" "^7.2.0" + +"@babel/plugin-proposal-dynamic-import@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506" + integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + +"@babel/plugin-proposal-export-default-from@^7.0.0": + version "7.5.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz#2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145" + integrity sha512-wr9Itk05L1/wyyZKVEmXWCdcsp/e185WUNl6AfYZeEKYaUPPvHXRDqO5K1VH7/UamYqGJowFRuCv30aDYZawsg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-export-default-from" "^7.2.0" + +"@babel/plugin-proposal-export-namespace-from@^7.0.0": + version "7.5.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz#ccd5ed05b06d700688ff1db01a9dd27155e0d2a0" + integrity sha512-TKUdOL07anjZEbR1iSxb5WFh810KyObdd29XLFLGo1IDsSuGrjH3ouWSbAxHNmrVKzr9X71UYl2dQ7oGGcRp0g== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-export-namespace-from" "^7.2.0" + +"@babel/plugin-proposal-function-bind@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz#94dc2cdc505cafc4e225c0014335a01648056bf7" + integrity sha512-qOFJ/eX1Is78sywwTxDcsntLOdb5ZlHVVqUz5xznq8ldAfOVIyZzp1JE2rzHnaksZIhrqMrwIpQL/qcEprnVbw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-function-bind" "^7.2.0" + +"@babel/plugin-proposal-function-sent@^7.1.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz#39233aa801145e7d8072077cdb2d25f781c1ffd7" + integrity sha512-JXdfiQpKoC6UgQliZkp3NX7K3MVec1o1nfTWiCCIORE5ag/QZXhL0aSD8/Y2K+hIHonSTxuJF9rh9zsB6hBi2A== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-wrap-function" "^7.2.0" + "@babel/plugin-syntax-function-sent" "^7.2.0" + +"@babel/plugin-proposal-json-strings@^7.0.0", "@babel/plugin-proposal-json-strings@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317" + integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" + +"@babel/plugin-proposal-logical-assignment-operators@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz#8a5cea6c42a7c87446959e02fff5fad012c56f57" + integrity sha512-0w797xwdPXKk0m3Js74hDi0mCTZplIu93MOSfb1ZLd/XFe3abWypx1QknVk0J+ohnsjYpvjH4Gwfo2i3RicB6Q== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.2.0" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39" + integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0" + +"@babel/plugin-proposal-numeric-separator@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz#646854daf4cd22fd6733f6076013a936310443ac" + integrity sha512-DohMOGDrZiMKS7LthjUZNNcWl8TAf5BZDwZAH4wpm55FuJTHgfqPGdibg7rZDmont/8Yg0zA03IgT6XLeP+4sg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-numeric-separator" "^7.2.0" + +"@babel/plugin-proposal-object-rest-spread@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58" + integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + +"@babel/plugin-proposal-optional-catch-binding@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5" + integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + +"@babel/plugin-proposal-optional-chaining@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz#ae454f4c21c6c2ce8cb2397dc332ae8b420c5441" + integrity sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-optional-chaining" "^7.2.0" + +"@babel/plugin-proposal-pipeline-operator@^7.0.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz#4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06" + integrity sha512-HFYuu/yGnkn69ligXxU0ohOVvQDsMNOUJs/c4PYLUVS6ntCYOyGmRQQaSYJARJ9rvc7/ulZKIzxd4wk91hN63A== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-pipeline-operator" "^7.5.0" + +"@babel/plugin-proposal-throw-expressions@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz#2d9e452d370f139000e51db65d0a85dc60c64739" + integrity sha512-adsydM8DQF4i5DLNO4ySAU5VtHTPewOtNBV3u7F4lNMPADFF9bWQ+iDtUUe8+033cYCUz+bFlQdXQJmJOwoLpw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-throw-expressions" "^7.2.0" + +"@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" + integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" + +"@babel/plugin-syntax-async-generators@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" + integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-decorators@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b" + integrity sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-do-expressions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz#f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a" + integrity sha512-/u4rJ+XEmZkIhspVuKRS+7WLvm7Dky9j9TvGK5IgId8B3FKir9MG+nQxDZ9xLn10QMBvW58dZ6ABe2juSmARjg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" + integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-export-default-from@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz#edd83b7adc2e0d059e2467ca96c650ab6d2f3820" + integrity sha512-c7nqUnNST97BWPtoe+Ssi+fJukc9P9/JMZ71IOMNQWza2E+Psrd46N6AEvtw6pqK+gt7ChjXyrw4SPDO79f3Lw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-export-namespace-from@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz#8d257838c6b3b779db52c0224443459bd27fb039" + integrity sha512-1zGA3UNch6A+A11nIzBVEaE3DDJbjfB+eLIcf0GGOh/BJr/8NxL3546MGhV/r0RhH4xADFIEso39TKCfEMlsGA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-flow@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c" + integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-function-bind@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz#68fe85b0c0da67125f87bf239c68051b06c66309" + integrity sha512-/WzU1lLU2l0wDfB42Wkg6tahrmtBbiD8C4H6EGSX0M4GAjzN6JiOpq/Uh8G6GSoR6lPMvhjM0MNiV6znj6y/zg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-function-sent@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz#91474d4d400604e4c6cbd4d77cd6cb3b8565576c" + integrity sha512-2MOVuJ6IMAifp2cf0RFkHQaOvHpbBYyWCvgtF/WVqXhTd7Bgtov8iXVCadLXp2FN1BrI2EFl+JXuwXy0qr3KoQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-import-meta@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz#2333ef4b875553a3bcd1e93f8ebc09f5b9213a40" + integrity sha512-Hq6kFSZD7+PHkmBN8bCpHR6J8QEoCuEV/B38AIQscYjgMZkGlXB7cHNFzP5jR4RCh5545yP1ujHdmO7hAgKtBA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-json-strings@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" + integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-jsx@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7" + integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz#fcab7388530e96c6f277ce494c55caa6c141fcfb" + integrity sha512-l/NKSlrnvd73/EL540t9hZhcSo4TULBrIPs9Palju8Oc/A8DXDO+xQf04whfeuZLpi8AuIvCAdpKmmubLN4EfQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz#f75083dfd5ade73e783db729bbd87e7b9efb7624" + integrity sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-numeric-separator@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz#7470fe070c2944469a756752a69a6963135018be" + integrity sha512-DroeVNkO/BnGpL2R7+ZNZqW+E24aR/4YWxP3Qb15d6lPU8KDzF8HlIUIRCOJRn4X77/oyW4mJY+7FHfY82NLtQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-object-rest-spread@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" + integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c" + integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-optional-chaining@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz#a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff" + integrity sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-pipeline-operator@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz#8ea7c2c22847c797748bf07752722a317079dc1e" + integrity sha512-5FVxPiMTMXWk4R7Kq9pt272nDu8VImJdaIzvXFSTcXFbgKWWaOdbic12TvUvl6cK+AE5EgnhwvxuWik4ZYYdzg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-syntax-throw-expressions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz#79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8" + integrity sha512-ngwynuqu1Rx0JUS9zxSDuPgW1K8TyVZCi2hHehrL4vyjqE7RGoNHWlZsS7KQT2vw9Yjk4YLa0+KldBXTRdPLRg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-arrow-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" + integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-async-to-generator@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" + integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-remap-async-to-generator" "^7.1.0" + +"@babel/plugin-transform-block-scoped-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" + integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-block-scoping@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce" + integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + lodash "^4.17.13" + +"@babel/plugin-transform-classes@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" + integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-define-map" "^7.5.5" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-split-export-declaration" "^7.4.4" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da" + integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-destructuring@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a" + integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3" + integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" + +"@babel/plugin-transform-duplicate-keys@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" + integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-exponentiation-operator@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008" + integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-flow-strip-types@^7.0.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7" + integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.2.0" + +"@babel/plugin-transform-for-of@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556" + integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-function-name@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" + integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1" + integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-member-expression-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" + integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-modules-amd@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" + integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== + dependencies: + "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-plugin-utils" "^7.0.0" + babel-plugin-dynamic-import-node "^2.3.0" + +"@babel/plugin-transform-modules-commonjs@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74" + integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ== + dependencies: + "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-simple-access" "^7.1.0" + babel-plugin-dynamic-import-node "^2.3.0" + +"@babel/plugin-transform-modules-systemjs@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" + integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== + dependencies: + "@babel/helper-hoist-variables" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + babel-plugin-dynamic-import-node "^2.3.0" + +"@babel/plugin-transform-modules-umd@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" + integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== + dependencies: + "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106" + integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg== + dependencies: + regexp-tree "^0.1.6" + +"@babel/plugin-transform-new-target@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5" + integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-object-super@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" + integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-replace-supers" "^7.5.5" + +"@babel/plugin-transform-parameters@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16" + integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw== + dependencies: + "@babel/helper-call-delegate" "^7.4.4" + "@babel/helper-get-function-arity" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-property-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" + integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-react-display-name@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0" + integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-react-jsx-self@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba" + integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@babel/plugin-transform-react-jsx-source@^7.0.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz#583b10c49cf057e237085bcbd8cc960bd83bd96b" + integrity sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@babel/plugin-transform-react-jsx@^7.0.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290" + integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg== + dependencies: + "@babel/helper-builder-react-jsx" "^7.3.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@babel/plugin-transform-regenerator@^7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" + integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA== + dependencies: + regenerator-transform "^0.14.0" + +"@babel/plugin-transform-reserved-words@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634" + integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-shorthand-properties@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" + integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-spread@^7.2.0": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406" + integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-sticky-regex@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" + integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.0.0" + +"@babel/plugin-transform-template-literals@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0" + integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-typeof-symbol@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2" + integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-unicode-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" + integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" + +"@babel/preset-env@^7.1.0": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a" + integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-async-generator-functions" "^7.2.0" + "@babel/plugin-proposal-dynamic-import" "^7.5.0" + "@babel/plugin-proposal-json-strings" "^7.2.0" + "@babel/plugin-proposal-object-rest-spread" "^7.5.5" + "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-transform-arrow-functions" "^7.2.0" + "@babel/plugin-transform-async-to-generator" "^7.5.0" + "@babel/plugin-transform-block-scoped-functions" "^7.2.0" + "@babel/plugin-transform-block-scoping" "^7.5.5" + "@babel/plugin-transform-classes" "^7.5.5" + "@babel/plugin-transform-computed-properties" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.5.0" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/plugin-transform-duplicate-keys" "^7.5.0" + "@babel/plugin-transform-exponentiation-operator" "^7.2.0" + "@babel/plugin-transform-for-of" "^7.4.4" + "@babel/plugin-transform-function-name" "^7.4.4" + "@babel/plugin-transform-literals" "^7.2.0" + "@babel/plugin-transform-member-expression-literals" "^7.2.0" + "@babel/plugin-transform-modules-amd" "^7.5.0" + "@babel/plugin-transform-modules-commonjs" "^7.5.0" + "@babel/plugin-transform-modules-systemjs" "^7.5.0" + "@babel/plugin-transform-modules-umd" "^7.2.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5" + "@babel/plugin-transform-new-target" "^7.4.4" + "@babel/plugin-transform-object-super" "^7.5.5" + "@babel/plugin-transform-parameters" "^7.4.4" + "@babel/plugin-transform-property-literals" "^7.2.0" + "@babel/plugin-transform-regenerator" "^7.4.5" + "@babel/plugin-transform-reserved-words" "^7.2.0" + "@babel/plugin-transform-shorthand-properties" "^7.2.0" + "@babel/plugin-transform-spread" "^7.2.0" + "@babel/plugin-transform-sticky-regex" "^7.2.0" + "@babel/plugin-transform-template-literals" "^7.4.4" + "@babel/plugin-transform-typeof-symbol" "^7.2.0" + "@babel/plugin-transform-unicode-regex" "^7.4.4" + "@babel/types" "^7.5.5" + browserslist "^4.6.0" + core-js-compat "^3.1.1" + invariant "^2.2.2" + js-levenshtein "^1.1.3" + semver "^5.5.0" + +"@babel/preset-flow@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2" + integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + +"@babel/preset-react@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0" + integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-react-jsx-self" "^7.0.0" + "@babel/plugin-transform-react-jsx-source" "^7.0.0" + +"@babel/preset-stage-0@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz#999aaec79ee8f0a763042c68c06539c97c6e0646" + integrity sha512-FBMd0IiARPtH5aaOFUVki6evHiJQiY0pFy7fizyRF7dtwc+el3nwpzvhb9qBNzceG1OIJModG1xpE0DDFjPXwA== + +"@babel/template@^7.1.0", "@babel/template@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237" + integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.4.4" + "@babel/types" "^7.4.4" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.4", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb" + integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.5.5" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/parser" "^7.5.5" + "@babel/types" "^7.5.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + +"@babel/types@^7.0.0", "@babel/types@^7.1.3", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a" + integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + +"@braintree/sanitize-url@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd" + integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== + "@passport-next/passport-openid@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@passport-next/passport-openid/-/passport-openid-1.0.0.tgz#d3b5e067a9aa1388ed172ab7cc02c39b8634283d" @@ -68,11 +1000,6 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" -"@types/geojson@^1.0.0": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf" - integrity sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w== - "@types/ldapjs@^1.0.0": version "1.0.4" resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.4.tgz#06774665035fbb277133d8cde800d18c7993707f" @@ -120,6 +1047,11 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" +"@types/unist@^2.0.0", "@types/unist@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" + integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -280,6 +1212,14 @@ version "0.0.1" resolved "git+https://github.com/shawnmclean/Idle.js#db9beb3483a460ad638ec947867720f0ed066a62" +JSONStream@^1.0.3: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + JSV@^4.0.x: version "4.0.2" resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" @@ -326,7 +1266,7 @@ acorn-walk@^6.0.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== -acorn@^5.1.0, acorn@^5.5.3: +acorn@^5.1.0, acorn@^5.2.1, acorn@^5.5.3: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== @@ -383,6 +1323,11 @@ ambi@^2.2.0: editions "^1.1.1" typechecker "^4.3.0" +ansi-colors@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== + ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -395,6 +1340,11 @@ ansi-gray@^0.1.1: dependencies: ansi-wrap "0.1.0" +ansi-html@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= + ansi-regex@^2.0.0, ansi-regex@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -432,6 +1382,11 @@ ansi-wrap@0.1.0: resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= +any-promise@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + anymatch@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" @@ -448,6 +1403,13 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +append-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" + integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE= + dependencies: + buffer-equal "^1.0.0" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -479,11 +1441,6 @@ archiver@^2.1.1: tar-stream "^1.5.0" zip-stream "^1.2.0" -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= - are-we-there-yet@~1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" @@ -529,16 +1486,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= - -array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= - array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -557,11 +1504,6 @@ array-includes@^3.0.3: define-properties "^1.1.2" es-abstract "^1.7.0" -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" - integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== - array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -569,7 +1511,7 @@ array-union@^1.0.1: dependencies: array-uniq "^1.0.1" -array-uniq@^1.0.1, array-uniq@^1.0.2: +array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= @@ -715,7 +1657,7 @@ azure-storage@^2.7.0: json-edm-parser "0.1.2" md5.js "1.3.4" readable-stream "~2.0.0" - request "^2.86.0" + request "^2.88.0" underscore "~1.8.3" uuid "^3.0.0" validator "~9.4.1" @@ -928,6 +1870,13 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-dynamic-import-node@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== + dependencies: + object.assign "^4.1.0" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -1231,7 +2180,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -1275,6 +2224,11 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" +babelify@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz#fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5" + integrity sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg== + babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" @@ -1292,6 +2246,11 @@ backoff@^2.5.0: dependencies: precond "0.2" +bail@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b" + integrity sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww== + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -1349,11 +2308,6 @@ bcryptjs@^2.4.0: resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= -beeper@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" - integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak= - better-assert@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" @@ -1376,11 +2330,6 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -bignumber.js@7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" - integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== - binary-extensions@^1.0.0: version "1.13.1" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" @@ -1416,7 +2365,7 @@ block-stream2@^1.0.0: inherits "^2.0.1" readable-stream "^2.0.4" -bluebird@^3.3.4, bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3: +bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3: version "3.5.5" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== @@ -1442,6 +2391,16 @@ body-parser@1.19.0, body-parser@^1.15.2: raw-body "2.4.0" type-is "~1.6.17" +body@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" + integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk= + dependencies: + continuable-cache "^0.3.1" + error "^7.0.0" + raw-body "~1.1.0" + safe-json-parse "~1.0.1" + boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -1500,6 +2459,13 @@ browser-process-hrtime@^0.1.2: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== +browser-resolve@^1.7.0: + version "1.11.3" + resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" + integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== + dependencies: + resolve "1.1.7" + browser-stdout@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" @@ -1586,6 +2552,15 @@ browserslist@^4.0.0: electron-to-chromium "^1.3.137" node-releases "^1.1.21" +browserslist@^4.6.0, browserslist@^4.6.2: + version "4.6.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453" + integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA== + dependencies: + caniuse-lite "^1.0.30000984" + electron-to-chromium "^1.3.191" + node-releases "^1.1.25" + buble@^0.19.6: version "0.19.7" resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.7.tgz#1dfd080ab688101aad5388d3304bc82601a244fd" @@ -1618,6 +2593,11 @@ buffer-crc32@^0.2.1: resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= +buffer-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -1628,6 +2608,11 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-shims@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" + integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= + buffer-writer@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08" @@ -1677,6 +2662,11 @@ bunyan@^1.8.3: mv "~2" safe-json-stringify "~1" +bytes@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8" + integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g= + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -1741,6 +2731,11 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +cached-path-relative@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db" + integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -1770,7 +2765,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@3.0.x: +camel-case@3.0.x, camel-case@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= @@ -1783,11 +2778,6 @@ camelcase@^1.0.2: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk= -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -1813,11 +2803,21 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000971: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13" integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g== +caniuse-lite@^1.0.30000984: + version "1.0.30000988" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db" + integrity sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= +ccount@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386" + integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w== + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1826,7 +2826,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^1.0.0, chalk@^1.1.3: +chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -1837,7 +2837,7 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1860,6 +2860,26 @@ chance@^1.0.4: resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.18.tgz#79788fe6fca4c338bf404321c347eecc80f969ee" integrity sha512-g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A== +character-entities-html4@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef" + integrity sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg== + +character-entities-legacy@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4" + integrity sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww== + +character-entities@^1.0.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6" + integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w== + +character-reference-invalid@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85" + integrity sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -1903,7 +2923,7 @@ chokidar@^1.6.1, chokidar@^1.7.0: optionalDependencies: fsevents "^1.0.0" -chokidar@^2.0.2: +chokidar@^2.0.2, chokidar@^2.0.4: version "2.1.6" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5" integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g== @@ -1952,24 +2972,24 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-css@4.2.x: +clean-css@4.2.x, clean-css@^4.1.6, clean-css@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17" integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g== dependencies: source-map "~0.6.0" -cli-color@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.2.0.tgz#3a5ae74fd76b6267af666e69e2afbbd01def34d1" - integrity sha1-OlrnT9drYmevZm5p4q+70B3vNNE= +cli-color@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f" + integrity sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w== dependencies: ansi-regex "^2.1.1" d "1" - es5-ext "^0.10.12" - es6-iterator "2" - memoizee "^0.4.3" - timers-ext "0.1" + es5-ext "^0.10.46" + es6-iterator "^2.0.3" + memoizee "^0.4.14" + timers-ext "^0.1.5" cli-cursor@^2.1.0: version "2.1.0" @@ -2001,15 +3021,6 @@ cliui@^2.1.0: right-align "^0.1.1" wordwrap "0.0.2" -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -2019,26 +3030,47 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" -clone@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" - integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= -clone@^1.0.0, clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= clone@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= +cloneable-readable@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" + integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== + dependencies: + inherits "^2.0.1" + process-nextick-args "^2.0.0" + readable-stream "^2.3.5" + +cls-bluebird@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee" + integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4= + dependencies: + is-bluebird "^1.0.2" + shimmer "^1.1.0" + coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -2065,6 +3097,11 @@ code-point-at@^1.0.0: rollup-watch "^4.3.1" uglify-js "^2.8.15" +collapse-white-space@^1.0.0, collapse-white-space@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a" + integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2144,6 +3181,16 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +comma-separated-tokens@^1.0.1: + version "1.0.7" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz#419cd7fb3258b1ed838dc0953167a25e152f5b59" + integrity sha512-Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ== + +commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.2.0, commander@^2.9.0, commander@~2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== + commander@2.15.1: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" @@ -2154,11 +3201,6 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.2.0, commander@^2.9.0, commander@~2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -2229,7 +3271,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0: +concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0, concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -2239,6 +3281,15 @@ concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^ readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@~1.5.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" + integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY= + dependencies: + inherits "~2.0.1" + readable-stream "~2.0.0" + typedarray "~0.0.5" + config-chain@^1.1.12: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" @@ -2252,12 +3303,12 @@ connect-flash@^0.1.1: resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30" integrity sha1-2GMPJtlaf4UfmVax6MxnMvO2qjA= -connect-session-sequelize@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-4.1.0.tgz#d402749c3bebd79209192c164c090742b3fe2011" - integrity sha1-1AJ0nDvr15IJGSwWTAkHQrP+IBE= +connect-session-sequelize@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.0.0.tgz#afd4456c65d92c9b6b955fdff00afff795e8a420" + integrity sha512-XC71xJd5rqObdL7700S/qFD+gSRA4o6WVJAyFY0Vjah73id5bBElM0SHQR1ME5Bxrt4JL8alvggseNDVTlKyxA== dependencies: - debug "^2.1.1" + debug "^3.1.0" deep-equal "^1.0.1" console-browserify@^1.1.0: @@ -2299,7 +3350,12 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.5.0, convert-source-map@^1.5.1: +continuable-cache@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f" + integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8= + +convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -2365,6 +3421,20 @@ copy-webpack-plugin@^4.5.2: p-limit "^1.0.0" serialize-javascript "^1.4.0" +core-js-compat@^3.1.1: + version "3.1.4" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408" + integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg== + dependencies: + browserslist "^4.6.2" + core-js-pure "3.1.4" + semver "^6.1.1" + +core-js-pure@3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769" + integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA== + core-js@^2.4.0, core-js@^2.5.0: version "2.6.9" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" @@ -2431,15 +3501,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -2473,6 +3534,11 @@ csextends@^1.0.3: resolved "https://registry.yarnpkg.com/csextends/-/csextends-1.2.0.tgz#6374b210984b54d4495f29c99d3dd069b80543e5" integrity sha512-S/8k1bDTJIwuGgQYmsRoE+8P+ohV32WhQ0l4zqrc0XDdxOhjQQD7/wTZwCzoZX53jSX3V/qwjT+OkPTxWQcmjg== +css-b64-images@~0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02" + integrity sha1-QgBdgyBLK0pdk7axpWRBM7WSegI= + css-color-names@0.0.4, css-color-names@^0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -2688,10 +3754,253 @@ cyclist@~0.2.2: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= -d3@3.5.17: - version "3.5.17" - resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" - integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g= +d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" + integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== + +d3-axis@1: + version "1.0.12" + resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9" + integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== + +d3-brush@1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.6.tgz#33691f2032d9db6c5d8cb684ff255a9883629e21" + integrity sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w== + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3-chord@1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f" + integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA== + dependencies: + d3-array "1" + d3-path "1" + +d3-collection@1: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" + integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== + +d3-color@1: + version "1.2.8" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.8.tgz#4eaf9b60ef188c893fcf8b28f3546aafebfbd9f4" + integrity sha512-yeANXzP37PHk0DbSTMNPhnJD+Nn4G//O5E825bR6fAfHH43hobSBpgB9G9oWVl9+XgUaQ4yCnsX1H+l8DoaL9A== + +d3-contour@1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3" + integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg== + dependencies: + d3-array "^1.1.1" + +d3-dispatch@1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.5.tgz#e25c10a186517cd6c82dd19ea018f07e01e39015" + integrity sha512-vwKx+lAqB1UuCeklr6Jh1bvC4SZgbSqbkGBLClItFBIYH4vqDJCA7qfoy14lXmJdnBOdxndAMxjCbImJYW7e6g== + +d3-drag@1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.3.tgz#46e206ad863ec465d88c588098a1df444cd33c64" + integrity sha512-8S3HWCAg+ilzjJsNtWW1Mutl74Nmzhb9yU6igspilaJzeZVFktmY6oO9xOh5TDk+BM2KrNFjttZNoJJmDnkjkg== + dependencies: + d3-dispatch "1" + d3-selection "1" + +d3-dsv@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.1.1.tgz#aaa830ecb76c4b5015572c647cc6441e3c7bb701" + integrity sha512-1EH1oRGSkeDUlDRbhsFytAXU6cAmXFzc52YUe6MRlPClmWb85MP1J5x+YJRzya4ynZWnbELdSAvATFW/MbxaXw== + dependencies: + commander "2" + iconv-lite "0.4" + rw "1" + +d3-ease@1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.5.tgz#8ce59276d81241b1b72042d6af2d40e76d936ffb" + integrity sha512-Ct1O//ly5y5lFM9YTdu+ygq7LleSgSE4oj7vUt9tPLHUi8VCV7QoizGpdWRWAwCO9LdYzIrQDg97+hGVdsSGPQ== + +d3-fetch@1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz#957c8fbc6d4480599ba191b1b2518bf86b3e1be2" + integrity sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA== + dependencies: + d3-dsv "1" + +d3-force@1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b" + integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg== + dependencies: + d3-collection "1" + d3-dispatch "1" + d3-quadtree "1" + d3-timer "1" + +d3-format@1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz#6a96b5e31bcb98122a30863f7d92365c00603562" + integrity sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ== + +d3-geo@1: + version "1.11.6" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.6.tgz#134f2ef035ff75a448075fafdea92702a2e0e0cf" + integrity sha512-z0J8InXR9e9wcgNtmVnPTj0TU8nhYT6lD/ak9may2PdKqXIeHUr8UbFLoCtrPYNsjv6YaLvSDQVl578k6nm7GA== + dependencies: + d3-array "1" + +d3-hierarchy@1: + version "1.1.8" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz#7a6317bd3ed24e324641b6f1e76e978836b008cc" + integrity sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w== + +d3-interpolate@1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz#417d3ebdeb4bc4efcc8fd4361c55e4040211fd68" + integrity sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w== + dependencies: + d3-color "1" + +d3-path@1: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.8.tgz#4a0606a794d104513ec4a8af43525f374b278719" + integrity sha512-J6EfUNwcMQ+aM5YPOB8ZbgAZu6wc82f/0WFxrxwV6Ll8wBwLaHLKCqQ5Imub02JriCVVdPjgI+6P3a4EWJCxAg== + +d3-polygon@1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.5.tgz#9a645a0a64ff6cbf9efda96ee0b4a6909184c363" + integrity sha512-RHhh1ZUJZfhgoqzWWuRhzQJvO7LavchhitSTHGu9oj6uuLFzYZVeBzaWTQ2qSO6bz2w55RMoOCf0MsLCDB6e0w== + +d3-quadtree@1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.6.tgz#d1ab2a95a7f27bbde88582c94166f6ae35f32056" + integrity sha512-NUgeo9G+ENQCQ1LsRr2qJg3MQ4DJvxcDNCiohdJGHt5gRhBW6orIB5m5FJ9kK3HNL8g9F4ERVoBzcEwQBfXWVA== + +d3-random@1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291" + integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ== + +d3-scale-chromatic@1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz#dad4366f0edcb288f490128979c3c793583ed3c0" + integrity sha512-BWTipif1CimXcYfT02LKjAyItX5gKiwxuPRgr4xM58JwlLocWbjPLI7aMEjkcoOQXMkYsmNsvv3d2yl/OKuHHw== + dependencies: + d3-color "1" + d3-interpolate "1" + +d3-scale@2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f" + integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw== + dependencies: + d3-array "^1.2.0" + d3-collection "1" + d3-format "1" + d3-interpolate "1" + d3-time "1" + d3-time-format "2" + +d3-selection@1, d3-selection@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + +d3-shape@1: + version "1.3.5" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.5.tgz#e81aea5940f59f0a79cfccac012232a8987c6033" + integrity sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg== + dependencies: + d3-path "1" + +d3-time-format@2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.3.tgz#ae06f8e0126a9d60d6364eac5b1533ae1bac826b" + integrity sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA== + dependencies: + d3-time "1" + +d3-time@1: + version "1.0.11" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.11.tgz#1d831a3e25cd189eb256c17770a666368762bbce" + integrity sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw== + +d3-timer@1: + version "1.0.9" + resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.9.tgz#f7bb8c0d597d792ff7131e1c24a36dd471a471ba" + integrity sha512-rT34J5HnQUHhcLvhSB9GjCkN0Ddd5Y8nCwDBG2u6wQEeYxT/Lf51fTFFkldeib/sE/J0clIe0pnCfs6g/lRbyg== + +d3-transition@1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.2.0.tgz#f538c0e21b2aa1f05f3e965f8567e81284b3b2b8" + integrity sha512-VJ7cmX/FPIPJYuaL2r1o1EMHLttvoIuZhhuAlRoOxDzogV8iQS6jYulDm3xEU3TqL80IZIhI551/ebmCMrkvhw== + dependencies: + d3-color "1" + d3-dispatch "1" + d3-ease "1" + d3-interpolate "1" + d3-selection "^1.1.0" + d3-timer "1" + +d3-voronoi@1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" + integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg== + +d3-zoom@1: + version "1.7.3" + resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.3.tgz#f444effdc9055c38077c4299b4df999eb1d47ccb" + integrity sha512-xEBSwFx5Z9T3/VrwDkMt+mr0HCzv7XjpGURJ8lWmIC8wxe32L39eWHIasEe/e7Ox8MPU4p1hvH8PKN2olLzIBg== + dependencies: + d3-dispatch "1" + d3-drag "1" + d3-interpolate "1" + d3-selection "1" + d3-transition "1" + +d3@^5.7.0: + version "5.9.7" + resolved "https://registry.yarnpkg.com/d3/-/d3-5.9.7.tgz#f3835648a172b438e89ed57eb6c525bdabdcd7dc" + integrity sha512-jENytrmdXtGPw7HuSK2S4gxRM1eUGjKvWQkQ6ct4yK+DB8SG3VcnVrwesfnsv8rIcxMUg18TafT4Q8mOZUMP4Q== + dependencies: + d3-array "1" + d3-axis "1" + d3-brush "1" + d3-chord "1" + d3-collection "1" + d3-color "1" + d3-contour "1" + d3-dispatch "1" + d3-drag "1" + d3-dsv "1" + d3-ease "1" + d3-fetch "1" + d3-force "1" + d3-format "1" + d3-geo "1" + d3-hierarchy "1" + d3-interpolate "1" + d3-path "1" + d3-polygon "1" + d3-quadtree "1" + d3-random "1" + d3-scale "2" + d3-scale-chromatic "1" + d3-selection "1" + d3-shape "1" + d3-time "1" + d3-time-format "2" + d3-timer "1" + d3-transition "1" + d3-voronoi "1" + d3-zoom "1" d@1: version "1.0.0" @@ -2700,17 +4009,15 @@ d@1: dependencies: es5-ext "^0.10.9" -dagre-d3-renderer@^0.4.25: - version "0.4.26" - resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.4.26.tgz#648a491209b853ae96ddf3fea41a1f104479a5a1" - integrity sha512-vOWj1uA4/APTrfDyfHaH/xpfXhPh9rszW+HOaEwPCeA6Afl06Lobfh7OpESuVMQW2QGuY4UQ7pte/p0WhdDs7w== +dagre-d3-renderer@^0.5.8: + version "0.5.8" + resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz#aa071bb71d3c4d67426925906f3f6ddead49c1a3" + integrity sha512-XH2a86isUHRxzIYbjQVEuZtJnWEufb64H5DuXIUmn8esuB40jgLEbUUclulWOW62/ZoXlj2ZDyL8SJ+YRxs+jQ== dependencies: - d3 "3.5.17" - dagre-layout "^0.8.0" - graphlib "^2.1.1" - lodash "^4.17.4" + dagre-layout "^0.8.8" + lodash "^4.17.5" -dagre-layout@^0.8.0: +dagre-layout@^0.8.8: version "0.8.8" resolved "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz#9b6792f24229f402441c14162c1049e3f261f6d9" integrity sha512-ZNV15T9za7X+fV8Z07IZquUKugCxm5owoiPPxfEx6OJRD331nkiIaF3vSt0JEY5FkrY0KfRQxcpQ3SpXB7pLPQ== @@ -2744,19 +4051,19 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dateformat@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" - integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= +de-indent@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" + integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@*, debug@^4.0.1: +debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== dependencies: ms "^2.1.1" -debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2777,7 +4084,7 @@ debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.0.0, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -2807,13 +4114,6 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -defaults@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= - dependencies: - clone "^1.0.2" - define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -2863,21 +4163,21 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= +denque@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" + integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== + depd@2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@^1.1.0, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -deprecated@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" - integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk= - des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -2891,12 +4191,12 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-file@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63" - integrity sha1-STXe39lIhkjgBrASlWbpOGcR6mM= +detab@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz#074970d1a807b045d0258a4235df5928dd683561" + integrity sha512-Q57yPrxScy816TTE1P/uLRXLDKjXhvYTbfxS/e6lPD+YrqghbsMlGB9nQzj/zVtSPaF0DFPSdO916EWO4sQUyQ== dependencies: - fs-exists-sync "^0.1.0" + repeat-string "^1.5.4" detect-file@^1.0.0: version "1.0.0" @@ -2915,6 +4215,14 @@ detect-libc@^1.0.2: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detective@^4.0.0: + version "4.7.1" + resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e" + integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig== + dependencies: + acorn "^5.2.1" + defined "^1.0.0" + diagnostics@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" @@ -2933,6 +4241,11 @@ diff@3.5.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== +diff@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" + integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -2961,6 +4274,13 @@ dns-prefetch-control@0.1.0: resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2" integrity sha1-YN20V3dOF48flBXwyrsOhbCzALI= +doctrine-temporary-fork@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz#36f2154f556ee4f1e60311d391cd23de5187ed57" + integrity sha512-nliqOv5NkE4zMON4UA6AMJE6As35afs8aYXATpU4pTUdIKiARZwrJVEP1boA3Rx1ZXHVkwxkhcq4VkqvsuRLsA== + dependencies: + esutils "^2.0.2" + doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" @@ -2976,6 +4296,77 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +documentation@^12.0.1: + version "12.1.0" + resolved "https://registry.yarnpkg.com/documentation/-/documentation-12.1.0.tgz#0cabc4e88507872fd847129c00ae7d0e2482049c" + integrity sha512-iAllbFhy1P5DvKAcrPw0h5R5rNMnaXAjExj3XKUzW/eBvQ6JhTbDELQnN8k3SrBvQAnm70+6NLsmxA+csp4f/Q== + dependencies: + "@babel/core" "^7.1.2" + "@babel/generator" "^7.1.3" + "@babel/parser" "7.1.3" + "@babel/plugin-proposal-class-properties" "^7.1.0" + "@babel/plugin-proposal-decorators" "^7.1.2" + "@babel/plugin-proposal-do-expressions" "^7.0.0" + "@babel/plugin-proposal-export-default-from" "^7.0.0" + "@babel/plugin-proposal-export-namespace-from" "^7.0.0" + "@babel/plugin-proposal-function-bind" "^7.0.0" + "@babel/plugin-proposal-function-sent" "^7.1.0" + "@babel/plugin-proposal-json-strings" "^7.0.0" + "@babel/plugin-proposal-logical-assignment-operators" "^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-proposal-numeric-separator" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.0.0" + "@babel/plugin-proposal-pipeline-operator" "^7.0.0" + "@babel/plugin-proposal-throw-expressions" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.0.0" + "@babel/plugin-syntax-import-meta" "^7.0.0" + "@babel/preset-env" "^7.1.0" + "@babel/preset-flow" "^7.0.0" + "@babel/preset-react" "^7.0.0" + "@babel/preset-stage-0" "^7.0.0" + "@babel/traverse" "^7.1.4" + "@babel/types" "^7.1.3" + ansi-html "^0.0.7" + babelify "^10.0.0" + chalk "^2.3.0" + chokidar "^2.0.4" + concat-stream "^1.6.0" + diff "^4.0.1" + doctrine-temporary-fork "2.1.0" + get-port "^4.0.0" + git-url-parse "^10.0.1" + github-slugger "1.2.0" + glob "^7.1.2" + globals-docs "^2.4.0" + highlight.js "^9.15.5" + ini "^1.3.5" + js-yaml "^3.10.0" + lodash "^4.17.10" + mdast-util-inject "^1.1.0" + micromatch "^3.1.5" + mime "^2.2.0" + module-deps-sortable "5.0.0" + parse-filepath "^1.0.2" + pify "^4.0.0" + read-pkg-up "^4.0.0" + remark "^9.0.0" + remark-html "^8.0.0" + remark-reference-links "^4.0.1" + remark-toc "^5.0.0" + resolve "^1.8.1" + stream-array "^1.1.2" + strip-json-comments "^2.0.1" + tiny-lr "^1.1.0" + unist-builder "^1.0.2" + unist-util-visit "^1.3.0" + vfile "^4.0.0" + vfile-reporter "^6.0.0" + vfile-sort "^2.1.0" + vinyl "^2.1.0" + vinyl-fs "^3.0.2" + vue-template-compiler "^2.5.16" + yargs "^12.0.2" + dom-converter@^0.2: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -3043,10 +4434,10 @@ dot-prop@^4.1.1: dependencies: is-obj "^1.0.0" -dottie@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a" - integrity sha1-RcKj9IvWUo7u0memmoSOqspvqmo= +dottie@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz#697ad9d72004db7574d21f892466a3c285893659" + integrity sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw== dtrace-provider@~0.8: version "0.8.7" @@ -3055,12 +4446,12 @@ dtrace-provider@~0.8: dependencies: nan "^2.10.0" -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= +duplexer2@^0.1.2, duplexer2@~0.1.0: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= dependencies: - readable-stream "~1.1.9" + readable-stream "^2.0.2" duplexer@^0.1.1: version "0.1.1" @@ -3138,6 +4529,11 @@ electron-to-chromium@^1.3.137, electron-to-chromium@^1.3.47: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.138.tgz#3c27814d48040d3988eaee56ab839d032987aff4" integrity sha512-V6gvA2zuVp2l8gT8tvaFp3z2IOnx0UeCPuG6Fyw4x/eZEbt9xD9npSgia6emmDFHAz3TU0bElnpKZ3xZ0CUNDw== +electron-to-chromium@^1.3.191: + version "1.3.210" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz#0ce6247366c5771d4f5663a5879388fd1adefb7e" + integrity sha512-m1i/F+gw9jkauxDx0mOr7Sj6vp6se1mfkQNYqZb1yL5VGTp0AC1NZH5CGI6YMSO7WaScILmkKDZFG9/hlR9axQ== + elliptic@^6.0.0: version "6.4.1" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a" @@ -3151,11 +4547,21 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +"emoji-regex@>=6.0.0 <=6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" + integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4= + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + emojify.js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" @@ -3185,13 +4591,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -end-of-stream@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" - integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8= - dependencies: - once "~1.3.0" - engine.io-client@~3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" @@ -3272,6 +4671,14 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +error@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02" + integrity sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI= + dependencies: + string-template "~0.2.1" + xtend "~4.0.0" + es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" @@ -3293,7 +4700,7 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.12, es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: +es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: version "0.10.50" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778" integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw== @@ -3307,7 +4714,7 @@ es6-error@^2.0.2: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-2.1.1.tgz#91384301ec5ed1c9a7247d1128247216f03547cd" integrity sha1-kThDAexe0cmnJH0RKCRyFvA1R80= -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.3: +es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= @@ -3349,6 +4756,11 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escaper@^2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz#8b8fe90ba364054151ab7eff18b4ce43b1e13ab5" + integrity sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ== + escodegen@^1.9.1: version "1.11.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" @@ -3532,6 +4944,11 @@ estree-walker@^0.6.0: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== +esutils@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -3578,19 +4995,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -3631,13 +5035,6 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expand-tilde@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449" - integrity sha1-C4HrqJflo9MdHD0QL48BRB5VlEk= - dependencies: - os-homedir "^1.0.1" - expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" @@ -3807,7 +5204,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fancy-log@^1.1.0: +fancy-log@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== @@ -3842,6 +5239,13 @@ fastparse@^1.1.1: resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== +faye-websocket@~0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" + integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= + dependencies: + websocket-driver ">=0.5.1" + fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -3948,11 +5352,6 @@ find-cache-dir@^2.0.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-index@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" - integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ= - find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -3967,16 +5366,6 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -findup-sync@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz#6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec" - integrity sha1-b35LV7buOkA3tEFOrt6j9Y9x4Ow= - dependencies: - detect-file "^0.1.0" - is-glob "^2.0.1" - micromatch "^2.3.7" - resolve-dir "^0.1.0" - findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -3987,27 +5376,6 @@ findup-sync@^2.0.0: micromatch "^3.0.4" resolve-dir "^1.0.1" -fined@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= - -flagged-respawn@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -4029,7 +5397,7 @@ flowchart.js@^1.6.4: dependencies: raphael "2.2.7" -flush-write-stream@^1.0.0: +flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== @@ -4049,13 +5417,6 @@ for-own@^0.1.4: dependencies: for-in "^1.0.1" -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -4129,11 +5490,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= - fs-extra@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" @@ -4143,10 +5499,10 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" @@ -4159,6 +5515,14 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.2.1" +fs-mkdirp-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" + integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes= + dependencies: + graceful-fs "^4.1.11" + through2 "^2.0.3" + fs-readdir-recursive@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -4211,17 +5575,12 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" - integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8= +generate-function@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" + integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ== dependencies: - globule "~0.1.0" - -generic-pool@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683" - integrity sha1-iGvFvwvrfblugby7oHiBjeWmJoM= + is-property "^1.0.2" generic-pool@2.4.3: version "2.4.3" @@ -4233,10 +5592,15 @@ get-caller-file@^1.0.1, get-caller-file@^1.0.2: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-port@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119" + integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw== get-stream@^4.0.0: version "4.1.0" @@ -4262,6 +5626,35 @@ gist-embed@~2.6.0: resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab" integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas= +git-up@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz#2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c" + integrity sha512-MJgwfcSd9qxgDyEYpRU/CDxNpUadrK80JHuEQDG4Urn0m7tpSOgCBrtiSIa9S9KH8Tbuo/TN8SSQmJBvsw1HkA== + dependencies: + is-ssh "^1.3.0" + parse-url "^3.0.2" + +git-url-parse@^10.0.1: + version "10.1.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz#a27813218f8777e91d15f1c121b83bf14721b67e" + integrity sha512-goZOORAtFjU1iG+4zZgWq+N7It09PqS3Xsy43ZwhP5unDD0tTSmXTpqULHodMdJXGejm3COwXIhIRT6Z8DYVZQ== + dependencies: + git-up "^2.0.0" + +github-slugger@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz#8ada3286fd046d8951c3c952a8d7854cfd90fd9a" + integrity sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q== + dependencies: + emoji-regex ">=6.0.0 <=6.1.1" + +github-slugger@^1.0.0, github-slugger@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz#47e904e70bf2dccd0014748142d31126cfd49508" + integrity sha512-SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ== + dependencies: + emoji-regex ">=6.0.0 <=6.1.1" + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -4285,31 +5678,21 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-stream@^3.1.5: - version "3.1.18" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" - integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs= - dependencies: - glob "^4.3.1" - glob2base "^0.0.12" - minimatch "^3.0.4" - ordered-read-streams "^0.1.0" - through2 "^0.6.1" - unique-stream "^1.0.0" - -glob-watcher@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" - integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs= - dependencies: - gaze "^0.5.1" - -glob2base@^0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" - integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY= +glob-stream@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" + integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ= dependencies: - find-index "^0.1.1" + extend "^3.0.0" + glob "^7.1.1" + glob-parent "^3.1.0" + is-negated-glob "^1.0.0" + ordered-read-streams "^1.0.0" + pumpify "^1.3.5" + readable-stream "^2.1.5" + remove-trailing-separator "^1.0.1" + to-absolute-glob "^2.0.0" + unique-stream "^2.0.2" glob@7.1.2: version "7.1.2" @@ -4323,16 +5706,6 @@ glob@7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^4.3.1: - version "4.5.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" - integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - glob@^6.0.1, glob@~6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" @@ -4340,11 +5713,11 @@ glob@^6.0.1, glob@~6.0.4: dependencies: inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "2 || 3" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3: +glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== @@ -4356,23 +5729,6 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@~3.1.21: - version "3.1.21" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" - integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0= - dependencies: - graceful-fs "~1.2.0" - inherits "1" - minimatch "^3.0.4" - -global-modules@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" - integrity sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0= - dependencies: - global-prefix "^0.1.4" - is-windows "^0.2.0" - global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -4382,16 +5738,6 @@ global-modules@^1.0.0: is-windows "^1.0.1" resolve-dir "^1.0.0" -global-prefix@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" - integrity sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= - dependencies: - homedir-polyfill "^1.0.0" - ini "^1.3.4" - is-windows "^0.2.0" - which "^1.2.12" - global-prefix@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" @@ -4403,7 +5749,12 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -globals@^11.7.0: +globals-docs@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz#f2c647544eb6161c7c38452808e16e693c2dafbb" + integrity sha512-B69mWcqCmT3jNYmSxRxxOXWfzu3Go8NQXPfl2o0qPd1EEFhwW0dFUg9ztTu915zPQzqwIhWAlw6hmfIcCK4kkQ== + +globals@^11.1.0, globals@^11.7.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== @@ -4425,22 +5776,6 @@ globby@^7.1.1: pify "^3.0.0" slash "^1.0.0" -globule@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" - integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU= - dependencies: - glob "~3.1.21" - lodash "~1.0.1" - minimatch "^3.0.4" - -glogg@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" - integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA== - dependencies: - sparkles "^1.0.0" - good-listener@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" @@ -4453,24 +5788,10 @@ graceful-fs@*, graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, gra resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== -graceful-fs@^3.0.0: - version "3.0.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" - integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg= - dependencies: - natives "^1.1.0" - -graceful-fs@~1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" - integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q= - -graphlib@^2.1.1: - version "2.1.7" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" - integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w== - dependencies: - lodash "^4.17.5" +graceful-fs@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" + integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg== graphlibrary@^2.2.0: version "2.2.0" @@ -4484,63 +5805,15 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -gulp-help@~1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/gulp-help/-/gulp-help-1.6.1.tgz#261db186e18397fef3f6a2c22e9c315bfa88ae0c" - integrity sha1-Jh2xhuGDl/7z9qLCLpwxW/qIrgw= - dependencies: - chalk "^1.0.0" - object-assign "^3.0.0" - -gulp-util@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" - integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= - dependencies: - array-differ "^1.0.0" - array-uniq "^1.0.2" - beeper "^1.0.0" - chalk "^1.0.0" - dateformat "^2.0.0" - fancy-log "^1.1.0" - gulplog "^1.0.0" - has-gulplog "^0.1.0" - lodash._reescape "^3.0.0" - lodash._reevaluate "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.template "^3.0.0" - minimist "^1.1.0" - multipipe "^0.1.2" - object-assign "^3.0.0" - replace-ext "0.0.1" - through2 "^2.0.0" - vinyl "^0.5.0" - -gulp@^3.9.1: - version "3.9.1" - resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" - integrity sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ= - dependencies: - archy "^1.0.0" - chalk "^1.0.0" - deprecated "^0.0.1" - gulp-util "^3.0.0" - interpret "^1.0.0" - liftoff "^2.1.0" - minimist "^1.1.0" - orchestrator "^0.3.0" - pretty-hrtime "^1.0.0" - semver "^4.1.0" - tildify "^1.0.0" - v8flags "^2.0.2" - vinyl-fs "^0.3.0" - -gulplog@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U= +gulp-print@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/gulp-print/-/gulp-print-5.0.2.tgz#8f379148218d2e168461baa74352e11d1bf7aa75" + integrity sha512-iIpHMzC/b3gFvVXOfP9Jk94SWGIsDLVNUrxULRleQev+08ug07mh84b1AOlW6QDQdmInQiqDFqJN1UvhU2nXdg== dependencies: - glogg "^1.0.0" + ansi-colors "^3.2.4" + fancy-log "^1.3.3" + map-stream "0.0.7" + vinyl "^2.2.0" handlebars@^4.1.2: version "4.1.2" @@ -4595,13 +5868,6 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-gulplog@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" - integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4= - dependencies: - sparkles "^1.0.0" - has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" @@ -4674,12 +5940,45 @@ hasha@^2.2.0: is-stream "^1.0.1" pinkie-promise "^2.0.0" +hast-util-is-element@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz#423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4" + integrity sha512-C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA== + +hast-util-sanitize@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz#4e60d66336bd67e52354d581967467029a933f2e" + integrity sha512-AIeKHuHx0Wk45nSkGVa2/ujQYTksnDl8gmmKo/mwQi7ag7IBZ8cM3nJ2G86SajbjGP/HRpud6kMkPtcM2i0Tlw== + dependencies: + xtend "^4.0.1" + +hast-util-to-html@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz#3666b05afb62bd69f8f5e6c94db04dea19438e2a" + integrity sha512-2emzwyf0xEsc4TBIPmDJmBttIw8R4SXAJiJZoiRR/s47ODYWgOqNoDbf2SJAbMbfNdFWMiCSOrI3OVnX6Qq2Mg== + dependencies: + ccount "^1.0.0" + comma-separated-tokens "^1.0.1" + hast-util-is-element "^1.0.0" + hast-util-whitespace "^1.0.0" + html-void-elements "^1.0.0" + property-information "^4.0.0" + space-separated-tokens "^1.0.0" + stringify-entities "^1.0.1" + unist-util-is "^2.0.0" + xtend "^4.0.1" + +hast-util-whitespace@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz#6d161b307bd0693b5ec000c7c7e8b5445109ee34" + integrity sha512-AlkYiLTTwPOyxZ8axq2/bCwRUPjIPBfrHkXuCR92B38b3lSdU22R5F/Z4DL6a2kxWpekWq1w6Nj48tWat6GeRA== + he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= -he@1.2.x, he@^1.1.1: +he@1.2.x, he@^1.1.0, he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -4735,6 +6034,11 @@ highlight.js@^9.1.0: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz#f344fda123f36f1a65490e932cf90569e4999971" integrity sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA== +highlight.js@^9.15.5: + version "9.15.9" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz#865257da1dbb4a58c4552d46c4b3854f77f0e6d5" + integrity sha512-M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ== + highlight.js@~9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" @@ -4757,7 +6061,7 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: +homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== @@ -4816,6 +6120,24 @@ html-minifier@^3.5.20: relateurl "0.2.x" uglify-js "3.4.x" +html-minifier@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56" + integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig== + dependencies: + camel-case "^3.0.0" + clean-css "^4.2.1" + commander "^2.19.0" + he "^1.2.0" + param-case "^2.1.1" + relateurl "^0.2.7" + uglify-js "^3.5.1" + +html-void-elements@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz#95e8bb5ecd6b88766569c2645f2b5f1591db9ba5" + integrity sha512-yMk3naGPLrfvUV9TdDbuYXngh/TpHbA6TrOw3HL9kS8yhwx7i309BReNg7CbAJXGE+UMJ6je5OqJ7lC63o6YuQ== + html-webpack-plugin@4.0.0-beta.2: version "4.0.0-beta.2" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.2.tgz#c3a212448ee198a17dacd06525678ee12f917420" @@ -4851,6 +6173,11 @@ http-errors@1.7.2, http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +"http-parser-js@>=0.4.0 <0.4.11": + version "0.4.10" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4" + integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q= + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -4877,7 +6204,7 @@ i18n@^0.8.3: mustache "*" sprintf-js ">=1.0.3" -iconv-lite@0.4.24, iconv-lite@^0.4.11, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.11, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4963,7 +6290,7 @@ image-size@~0.5.0: commander "^2.13.0" glob "^7.1.2" q "^2.0.3" - request "^2.83.0" + request "^2.88.0" import-fresh@^2.0.0: version "2.0.0" @@ -5012,7 +6339,7 @@ indexof@0.0.1: resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= -inflection@^1.6.0: +inflection@1.12.0: version "1.12.0" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= @@ -5025,11 +6352,6 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" - integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js= - inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -5040,7 +6362,7 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -5064,7 +6386,7 @@ inquirer@^6.2.2: strip-ansi "^5.1.0" through "^2.3.6" -interpret@^1.0.0, interpret@^1.1.0: +interpret@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== @@ -5076,11 +6398,6 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -5123,6 +6440,24 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-alphabetical@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz#eb04cc47219a8895d8450ace4715abff2258a1f8" + integrity sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA== + +is-alphanumeric@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4" + integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ= + +is-alphanumerical@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz#57ae21c374277b3defe0274c640a5704b8f6657c" + integrity sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -5140,11 +6475,21 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.1.5: +is-bluebird@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" + integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= + +is-buffer@^1.1.4, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-buffer@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== + is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" @@ -5181,6 +6526,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= +is-decimal@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz#381068759b9dc807d8c0dc0bfbae2b68e1da48b7" + integrity sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -5257,6 +6607,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -5278,6 +6633,16 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" +is-hexadecimal@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee" + integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA== + +is-negated-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" + integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI= + is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -5302,6 +6667,11 @@ is-obj@^1.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -5324,6 +6694,11 @@ is-promise@^2.1, is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= +is-property@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= + is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -5331,6 +6706,11 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + is-relative@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" @@ -5343,6 +6723,13 @@ is-resolvable@^1.0.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== +is-ssh@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" + integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== + dependencies: + protocols "^1.1.0" + is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -5374,21 +6761,31 @@ is-unc-path@^1.0.0: dependencies: unc-path-regex "^0.1.2" -is-utf8@^0.2.0: +is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= -is-windows@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" - integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw= +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= + +is-whitespace-character@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac" + integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ== is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +is-word-character@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz#264d15541cbad0ba833d3992c34e6b40873b08aa" + integrity sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A== + is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" @@ -5451,7 +6848,7 @@ jquery@^3.4.1: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== -js-beautify@^1.6.11: +js-beautify@^1.8.8: version "1.10.0" resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.0.tgz#9753a13c858d96828658cd18ae3ca0e5783ea672" integrity sha512-OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q== @@ -5467,6 +6864,11 @@ js-cookie@^2.1.3: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb" integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s= +js-levenshtein@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" + integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== + "js-sequence-diagrams@git+https://github.com/codimd/js-sequence-diagrams.git": version "2.0.1" resolved "git+https://github.com/codimd/js-sequence-diagrams.git#b9afa038521e5dadf9b97624a3c7db21890be669" @@ -5492,7 +6894,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1: +js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -5514,7 +6916,7 @@ jsdom-nogyp@^0.8.3: cssstyle "~0.2.3" htmlparser2 ">= 3.1.5 <4" nwmatcher "~1.3.1" - request "2.x" + request "^2.88.0" xmlhttprequest ">=1.5.0" jsdom@^11.9.0: @@ -5536,7 +6938,7 @@ jsdom@^11.9.0: nwsapi "^2.0.7" parse5 "4.0.0" pn "^1.1.0" - request "^2.87.0" + request "^2.88.0" request-promise-native "^1.0.5" sax "^1.2.4" symbol-tree "^3.2.2" @@ -5554,6 +6956,11 @@ jsesc@^1.3.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" @@ -5608,6 +7015,13 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" + integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== + dependencies: + minimist "^1.2.0" + jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -5630,6 +7044,11 @@ jsonlint@^1.6.2: JSV "^4.0.x" nomnom "^1.5.x" +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + jsonparse@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd" @@ -5713,13 +7132,6 @@ lazystream@^1.0.0: dependencies: readable-stream "^2.0.5" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -5762,6 +7174,13 @@ ldapjs@^1.0.2: optionalDependencies: dtrace-provider "~0.8" +lead@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" + integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI= + dependencies: + flush-write-stream "^1.0.2" + left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -5787,7 +7206,7 @@ less@^2.7.1: mime "^1.2.11" mkdirp "^0.5.0" promise "^7.1.1" - request "^2.81.0" + request "^2.88.0" source-map "^0.5.3" levn@^0.3.0, levn@~0.3.0: @@ -5798,20 +7217,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -liftoff@^2.1.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" - integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew= - dependencies: - extend "^3.0.0" - findup-sync "^2.0.0" - fined "^1.0.1" - flagged-respawn "^1.0.0" - is-plain-object "^2.0.4" - object.map "^1.0.0" - rechoir "^0.6.2" - resolve "^1.1.7" - linkify-it@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz#c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db" @@ -5826,6 +7231,11 @@ list.js@^1.5.0: dependencies: string-natural-compare "^2.0.2" +livereload-js@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c" + integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw== + load-json-file@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" @@ -5836,6 +7246,16 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + loader-runner@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -5876,51 +7296,6 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= - -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U= - -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc= - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= - -lodash._reescape@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" - integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo= - -lodash._reevaluate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" - integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0= - -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - -lodash._root@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= - lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -5936,13 +7311,6 @@ lodash.defaults@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg= - dependencies: - lodash._root "^3.0.0" - lodash.filter@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" @@ -5958,25 +7326,6 @@ lodash.foreach@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.map@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -6007,11 +7356,6 @@ lodash.reject@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -6022,43 +7366,20 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.template@^3.0.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8= - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU= - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0: +lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== -lodash@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" - integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE= +lodash@^4.17.10, lodash@^4.17.13: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== logform@^2.1.1: version "2.1.2" @@ -6071,6 +7392,16 @@ logform@^2.1.1: ms "^2.1.1" triple-beam "^1.3.0" +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +longest-streak@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105" + integrity sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw== + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -6088,7 +7419,7 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.5: +lru-cache@^4.1.1, lru-cache@^4.1.3, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -6144,13 +7475,6 @@ make-dir@^2.0.0: pify "^4.0.1" semver "^5.6.0" -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - make-plural@^3.0.3, make-plural@~3.0.3: version "3.0.6" resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-3.0.6.tgz#2033a03bac290b8f3bb91258f65b9df7e8b01ca7" @@ -6175,6 +7499,11 @@ map-cache@^0.2.0, map-cache@^0.2.2: resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= +map-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" + integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg= + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -6182,6 +7511,11 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +markdown-escapes@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5" + integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw== + markdown-it-abbr@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz#d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8" @@ -6268,10 +7602,15 @@ markdown-pdf@^9.0.0: through2 "^2.0.0" tmp "0.0.33" -marked@~0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a" - integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA== +markdown-table@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60" + integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q== + +marked@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" + integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== math-interval-parser@^1.1.0: version "1.1.0" @@ -6314,6 +7653,59 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdast-util-compact@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz#98a25cc8a7865761a41477b3a87d1dcef0b1e79d" + integrity sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w== + dependencies: + unist-util-visit "^1.1.0" + +mdast-util-definitions@^1.2.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz#2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7" + integrity sha512-HfUArPog1j4Z78Xlzy9Q4aHLnrF/7fb57cooTHypyGoe2XFNbcx/kWZDoOz+ra8CkUzvg3+VHV434yqEd1DRmA== + dependencies: + unist-util-visit "^1.0.0" + +mdast-util-inject@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz#db06b8b585be959a2dcd2f87f472ba9b756f3675" + integrity sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU= + dependencies: + mdast-util-to-string "^1.0.0" + +mdast-util-to-hast@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz#132001b266031192348d3366a6b011f28e54dc40" + integrity sha512-/eIbly2YmyVgpJNo+bFLLMCI1XgolO/Ffowhf+pHDq3X4/V6FntC9sGQCDLM147eTS+uSXv5dRzJyFn+o0tazA== + dependencies: + collapse-white-space "^1.0.0" + detab "^2.0.0" + mdast-util-definitions "^1.2.0" + mdurl "^1.0.1" + trim "0.0.1" + trim-lines "^1.0.0" + unist-builder "^1.0.1" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^1.1.0" + xtend "^4.0.1" + +mdast-util-to-string@^1.0.0, mdast-util-to-string@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz#7d85421021343b33de1552fc71cb8e5b4ae7536d" + integrity sha512-868pp48gUPmZIhfKrLbaDneuzGiw3OTDjHc5M1kAepR2CWBJ+HpEsm252K4aXdiP5coVZaJPOqGtVU6Po8xnXg== + +mdast-util-toc@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz#395eeb877f067f9d2165d990d77c7eea6f740934" + integrity sha512-Za0hqL1PqWrvxGtA/3NH9D5nhGAUS9grMM4obEAz5+zsk1RIw/vWUchkaoDLNdrwk05A0CSC5eEXng36/1qE5w== + dependencies: + github-slugger "^1.2.1" + mdast-util-to-string "^1.0.5" + unist-util-is "^2.1.2" + unist-util-visit "^1.1.0" + mdn-data@~1.1.0: version "1.1.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" @@ -6329,13 +7721,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -6345,7 +7730,7 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" -memoizee@^0.4.3: +memoizee@^0.4.14: version "0.4.14" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57" integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg== @@ -6372,17 +7757,23 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= -mermaid@~7.1.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-7.1.2.tgz#6265728156c2e0891e004cba60a44022174487ad" - integrity sha512-bDLu3fQuf3/R0fNkNzB0GTaF7+6SxnZpfTs9DVQF1ougsuP23MBzvEIGfL0ML8zeyg7+J2D+0AaoLVhskW5ulw== +mermaid@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.3.tgz#609bad45bedc3ee1a935161c11c3c22689cfecd9" + integrity sha512-G2p9BAAEeTtogPs4YXM8KyX+TsZULlgk0tGvmBPfBZ5j3YCPxgAxG9ZzleiYNItF7M1hGkE485BDLN8DbfR+/Q== dependencies: - d3 "3.5.17" - dagre-d3-renderer "^0.4.25" - dagre-layout "^0.8.0" - he "^1.1.1" - lodash "^4.17.4" - moment "^2.20.1" + "@braintree/sanitize-url" "^3.1.0" + d3 "^5.7.0" + dagre-d3-renderer "^0.5.8" + dagre-layout "^0.8.8" + documentation "^12.0.1" + graphlibrary "^2.2.0" + gulp-print "^5.0.2" + he "^1.2.0" + lodash "^4.17.11" + minify "^4.1.1" + moment-mini "^2.22.1" + scope-css "^1.2.1" messageformat@^0.3.1: version "0.3.1" @@ -6395,12 +7786,12 @@ messageformat@^0.3.1: nopt "~3.0.6" watchr "~2.4.13" -"meta-marked@git+https://github.com/codimd/meta-marked#semver:^0.4.2": - version "0.4.4" - resolved "git+https://github.com/codimd/meta-marked#04fd9775b38566e41b71e3e63bd78717d3eb4445" +"meta-marked@git+https://github.com/codimd/meta-marked#semver:^0.4.5": + version "0.4.5" + resolved "git+https://github.com/codimd/meta-marked#30852d0efa633418865df179f5956cd3df0fd0b3" dependencies: js-yaml "~3.13.1" - marked "~0.6.2" + marked "~0.7.0" method-override@^2.3.7: version "2.3.10" @@ -6417,7 +7808,7 @@ methods@~1.1.1, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@^2.1.5: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= @@ -6436,7 +7827,7 @@ micromatch@^2.1.5, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -6490,6 +7881,11 @@ mime@^2.0.3: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe" integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw== +mime@^2.2.0: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -6509,6 +7905,19 @@ mini-css-extract-plugin@^0.4.1: schema-utils "^1.0.0" webpack-sources "^1.1.0" +minify@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/minify/-/minify-4.1.3.tgz#58467922d14303f55a3a28fa79641371955b8fbd" + integrity sha512-ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA== + dependencies: + clean-css "^4.1.6" + css-b64-images "~0.2.5" + debug "^4.1.0" + html-minifier "^4.0.0" + terser "^4.0.0" + try-catch "^2.0.0" + try-to-catch "^1.0.2" + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -6519,7 +7928,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -6636,7 +8045,7 @@ mocha@^5.2.0: glob "7.1.2" growl "1.10.5" he "1.1.1" - minimatch "^3.0.4" + minimatch "3.0.4" mkdirp "0.5.1" supports-color "5.4.0" @@ -6648,14 +8057,39 @@ mock-require@^3.0.3: get-caller-file "^1.0.2" normalize-path "^2.1.1" -moment-timezone@^0.5.4: +module-deps-sortable@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz#99db5bb08f7eab55e4c31f6b7c722c6a2144ba74" + integrity sha512-bnGGeghQmz/t/6771/KC4FmxpVm126iR6AAzzq4N6hVZQVl4+ZZBv+VF3PJmDyxXtVtgcgTSSP7NL+jq1QAHrg== + dependencies: + JSONStream "^1.0.3" + browser-resolve "^1.7.0" + cached-path-relative "^1.0.0" + concat-stream "~1.5.0" + defined "^1.0.0" + detective "^4.0.0" + duplexer2 "^0.1.2" + inherits "^2.0.1" + readable-stream "^2.0.2" + resolve "^1.1.3" + stream-combiner2 "^1.1.1" + subarg "^1.0.0" + through2 "^2.0.0" + xtend "^4.0.0" + +moment-mini@^2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz#bc32d73e43a4505070be6b53494b17623183420d" + integrity sha512-OUCkHOz7ehtNMYuZjNciXUfwTuz8vmF1MTbAy59ebf+ZBYZO5/tZKuChVWCX+uDo+4idJBpGltNfV8st+HwsGw== + +moment-timezone@^0.5.21: version "0.5.25" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz#a11bfa2f74e088327f2cd4c08b3e7bdf55957810" integrity sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw== dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.10.6, moment@^2.13.0, moment@^2.16.0, moment@^2.17.1, moment@^2.20.1: +"moment@>= 2.9.0", moment@^2.10.6, moment@^2.17.1, moment@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== @@ -6693,13 +8127,6 @@ ms@2.1.1, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -multipipe@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" - integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s= - dependencies: - duplexer2 "0.0.2" - mustache@*: version "3.0.1" resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a" @@ -6719,15 +8146,26 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -mysql@^2.12.0: - version "2.17.1" - resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.17.1.tgz#62bba4a039a9b2f73638cd1652ce50fc6f682899" - integrity sha512-7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA== +mysql2@^1.6.5: + version "1.6.5" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.5.tgz#6695304fa2ce793dda5c98e8bbec65cbd2e6cb9d" + integrity sha512-zedaOOyb3msuuZcJJnxIX/EGOpmljDG7B+UevRH5lqcv+yhy9eCwkArBz8/AO+/rlY3/oCsOdG8R5oD6k0hNfg== dependencies: - bignumber.js "7.2.1" - readable-stream "2.3.6" - safe-buffer "5.1.2" - sqlstring "2.3.1" + denque "^1.4.0" + generate-function "^2.3.1" + iconv-lite "^0.4.24" + long "^4.0.0" + lru-cache "^4.1.3" + named-placeholders "^1.1.2" + seq-queue "^0.0.5" + sqlstring "^2.3.1" + +named-placeholders@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8" + integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA== + dependencies: + lru-cache "^4.1.3" nan@^2.10.0, nan@^2.12.1: version "2.14.0" @@ -6751,11 +8189,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -natives@^1.1.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" - integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -6885,6 +8318,13 @@ node-releases@^1.1.21: dependencies: semver "^5.3.0" +node-releases@^1.1.25: + version "1.1.26" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz#f30563edc5c7dc20cf524cc8652ffa7be0762937" + integrity sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ== + dependencies: + semver "^5.3.0" + node-static@0.7.11: version "0.7.11" resolved "https://registry.yarnpkg.com/node-static/-/node-static-0.7.11.tgz#60120d349f3cef533e4e820670057eb631882e7f" @@ -6939,11 +8379,28 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +normalize-url@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + normalize-url@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +now-and-later@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" + integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ== + dependencies: + once "^1.3.2" + npm-bundled@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" @@ -7011,11 +8468,6 @@ object-assign@4.1.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A= -object-assign@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= - object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -7035,7 +8487,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.12: +object-keys@^1.0.11, object-keys@^1.0.12: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -7047,15 +8499,15 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= +object.assign@^4.0.4, object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" object.getownpropertydescriptors@^2.0.3: version "2.0.3" @@ -7065,14 +8517,6 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.2" es-abstract "^1.5.1" -object.map@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -7081,7 +8525,7 @@ object.omit@^2.0.0: for-own "^0.1.4" is-extendable "^0.1.1" -object.pick@^1.2.0, object.pick@^1.3.0: +object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= @@ -7110,20 +8554,13 @@ on-headers@~1.0.1, on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" -once@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA= - dependencies: - wrappy "1" - one-time@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" @@ -7141,7 +8578,7 @@ openid@2.x.x: resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz#707375e59ab9f73025899727679b20328171c9aa" integrity sha1-cHN15Zq59zAliZcnZ5sgMoFxyao= dependencies: - request "^2.61.0" + request "^2.88.0" optimist@>=0.3.4, optimist@^0.6.1: version "0.6.1" @@ -7171,19 +8608,12 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -orchestrator@^0.3.0: - version "0.3.8" - resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" - integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4= +ordered-read-streams@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" + integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4= dependencies: - end-of-stream "~0.1.5" - sequencify "~0.0.7" - stream-consume "~0.1.0" - -ordered-read-streams@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" - integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY= + readable-stream "^2.0.1" os-browserify@^0.3.0: version "0.3.0" @@ -7195,16 +8625,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - -os-locale@^3.0.0: +os-locale@^3.0.0, os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== @@ -7307,7 +8728,7 @@ parallel-transform@^1.1.0: inherits "^2.0.3" readable-stream "^2.1.5" -param-case@2.1.x: +param-case@2.1.x, param-case@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= @@ -7333,7 +8754,19 @@ parse-asn1@^5.0.0: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" -parse-filepath@^1.0.1: +parse-entities@^1.0.2, parse-entities@^1.1.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50" + integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + +parse-filepath@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= @@ -7377,6 +8810,24 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= +parse-path@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz#a48b7b529da41f34d9d1428602a39b29fc7180e4" + integrity sha512-wP70vtwv2DyrM2YoA7ZHVv4zIXa4P7dGgHlj+VwyXNDduLLVJ7NMY1zsFxjUUJ3DAwJLupGb1H5gMDDiNlJaxw== + dependencies: + is-ssh "^1.3.0" + protocols "^1.4.0" + +parse-url@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz#602787a7063a795d72b8673197505e72f60610be" + integrity sha1-YCeHpwY6eV1yuGcxl1BecvYGEL4= + dependencies: + is-ssh "^1.3.0" + normalize-url "^1.9.1" + parse-path "^3.0.1" + protocols "^1.4.0" + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -7694,7 +9145,7 @@ phantomjs-prebuilt@^2.1.12, phantomjs-prebuilt@^2.1.3: hasha "^2.2.0" kew "^0.7.0" progress "^1.1.8" - request "^2.81.0" + request "^2.88.0" request-progress "^2.0.1" which "^1.2.10" @@ -7708,7 +9159,7 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pify@^4.0.1: +pify@^4.0.0, pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== @@ -8116,6 +9567,11 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prepend-http@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" @@ -8129,11 +9585,6 @@ pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-hrtime@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= - prismjs@^1.6.0: version "1.16.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308" @@ -8146,6 +9597,11 @@ private@^0.1.6, private@^0.1.8: resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== +process-nextick-args@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -8183,11 +9639,23 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +property-information@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz#f0e66e07cbd6fed31d96844d958d153ad3eb486e" + integrity sha512-TlgDPagHh+eBKOnH2VYvk8qbwsCG/TAJdmTL7f1PROUcSO8qt/KSmShEQ/OKvock8X9tFjtqjCScyOkkkvIKVQ== + dependencies: + xtend "^4.0.1" + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= +protocols@^1.1.0, protocols@^1.4.0: + version "1.4.7" + resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" + integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== + proxy-addr@~2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" @@ -8239,7 +9707,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3: +pumpify@^1.3.3, pumpify@^1.3.5: version "1.5.1" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== @@ -8282,7 +9750,7 @@ qs@2.3.3: resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404" integrity sha1-6eha2+ddoLvkyOBHaghikPhjtAQ= -qs@6.7.0: +qs@6.7.0, qs@^6.4.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== @@ -8292,6 +9760,14 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -8371,6 +9847,14 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@~1.1.0: + version "1.1.7" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425" + integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU= + dependencies: + bytes "1" + string_decoder "0.10" + raw-loader@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" @@ -8394,6 +9878,14 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" + integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== + dependencies: + find-up "^3.0.0" + read-pkg "^3.0.0" + read-pkg@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" @@ -8403,7 +9895,16 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -8445,21 +9946,24 @@ readable-stream@^3.1.1: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= +readable-stream@~2.0.0: + version "2.0.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= dependencies: core-util-is "~1.0.0" inherits "~2.0.1" - isarray "0.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" string_decoder "~0.10.x" + util-deprecate "~1.0.1" -readable-stream@~2.0.0: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= +readable-stream@~2.1.0: + version "2.1.5" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" + integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= dependencies: + buffer-shims "^1.0.0" core-util-is "~1.0.0" inherits "~2.0.1" isarray "~1.0.0" @@ -8481,18 +9985,6 @@ readline-sync@^1.4.7: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda" integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No= -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= - dependencies: - resolve "^1.1.6" - -redefine@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/redefine/-/redefine-0.2.1.tgz#e89ee7a6f24d19fff62590569332dc60380a89a3" - integrity sha1-6J7npvJNGf/2JZBWkzLcYDgKiaM= - reduce-component@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/reduce-component/-/reduce-component-1.0.1.tgz#e0c93542c574521bea13df0f9488ed82ab77c5da" @@ -8534,6 +10026,13 @@ regenerator-transform@^0.10.0: babel-types "^6.19.0" private "^0.1.6" +regenerator-transform@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" + integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ== + dependencies: + private "^0.1.6" + regex-cache@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" @@ -8549,6 +10048,11 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp-tree@^0.1.6: + version "0.1.11" + resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3" + integrity sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg== + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -8608,11 +10112,95 @@ regjsparser@^0.6.0: dependencies: jsesc "~0.5.0" -relateurl@0.2.x: +relateurl@0.2.x, relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= +remark-html@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz#9fcb859a6f3cb40f3ef15402950f1a62ec301b3a" + integrity sha512-3V2391GL3hxKhrkzYOyfPpxJ6taIKLCfuLVqumeWQOk3H9nTtSQ8St8kMYkBVIEAquXN1chT83qJ/2lAW+dpEg== + dependencies: + hast-util-sanitize "^1.0.0" + hast-util-to-html "^4.0.0" + mdast-util-to-hast "^3.0.0" + xtend "^4.0.1" + +remark-parse@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95" + integrity sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA== + dependencies: + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^1.1.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^1.0.0" + vfile-location "^2.0.0" + xtend "^4.0.1" + +remark-reference-links@^4.0.1: + version "4.0.4" + resolved "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz#190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab" + integrity sha512-+2X8hwSQqxG4tvjYZNrTcEC+bXp8shQvwRGG6J/rnFTvBoU4G0BBviZoqKGZizLh/DG+0gSYhiDDWCqyxXW1iQ== + dependencies: + unist-util-visit "^1.0.0" + +remark-slug@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz#715ecdef8df1226786204b1887d31ab16aa24609" + integrity sha512-DWX+Kd9iKycqyD+/B+gEFO3jjnt7Yg1O05lygYSNTe5i5PIxxxPjp5qPBDxPIzp5wreF7+1ROCwRgjEcqmzr3A== + dependencies: + github-slugger "^1.0.0" + mdast-util-to-string "^1.0.0" + unist-util-visit "^1.0.0" + +remark-stringify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba" + integrity sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w== + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^1.1.0" + mdast-util-compact "^1.0.0" + parse-entities "^1.0.2" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^1.0.1" + unherit "^1.0.4" + xtend "^4.0.1" + +remark-toc@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz#8c229d6f834cdb43fde6685e2d43248d3fc82d78" + integrity sha512-vCPW4YOsm2CfyuScdktM9KDnJXVHJsd/ZeRtst+dnBU3B3KKvt8bc+bs5syJjyptAHfqo7H+5Uhz+2blWBfwow== + dependencies: + mdast-util-toc "^3.0.0" + remark-slug "^5.0.0" + +remark@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60" + integrity sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A== + dependencies: + remark-parse "^5.0.0" + remark-stringify "^5.0.0" + unified "^6.0.0" + remarkable@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.1.tgz#aaca4972100b66a642a63a1021ca4bac1be3bff6" @@ -8621,6 +10209,23 @@ remarkable@^1.7.1: argparse "~0.1.15" autolinker "~0.15.0" +remove-bom-buffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" + integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ== + dependencies: + is-buffer "^1.1.5" + is-utf8 "^0.2.1" + +remove-bom-stream@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" + integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM= + dependencies: + remove-bom-buffer "^3.0.0" + safe-buffer "^5.1.0" + through2 "^2.0.3" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -8642,7 +10247,7 @@ repeat-element@^1.1.2: resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.5.0, repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -8654,10 +10259,10 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= +replace-ext@1.0.0, replace-ext@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" + integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= request-progress@^2.0.1: version "2.0.1" @@ -8682,7 +10287,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@2.x, request@^2.61.0, request@^2.81.0, request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0: +request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -8718,6 +10323,11 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + require-relative@0.8.7: version "0.8.7" resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" @@ -8730,14 +10340,6 @@ resolve-cwd@^2.0.0: dependencies: resolve-from "^3.0.0" -resolve-dir@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" - integrity sha1-shklmlYC+sXFxJatiUpujMQwJh4= - dependencies: - expand-tilde "^1.2.2" - global-modules "^0.2.3" - resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" @@ -8756,12 +10358,31 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-options@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" + integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE= + dependencies: + value-or-function "^3.0.0" + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.0.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1: +resolve@1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= + +resolve@^1.1.3, resolve@^1.3.2: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + +resolve@^1.10.0, resolve@^1.11.0, resolve@^1.5.0, resolve@^1.8.1: version "1.11.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== @@ -8781,13 +10402,12 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry-as-promised@^2.0.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-2.3.2.tgz#cd974ee4fd9b5fe03cbf31871ee48221c07737b7" - integrity sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c= +retry-as-promised@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543" + integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== dependencies: - bluebird "^3.4.6" - debug "^2.6.9" + any-promise "^1.3.0" reveal.js@~3.7.0: version "3.7.0" @@ -8880,6 +10500,11 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" +rw@1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" + integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= + rxjs@^6.4.0: version "6.5.2" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7" @@ -8892,6 +10517,16 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@>=5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +safe-json-parse@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" + integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c= + safe-json-stringify@~1: version "1.2.0" resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" @@ -8957,6 +10592,15 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +scope-css@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz#c35768bc900cad030a3e0d663a818c0f6a57f40e" + integrity sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q== + dependencies: + escaper "^2.5.3" + slugify "^1.3.1" + strip-css-comments "^3.0.0" + script-loader@^0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7" @@ -8984,7 +10628,7 @@ select@^1.1.2: resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== @@ -8994,10 +10638,10 @@ semver@4.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= -semver@^4.1.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= +semver@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" + integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ== send@0.17.1: version "0.17.1" @@ -9018,50 +10662,50 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -sequelize-cli@^2.5.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-2.8.0.tgz#4304cce60e499169603f838dedbab421c9849e74" - integrity sha1-QwTM5g5JkWlgP4ON7bq0IcmEnnQ= +seq-queue@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" + integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= + +sequelize-cli@^5.4.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.0.tgz#b0570352f70eaa489a25dccf55cf316675d6ff06" + integrity sha512-twVQ02alCpr2XvxNmpi32C48WZs6xHTH1OFTfTS5Meg3BVqOM8ghiZoml4FITFjlD8sAJSQjlAHTwqTbuolA6Q== + dependencies: + bluebird "^3.5.3" + cli-color "^1.4.0" + fs-extra "^7.0.1" + js-beautify "^1.8.8" + lodash "^4.17.5" + resolve "^1.5.0" + umzug "^2.1.0" + yargs "^13.1.0" + +sequelize-pool@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.2.0.tgz#fd4eb05ccefb5df5c23d2cc6fd934c20fd9c5dab" + integrity sha512-N/cYyxNHShfANGXAhHtMExjWNr+eYCS4/pF5fs5fvPYxn1VgUhEX8kDmVV5bNS0gZwt55fjU9Sgg48k3Dy/uMg== + +sequelize@^5.8.12: + version "5.8.12" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.8.12.tgz#91f46f16789307d40c68f8c039c10d1d0f230ad2" + integrity sha512-TtgGgQx/+Nub/IdkV7hqEoozUnOYv28waB/l44fMk37Rr+4G3Inrn9opDb/g81zSuRUKsYGOucdWq0qLH+7ujA== dependencies: bluebird "^3.5.0" - cli-color "~1.2.0" - findup-sync "^1.0.0" - fs-extra "^4.0.1" - gulp "^3.9.1" - gulp-help "~1.6.1" - js-beautify "^1.6.11" - lodash "^4.17.4" - moment "^2.17.1" - resolve "^1.3.3" - umzug "^1.12.0" - yargs "^8.0.1" - -sequelize@^3.28.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-3.34.0.tgz#edbceb53dd7c9e5a0fd6b35fb89565239e8f09e4" - integrity sha512-smJMYZ+JniYZ2Ja4GPaEC0/mkvCNnRl7mM958hZQP9dpXNbSS/wPFUNrn0mnfpWRk8Ob/3zo0H1qxQbXKgcIzw== - dependencies: - bluebird "^3.3.4" - depd "^1.1.0" - dottie "^1.0.0" - generic-pool "2.4.2" - inflection "^1.6.0" - lodash "^4.17.10" - moment "^2.13.0" - moment-timezone "^0.5.4" - retry-as-promised "^2.0.0" - semver "^5.0.1" - shimmer "1.1.0" - terraformer-wkt-parser "^1.1.0" + cls-bluebird "^2.1.0" + debug "^4.1.1" + dottie "^2.0.0" + inflection "1.12.0" + lodash "^4.17.11" + moment "^2.24.0" + moment-timezone "^0.5.21" + retry-as-promised "^3.1.0" + semver "^6.1.1" + sequelize-pool "^2.2.0" toposort-class "^1.0.1" - uuid "^3.0.0" - validator "^5.2.0" - wkx "0.2.0" - -sequencify@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" - integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw= + uuid "^3.2.1" + validator "^10.11.0" + wkx "^0.4.6" serialize-javascript@^1.4.0, serialize-javascript@^1.7.0: version "1.7.0" @@ -9138,10 +10782,10 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= -shimmer@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.1.0.tgz#97d7377137ffbbab425522e429fe0aa89a488b35" - integrity sha1-l9c3cTf/u6tCVSLkKf4KqJpIizU= +shimmer@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" + integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== shortid@2.2.8: version "2.2.8" @@ -9179,6 +10823,11 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slugify@^1.3.1: + version "1.3.4" + resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz#78d2792d7222b55cd9fc81fa018df99af779efeb" + integrity sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw== + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -9262,6 +10911,13 @@ socket.io@~2.1.1: socket.io-client "2.1.1" socket.io-parser "~3.2.0" +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -9303,7 +10959,7 @@ source-map@0.5.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz#0fe96503ac86a5adb5de63f4e412ae4872cdbe86" integrity sha1-D+llA6yGpa213mP05BKuSHLNvoY= -source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -9318,10 +10974,10 @@ sourcemap-codec@^1.4.4: resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== -sparkles@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" - integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== +space-separated-tokens@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz#27910835ae00d0adfcdbd0ad7e611fb9544351fa" + integrity sha512-UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA== spdx-correct@^3.0.0: version "3.1.0" @@ -9390,9 +11046,9 @@ sqlite3@^4.0.7: dependencies: nan "^2.12.1" node-pre-gyp "^0.11.0" - request "^2.87.0" + request "^2.88.0" -sqlstring@2.3.1: +sqlstring@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= @@ -9436,6 +11092,11 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= +state-toggle@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc" + integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw== + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -9459,6 +11120,13 @@ store@^2.0.12: resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593" integrity sha1-jFNOKguDH3K3X8XxEZhXxE711ZM= +stream-array@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz#9e5f7345f2137c30ee3b498b9114e80b52bb7eb5" + integrity sha1-nl9zRfITfDDuO0mLkRToC1K7frU= + dependencies: + readable-stream "~2.1.0" + stream-browserify@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" @@ -9467,10 +11135,13 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-consume@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48" - integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg== +stream-combiner2@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" + integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= + dependencies: + duplexer2 "~0.1.0" + readable-stream "^2.0.2" stream-each@^1.1.0: version "1.2.3" @@ -9506,6 +11177,11 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + string-loader@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/string-loader/-/string-loader-0.0.1.tgz#496f3cccc990213e0dd5411499f9ac6a6a6f2ff8" @@ -9516,6 +11192,11 @@ string-natural-compare@^2.0.2: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-2.0.3.tgz#9dbe1dd65490a5fe14f7a5c9bc686fc67cb9c6e4" integrity sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ== +string-template@~0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" + integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -9533,7 +11214,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0: +string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== @@ -9542,11 +11223,25 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" +string-width@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff" + integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^5.2.0" + string@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz#5ea211cd92d228e184294990a6cc97b366a77cb0" integrity sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA= +string_decoder@0.10, string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" @@ -9554,11 +11249,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.1.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -9566,6 +11256,16 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-entities@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz#a98417e5471fd227b3e45d3db1861c11caf668f7" + integrity sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A== + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + is-alphanumerical "^1.0.0" + is-hexadecimal "^1.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -9580,7 +11280,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.1.0: +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== @@ -9592,19 +11292,18 @@ strip-ansi@~0.1.0: resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE= -strip-bom@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" - integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q= - dependencies: - first-chunk-stream "^1.0.0" - is-utf8 "^0.2.0" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= +strip-css-comments@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89" + integrity sha1-elYl7/iisibPiUehElTaluE9rok= + dependencies: + is-regexp "^1.0.0" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -9632,6 +11331,13 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +subarg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI= + dependencies: + minimist "^1.1.0" + superagent@1.8.3: version "1.8.3" resolved "https://registry.yarnpkg.com/superagent/-/superagent-1.8.3.tgz#2b7d70fcc870eda4f2a61e619dd54009b86547c3" @@ -9668,7 +11374,7 @@ supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: +supports-color@^6.0.0, supports-color@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== @@ -9762,21 +11468,6 @@ tedious@^1.14.0: readable-stream "^2.0.2" sprintf "0.1.5" -terraformer-wkt-parser@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz#c9d6ac3dff25f4c0bd344e961f42694961834c34" - integrity sha512-QU3iA54St5lF8Za1jg1oj4NYc8sn5tCZ08aNSWDeGzrsaV48eZk1iAVWasxhNspYBoCqdHuoot1pUTUrE1AJ4w== - dependencies: - "@types/geojson" "^1.0.0" - terraformer "~1.0.5" - -terraformer@~1.0.5: - version "1.0.9" - resolved "https://registry.yarnpkg.com/terraformer/-/terraformer-1.0.9.tgz#77851fef4a49c90b345dc53cf26809fdf29dcda6" - integrity sha512-YlmQ1fsMWTkKGDGibCRWgmLzrpDRUr63Q025LJ/taYQ6j1Yb8q9McKF7NBi6ACAyUXO6F/bl9w6v4MY307y5Ag== - optionalDependencies: - "@types/geojson" "^1.0.0" - terser-webpack-plugin@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4" @@ -9817,7 +11508,15 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= -through2@^0.6.1, through2@^0.6.5: +through2-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" + integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + +through2@^0.6.5: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= @@ -9825,7 +11524,7 @@ through2@^0.6.1, through2@^0.6.5: readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" -through2@^2.0.0: +through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -9833,18 +11532,11 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, through@^2.3.6: +through@2, "through@>=2.2.7 <3", through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -tildify@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo= - dependencies: - os-homedir "^1.0.0" - time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" @@ -9857,7 +11549,7 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -timers-ext@0.1, timers-ext@^0.1.5: +timers-ext@^0.1.5: version "0.1.7" resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ== @@ -9875,6 +11567,18 @@ tiny-emitter@^2.0.0: resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== +tiny-lr@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab" + integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA== + dependencies: + body "^5.1.0" + debug "^3.1.0" + faye-websocket "~0.10.0" + livereload-js "^2.3.0" + object-assign "^4.1.0" + qs "^6.4.0" + tmp@0.0.29: version "0.0.29" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" @@ -9889,6 +11593,14 @@ tmp@0.0.33, tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +to-absolute-glob@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" + integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs= + dependencies: + is-absolute "^1.0.0" + is-negated-glob "^1.0.0" + to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" @@ -9909,6 +11621,11 @@ to-fast-properties@^1.0.3: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -9934,6 +11651,13 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +to-through@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" + integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= + dependencies: + through2 "^2.0.3" + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" @@ -9964,16 +11688,46 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +trim-lines@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz#c8adbdbdae21bb5c2766240a661f693afe23e59b" + integrity sha512-3GOuyNeTqk3FAqc3jOJtw7FTjYl94XBR5aD9QnDbK/T4CA9sW/J0l9RoaRPE9wyPP7NF331qnHnvJFBJ+IDkmQ== + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +trim-trailing-lines@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a" + integrity sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q== + +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== +trough@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e" + integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q== + +try-catch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz#a491141d597f8b72b46757fe1c47059341a16aed" + integrity sha512-RPXpVjsbtWgymwGq5F/OWDFsjEzdvzwHFaMjWWW6f/p6+uk/N7YSKJHQfIfGqITfj8qH4cBqCLMnhKZBaKk7Kg== + +try-to-catch@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz#770162dd13b9a0e55da04db5b7f888956072038a" + integrity sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA== + tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" @@ -10035,7 +11789,7 @@ typechecker@~2.0.1: resolved "https://registry.yarnpkg.com/typechecker/-/typechecker-2.0.8.tgz#e83da84bb64c584ccb345838576c40b0337db82e" integrity sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4= -typedarray@^0.0.6: +typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= @@ -10079,6 +11833,14 @@ uglify-js@^3.0.21, uglify-js@^3.1.4: commander "~2.20.0" source-map "~0.6.1" +uglify-js@^3.5.1: + version "3.6.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" + integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg== + dependencies: + commander "~2.20.0" + source-map "~0.6.1" + uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" @@ -10115,16 +11877,13 @@ ultron@~1.1.0: resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== -umzug@^1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-1.12.0.tgz#a79c91f2862eee3130c6c347f2b90ad68a66e8b8" - integrity sha1-p5yR8oYu7jEwxsNH8rkK1opm6Lg= +umzug@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e" + integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw== dependencies: - bluebird "^3.4.1" - lodash "^4.17.0" - moment "^2.16.0" - redefine "^0.2.0" - resolve "^1.0.0" + babel-runtime "^6.23.0" + bluebird "^3.5.3" unc-path-regex@^0.1.2: version "0.1.2" @@ -10156,6 +11915,14 @@ underscore@~1.7.0: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209" integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk= +unherit@^1.0.4: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449" + integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w== + dependencies: + inherits "^2.0.1" + xtend "^4.0.1" + unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -10179,6 +11946,18 @@ unicode-property-aliases-ecmascript@^1.0.4: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== +unified@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba" + integrity sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-plain-obj "^1.1.0" + trough "^1.0.0" + vfile "^2.0.0" + x-is-string "^0.1.0" + union-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" @@ -10213,10 +11992,73 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" - integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs= +unique-stream@^2.0.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" + integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== + dependencies: + json-stable-stringify-without-jsonify "^1.0.1" + through2-filter "^3.0.0" + +unist-builder@^1.0.1, unist-builder@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz#e1808aed30bd72adc3607f25afecebef4dd59e17" + integrity sha512-v6xbUPP7ILrT15fHGrNyHc1Xda8H3xVhP7/HAIotHOhVPjH5dCXA097C3Rry1Q2O+HbOLCao4hfPB+EYEjHgVg== + dependencies: + object-assign "^4.1.0" + +unist-util-generated@^1.1.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz#2261c033d9fc23fae41872cdb7663746e972c1a7" + integrity sha512-SA7Sys3h3X4AlVnxHdvN/qYdr4R38HzihoEVY2Q2BZu8NHWDnw5OGcC/tXWjQfd4iG+M6qRFNIRGqJmp2ez4Ww== + +unist-util-is@^2.0.0, unist-util-is@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.3.tgz#459182db31f4742fceaea88d429693cbf0043d20" + integrity sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA== + +unist-util-is@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd" + integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== + +unist-util-position@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz#fff942b879538b242096c148153826664b1ca373" + integrity sha512-28EpCBYFvnMeq9y/4w6pbnFmCUfzlsc41NJui5c51hOFjBA1fejcwc+5W4z2+0ECVbScG3dURS3JTVqwenzqZw== + +unist-util-remove-position@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972" + integrity sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA== + dependencies: + unist-util-visit "^1.1.0" + +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6" + integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ== + +unist-util-stringify-position@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz#de2a2bc8d3febfa606652673a91455b6a36fb9f3" + integrity sha512-Zqlf6+FRI39Bah8Q6ZnNGrEHUhwJOkHde2MHVk96lLyftfJJckaPslKgzhVcviXj8KcE9UJM9F+a4JEiBUTYgA== + dependencies: + "@types/unist" "^2.0.2" + +unist-util-visit-parents@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9" + integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g== + dependencies: + unist-util-is "^3.0.0" + +unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3" + integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw== + dependencies: + unist-util-visit-parents "^2.0.0" universalify@^0.1.0: version "0.1.2" @@ -10342,7 +12184,7 @@ utils-merge@1.0.1, utils-merge@1.x.x: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@3.3.2, uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2: +uuid@3.3.2, uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== @@ -10352,7 +12194,7 @@ v8-compile-cache@^2.0.2: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== -v8flags@^2.0.2, v8flags@^2.1.1: +v8flags@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ= @@ -10367,21 +12209,21 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validator@^10.4.0: +validator@^10.11.0, validator@^10.4.0: version "10.11.0" resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== -validator@^5.2.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c" - integrity sha1-eoelgUa2laxIYHEUHAxJ1n2gXlw= - validator@~9.4.1: version "9.4.1" resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663" integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA== +value-or-function@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" + integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -10420,36 +12262,116 @@ verror@1.6.0: dependencies: extsprintf "1.2.0" -vinyl-fs@^0.3.0: - version "0.3.14" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" - integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY= +vfile-location@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz#c83eb02f8040228a8d2b3f10e485be3e3433e0a2" + integrity sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ== + +vfile-message@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1" + integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA== dependencies: - defaults "^1.0.0" - glob-stream "^3.1.5" - glob-watcher "^0.0.6" - graceful-fs "^3.0.0" - mkdirp "^0.5.0" - strip-bom "^1.0.0" - through2 "^0.6.1" - vinyl "^0.4.0" + unist-util-stringify-position "^1.1.1" -vinyl@^0.4.0: - version "0.4.6" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" - integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc= +vfile-message@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz#951881861c22fc1eb39f873c0b93e336a64e8f6d" + integrity sha512-KtasSV+uVU7RWhUn4Lw+wW1Zl/nW8JWx7JCPps10Y9JRRIDeDXf8wfBLoOSsJLyo27DqMyAi54C6Jf/d6Kr2Bw== dependencies: - clone "^0.2.0" - clone-stats "^0.0.1" + "@types/unist" "^2.0.2" + unist-util-stringify-position "^2.0.0" -vinyl@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" - integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4= +vfile-reporter@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz#753119f51dec9289b7508b457afc0cddf5e07f2e" + integrity sha512-8Is0XxFxWJUhPJdOg3CyZTqd3ICCWg6r304PuBl818ZG91h4FMS3Q+lrOPS+cs5/DZK3H0+AkJdH0J8JEwKtDA== + dependencies: + repeat-string "^1.5.0" + string-width "^4.0.0" + supports-color "^6.0.0" + unist-util-stringify-position "^2.0.0" + vfile-sort "^2.1.2" + vfile-statistics "^1.1.0" + +vfile-sort@^2.1.0, vfile-sort@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz#74e714f9175618cdae96bcaedf1a3dc711d87567" + integrity sha512-5dt7xEhC44h0uRQKhbM2JAe0z/naHphIZlMOygtMBM9Nn0pZdaX5fshhwWit9wvsuP8t/wp43nTDRRErO1WK8g== + +vfile-statistics@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz#e9c87071997fbcb4243764d2c3805e0bb0820c60" + integrity sha512-CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA== + +vfile@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a" + integrity sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w== + dependencies: + is-buffer "^1.1.4" + replace-ext "1.0.0" + unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" + +vfile@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz#fc3d43a1c71916034216bf65926d5ee3c64ed60c" + integrity sha512-lRHFCuC4SQBFr7Uq91oJDJxlnftoTLQ7eKIpMdubhYcVMho4781a8MWXLy3qZrZ0/STD1kRiKc0cQOHm4OkPeA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + replace-ext "1.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + +vinyl-fs@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" + integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== + dependencies: + fs-mkdirp-stream "^1.0.0" + glob-stream "^6.1.0" + graceful-fs "^4.0.0" + is-valid-glob "^1.0.0" + lazystream "^1.0.0" + lead "^1.0.0" + object.assign "^4.0.4" + pumpify "^1.3.5" + readable-stream "^2.3.3" + remove-bom-buffer "^3.0.0" + remove-bom-stream "^1.2.0" + resolve-options "^1.1.0" + through2 "^2.0.0" + to-through "^2.0.0" + value-or-function "^3.0.0" + vinyl "^2.0.0" + vinyl-sourcemap "^1.1.0" + +vinyl-sourcemap@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" + integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= + dependencies: + append-buffer "^1.0.2" + convert-source-map "^1.5.0" + graceful-fs "^4.1.6" + normalize-path "^2.1.1" + now-and-later "^2.0.0" + remove-bom-buffer "^3.0.0" + vinyl "^2.0.0" + +vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" + integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" visibilityjs@^1.2.4: version "1.2.8" @@ -10468,6 +12390,14 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +vue-template-compiler@^2.5.16: + version "2.6.10" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc" + integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg== + dependencies: + de-indent "^1.0.2" + he "^1.1.0" + w3c-hr-time@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" @@ -10590,6 +12520,20 @@ webpack@^4.14.0: watchpack "^1.5.0" webpack-sources "^1.3.0" +websocket-driver@>=0.5.1: + version "0.7.3" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9" + integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg== + dependencies: + http-parser-js ">=0.4.0 <0.4.11" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" + integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== + whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" @@ -10625,7 +12569,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9: +which@^1.2.10, which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -10667,10 +12611,12 @@ winston@^3.1.0: triple-beam "^1.3.0" winston-transport "^4.3.0" -wkx@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.2.0.tgz#76c24f16acd0cd8f93cd34aa331e0f7961256e84" - integrity sha1-dsJPFqzQzY+TzTSqMx4PeWElboQ= +wkx@^0.4.6: + version "0.4.7" + resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.7.tgz#ba0e4f9e785e95c9975856c1834f19a95c65cfb5" + integrity sha512-pHf546L96TK8RradLt1cWaIffstgv/zXZ14CGz5KnBs1AxBX0wm+IDphjJw0qrEqRv8P9W9CdTt8Z1unMRZ19A== + dependencies: + "@types/node" "*" wordwrap@0.0.2: version "0.0.2" @@ -10702,6 +12648,15 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -10742,6 +12697,11 @@ wurl@^2.5.3: resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.3.tgz#79ff7c4d8c6584cb46d239517ecac334380af7fd" integrity sha512-LWqZh3ox8gfPwB/xFYFJPnlNOytLtnDtvIDj+iUvD5hxDVWhNa2uhGEQbjyrmolbNFMycqkEnYVXJ7Y72n6h3w== +x-is-string@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" + integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI= + x-xss-protection@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.1.0.tgz#4f1898c332deb1e7f2be1280efb3e2c53d69c1a7" @@ -10839,6 +12799,11 @@ xss@^1.0.3: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= +xtend@^4.0.1, xtend@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + xtraverse@0.1.x: version "0.1.0" resolved "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz#b741bad018ef78d8a9d2e83ade007b3f7959c732" @@ -10846,11 +12811,6 @@ xtraverse@0.1.x: dependencies: xmldom "0.1.x" -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -10874,14 +12834,15 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k= +yargs-parser@^13.1.0: + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== dependencies: - camelcase "^4.1.0" + camelcase "^5.0.0" + decamelize "^1.2.0" -yargs@^12.0.5: +yargs@^12.0.2, yargs@^12.0.5: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== @@ -10899,24 +12860,22 @@ yargs@^12.0.5: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" -yargs@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A= +yargs@^13.1.0: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^3.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" yargs@~3.10.0: version "3.10.0" diff --git a/pkgs/servers/web-apps/codimd/yarn.nix b/pkgs/servers/web-apps/codimd/yarn.nix index f5c34ce04c3a..add7d6a9ba50 100644 --- a/pkgs/servers/web-apps/codimd/yarn.nix +++ b/pkgs/servers/web-apps/codimd/yarn.nix @@ -10,6 +10,206 @@ }; } { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + }; + } + { + name = "_babel_core___core_7.5.5.tgz"; + path = fetchurl { + name = "_babel_core___core_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; + sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + }; + } + { + name = "_babel_generator___generator_7.5.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; + sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; + sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; + sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; + sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + }; + } + { + name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; + sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; + sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + }; + } + { + name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; + sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; + sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; + sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; + sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; + sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; + sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; + sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; + sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + }; + } + { + name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; + sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; + sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; + sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; + sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; + sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + }; + } + { + name = "_babel_helpers___helpers_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; + sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + }; + } + { name = "_babel_highlight___highlight_7.0.0.tgz"; path = fetchurl { name = "_babel_highlight___highlight_7.0.0.tgz"; @@ -18,6 +218,686 @@ }; } { + name = "_babel_parser___parser_7.1.3.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz"; + sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77"; + }; + } + { + name = "_babel_parser___parser_7.5.5.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; + sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; + sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; + sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + }; + } + { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; + sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; + }; + } + { + name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz"; + sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; + sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + }; + } + { + name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz"; + sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz"; + sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"; + }; + } + { + name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz"; + sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7"; + }; + } + { + name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz"; + sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; + sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz"; + sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz"; + sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz"; + sha1 = "646854daf4cd22fd6733f6076013a936310443ac"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; + sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; + sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz"; + sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"; + }; + } + { + name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz"; + sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06"; + }; + } + { + name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz"; + sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; + sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; + sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; + sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + }; + } + { + name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz"; + sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; + sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + }; + } + { + name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz"; + sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz"; + sha1 = "8d257838c6b3b779db52c0224443459bd27fb039"; + }; + } + { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; + sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + }; + } + { + name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz"; + sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309"; + }; + } + { + name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz"; + sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c"; + }; + } + { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz"; + sha1 = "2333ef4b875553a3bcd1e93f8ebc09f5b9213a40"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; + sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; + sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz"; + sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz"; + sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz"; + sha1 = "7470fe070c2944469a756752a69a6963135018be"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; + sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; + sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz"; + sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"; + }; + } + { + name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz"; + sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e"; + }; + } + { + name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz"; + sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; + sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; + sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; + sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; + sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; + sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; + sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; + sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; + sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; + sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; + sha1 = "a63868289e5b4007f7054d46491af51435766008"; + }; + } + { + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; + sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; + sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; + sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; + sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; + sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; + sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; + sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; + sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; + sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; + sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; + sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; + sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; + sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; + sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; + sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; + sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; + sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; + sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; + sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; + sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; + sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; + sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; + sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; + sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; + sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; + sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + }; + } + { + name = "_babel_preset_env___preset_env_7.5.5.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; + sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + }; + } + { + name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; + sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2"; + }; + } + { + name = "_babel_preset_react___preset_react_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; + sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + }; + } + { + name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz"; + sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646"; + }; + } + { + name = "_babel_template___template_7.4.4.tgz"; + path = fetchurl { + name = "_babel_template___template_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; + sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + }; + } + { + name = "_babel_traverse___traverse_7.5.5.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; + sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + }; + } + { + name = "_babel_types___types_7.5.5.tgz"; + path = fetchurl { + name = "_babel_types___types_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; + sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + }; + } + { + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + path = fetchurl { + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz"; + sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd"; + }; + } + { name = "_passport_next_passport_openid___passport_openid_1.0.0.tgz"; path = fetchurl { name = "_passport_next_passport_openid___passport_openid_1.0.0.tgz"; @@ -74,14 +954,6 @@ }; } { - name = "_types_geojson___geojson_1.0.6.tgz"; - path = fetchurl { - name = "_types_geojson___geojson_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz"; - sha1 = "3e02972728c69248c2af08d60a48cbb8680fffdf"; - }; - } - { name = "_types_ldapjs___ldapjs_1.0.4.tgz"; path = fetchurl { name = "_types_ldapjs___ldapjs_1.0.4.tgz"; @@ -146,6 +1018,14 @@ }; } { + name = "_types_unist___unist_2.0.3.tgz"; + path = fetchurl { + name = "_types_unist___unist_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; + sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + }; + } + { name = "_webassemblyjs_ast___ast_1.8.5.tgz"; path = fetchurl { name = "_webassemblyjs_ast___ast_1.8.5.tgz"; @@ -322,6 +1202,14 @@ ''; } { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + }; + } + { name = "JSV___JSV_4.0.2.tgz"; path = fetchurl { name = "JSV___JSV_4.0.2.tgz"; @@ -458,6 +1346,14 @@ }; } { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; + }; + } + { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; path = fetchurl { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; @@ -474,6 +1370,14 @@ }; } { + name = "ansi_html___ansi_html_0.0.7.tgz"; + path = fetchurl { + name = "ansi_html___ansi_html_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + } + { name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; @@ -530,6 +1434,14 @@ }; } { + name = "any_promise___any_promise_1.3.0.tgz"; + path = fetchurl { + name = "any_promise___any_promise_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + } + { name = "anymatch___anymatch_1.3.2.tgz"; path = fetchurl { name = "anymatch___anymatch_1.3.2.tgz"; @@ -546,6 +1458,14 @@ }; } { + name = "append_buffer___append_buffer_1.0.2.tgz"; + path = fetchurl { + name = "append_buffer___append_buffer_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz"; + sha1 = "d8220cf466081525efea50614f3de6514dfa58f1"; + }; + } + { name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; @@ -570,14 +1490,6 @@ }; } { - name = "archy___archy_1.0.0.tgz"; - path = fetchurl { - name = "archy___archy_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; - }; - } - { name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; path = fetchurl { name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; @@ -634,22 +1546,6 @@ }; } { - name = "array_differ___array_differ_1.0.0.tgz"; - path = fetchurl { - name = "array_differ___array_differ_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz"; - sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; - }; - } - { - name = "array_each___array_each_1.0.1.tgz"; - path = fetchurl { - name = "array_each___array_each_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz"; - sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; - }; - } - { name = "array_equal___array_equal_1.0.0.tgz"; path = fetchurl { name = "array_equal___array_equal_1.0.0.tgz"; @@ -674,14 +1570,6 @@ }; } { - name = "array_slice___array_slice_1.1.0.tgz"; - path = fetchurl { - name = "array_slice___array_slice_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz"; - sha1 = "e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"; - }; - } - { name = "array_union___array_union_1.0.2.tgz"; path = fetchurl { name = "array_union___array_union_1.0.2.tgz"; @@ -1034,6 +1922,14 @@ }; } { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; + sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + }; + } + { name = "babel_plugin_syntax_async_functions___babel_plugin_syntax_async_functions_6.13.0.tgz"; path = fetchurl { name = "babel_plugin_syntax_async_functions___babel_plugin_syntax_async_functions_6.13.0.tgz"; @@ -1330,6 +2226,14 @@ }; } { + name = "babelify___babelify_10.0.0.tgz"; + path = fetchurl { + name = "babelify___babelify_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz"; + sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"; + }; + } + { name = "babylon___babylon_6.18.0.tgz"; path = fetchurl { name = "babylon___babylon_6.18.0.tgz"; @@ -1354,6 +2258,14 @@ }; } { + name = "bail___bail_1.0.4.tgz"; + path = fetchurl { + name = "bail___bail_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz"; + sha1 = "7181b66d508aa3055d3f6c13f0a0c720641dde9b"; + }; + } + { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; @@ -1426,14 +2338,6 @@ }; } { - name = "beeper___beeper_1.1.1.tgz"; - path = fetchurl { - name = "beeper___beeper_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz"; - sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; - }; - } - { name = "better_assert___better_assert_1.0.2.tgz"; path = fetchurl { name = "better_assert___better_assert_1.0.2.tgz"; @@ -1466,14 +2370,6 @@ }; } { - name = "bignumber.js___bignumber.js_7.2.1.tgz"; - path = fetchurl { - name = "bignumber.js___bignumber.js_7.2.1.tgz"; - url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz"; - sha1 = "80c048759d826800807c4bfd521e50edbba57a5f"; - }; - } - { name = "binary_extensions___binary_extensions_1.13.1.tgz"; path = fetchurl { name = "binary_extensions___binary_extensions_1.13.1.tgz"; @@ -1538,6 +2434,14 @@ }; } { + name = "body___body_5.1.0.tgz"; + path = fetchurl { + name = "body___body_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz"; + sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; + }; + } + { name = "boolbase___boolbase_1.0.0.tgz"; path = fetchurl { name = "boolbase___boolbase_1.0.0.tgz"; @@ -1602,6 +2506,14 @@ }; } { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + path = fetchurl { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; + sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"; + }; + } + { name = "browser_stdout___browser_stdout_1.3.1.tgz"; path = fetchurl { name = "browser_stdout___browser_stdout_1.3.1.tgz"; @@ -1682,6 +2594,14 @@ }; } { + name = "browserslist___browserslist_4.6.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.6.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz"; + sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453"; + }; + } + { name = "buble___buble_0.19.7.tgz"; path = fetchurl { name = "buble___buble_0.19.7.tgz"; @@ -1714,6 +2634,14 @@ }; } { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + }; + } + { name = "buffer_fill___buffer_fill_1.0.0.tgz"; path = fetchurl { name = "buffer_fill___buffer_fill_1.0.0.tgz"; @@ -1730,6 +2658,14 @@ }; } { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + path = fetchurl { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + } + { name = "buffer_writer___buffer_writer_1.0.1.tgz"; path = fetchurl { name = "buffer_writer___buffer_writer_1.0.1.tgz"; @@ -1786,6 +2722,14 @@ }; } { + name = "bytes___bytes_1.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + } + { name = "bytes___bytes_3.0.0.tgz"; path = fetchurl { name = "bytes___bytes_3.0.0.tgz"; @@ -1826,6 +2770,14 @@ }; } { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + path = fetchurl { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + }; + } + { name = "caller_callsite___caller_callsite_2.0.0.tgz"; path = fetchurl { name = "caller_callsite___caller_callsite_2.0.0.tgz"; @@ -1882,14 +2834,6 @@ }; } { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } - { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; @@ -1922,6 +2866,14 @@ }; } { + name = "caniuse_lite___caniuse_lite_1.0.30000988.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30000988.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz"; + sha1 = "742f35ec1b8b75b9628d705d7652eea1fef983db"; + }; + } + { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { name = "caseless___caseless_0.12.0.tgz"; @@ -1930,6 +2882,14 @@ }; } { + name = "ccount___ccount_1.0.4.tgz"; + path = fetchurl { + name = "ccount___ccount_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz"; + sha1 = "9cf2de494ca84060a2a8d2854edd6dfb0445f386"; + }; + } + { name = "center_align___center_align_0.1.3.tgz"; path = fetchurl { name = "center_align___center_align_0.1.3.tgz"; @@ -1970,6 +2930,38 @@ }; } { + name = "character_entities_html4___character_entities_html4_1.1.3.tgz"; + path = fetchurl { + name = "character_entities_html4___character_entities_html4_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz"; + sha1 = "5ce6e01618e47048ac22f34f7f39db5c6fd679ef"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; + path = fetchurl { + name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; + sha1 = "3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"; + }; + } + { + name = "character_entities___character_entities_1.2.3.tgz"; + path = fetchurl { + name = "character_entities___character_entities_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz"; + sha1 = "bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"; + }; + } + { + name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; + path = fetchurl { + name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; + sha1 = "1647f4f726638d3ea4a750cf5d1975c1c7919a85"; + }; + } + { name = "chardet___chardet_0.7.0.tgz"; path = fetchurl { name = "chardet___chardet_0.7.0.tgz"; @@ -2042,11 +3034,11 @@ }; } { - name = "cli_color___cli_color_1.2.0.tgz"; + name = "cli_color___cli_color_1.4.0.tgz"; path = fetchurl { - name = "cli_color___cli_color_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-color/-/cli-color-1.2.0.tgz"; - sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1"; + name = "cli_color___cli_color_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz"; + sha1 = "7d10738f48526824f8fe7da51857cb0f572fe01f"; }; } { @@ -2082,14 +3074,6 @@ }; } { - name = "cliui___cliui_3.2.0.tgz"; - path = fetchurl { - name = "cliui___cliui_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - } - { name = "cliui___cliui_4.1.0.tgz"; path = fetchurl { name = "cliui___cliui_4.1.0.tgz"; @@ -2098,27 +3082,27 @@ }; } { - name = "clone_stats___clone_stats_0.0.1.tgz"; + name = "cliui___cliui_5.0.0.tgz"; path = fetchurl { - name = "clone_stats___clone_stats_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz"; - sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; }; } { - name = "clone___clone_0.2.0.tgz"; + name = "clone_buffer___clone_buffer_1.0.0.tgz"; path = fetchurl { - name = "clone___clone_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; }; } { - name = "clone___clone_1.0.4.tgz"; + name = "clone_stats___clone_stats_1.0.0.tgz"; path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + name = "clone_stats___clone_stats_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; }; } { @@ -2130,6 +3114,22 @@ }; } { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + path = fetchurl { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; + }; + } + { + name = "cls_bluebird___cls_bluebird_2.1.0.tgz"; + path = fetchurl { + name = "cls_bluebird___cls_bluebird_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz"; + sha1 = "37ef1e080a8ffb55c2f4164f536f1919e7968aee"; + }; + } + { name = "coa___coa_2.0.2.tgz"; path = fetchurl { name = "coa___coa_2.0.2.tgz"; @@ -2162,6 +3162,14 @@ ''; } { + name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + path = fetchurl { + name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; + sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; + }; + } + { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { name = "collection_visit___collection_visit_1.0.0.tgz"; @@ -2258,6 +3266,22 @@ }; } { + name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; + path = fetchurl { + name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz"; + sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59"; + }; + } + { + name = "commander___commander_2.20.0.tgz"; + path = fetchurl { + name = "commander___commander_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; + sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; + }; + } + { name = "commander___commander_2.15.1.tgz"; path = fetchurl { name = "commander___commander_2.15.1.tgz"; @@ -2274,14 +3298,6 @@ }; } { - name = "commander___commander_2.20.0.tgz"; - path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; - }; - } - { name = "commander___commander_2.13.0.tgz"; path = fetchurl { name = "commander___commander_2.13.0.tgz"; @@ -2378,6 +3394,14 @@ }; } { + name = "concat_stream___concat_stream_1.5.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + } + { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { name = "config_chain___config_chain_1.1.12.tgz"; @@ -2394,11 +3418,11 @@ }; } { - name = "connect_session_sequelize___connect_session_sequelize_4.1.0.tgz"; + name = "connect_session_sequelize___connect_session_sequelize_6.0.0.tgz"; path = fetchurl { - name = "connect_session_sequelize___connect_session_sequelize_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-4.1.0.tgz"; - sha1 = "d402749c3bebd79209192c164c090742b3fe2011"; + name = "connect_session_sequelize___connect_session_sequelize_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.0.0.tgz"; + sha1 = "afd4456c65d92c9b6b955fdff00afff795e8a420"; }; } { @@ -2458,6 +3482,14 @@ }; } { + name = "continuable_cache___continuable_cache_0.3.1.tgz"; + path = fetchurl { + name = "continuable_cache___continuable_cache_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz"; + sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; + }; + } + { name = "convert_source_map___convert_source_map_1.6.0.tgz"; path = fetchurl { name = "convert_source_map___convert_source_map_1.6.0.tgz"; @@ -2530,6 +3562,22 @@ }; } { + name = "core_js_compat___core_js_compat_3.1.4.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz"; + sha1 = "e4d0c40fbd01e65b1d457980fe4112d4358a7408"; + }; + } + { + name = "core_js_pure___core_js_pure_3.1.4.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz"; + sha1 = "5fa17dc77002a169a3566cc48dc774d2e13e3769"; + }; + } + { name = "core_js___core_js_2.6.9.tgz"; path = fetchurl { name = "core_js___core_js_2.6.9.tgz"; @@ -2594,14 +3642,6 @@ }; } { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - } - { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; @@ -2626,6 +3666,14 @@ }; } { + name = "css_b64_images___css_b64_images_0.2.5.tgz"; + path = fetchurl { + name = "css_b64_images___css_b64_images_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz"; + sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02"; + }; + } + { name = "css_color_names___css_color_names_0.0.4.tgz"; path = fetchurl { name = "css_color_names___css_color_names_0.0.4.tgz"; @@ -2842,11 +3890,259 @@ }; } { - name = "d3___d3_3.5.17.tgz"; + name = "d3_array___d3_array_1.2.4.tgz"; + path = fetchurl { + name = "d3_array___d3_array_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz"; + sha1 = "635ce4d5eea759f6f605863dbcfc30edc737f71f"; + }; + } + { + name = "d3_axis___d3_axis_1.0.12.tgz"; + path = fetchurl { + name = "d3_axis___d3_axis_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz"; + sha1 = "cdf20ba210cfbb43795af33756886fb3638daac9"; + }; + } + { + name = "d3_brush___d3_brush_1.0.6.tgz"; + path = fetchurl { + name = "d3_brush___d3_brush_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.6.tgz"; + sha1 = "33691f2032d9db6c5d8cb684ff255a9883629e21"; + }; + } + { + name = "d3_chord___d3_chord_1.0.6.tgz"; + path = fetchurl { + name = "d3_chord___d3_chord_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz"; + sha1 = "309157e3f2db2c752f0280fedd35f2067ccbb15f"; + }; + } + { + name = "d3_collection___d3_collection_1.0.7.tgz"; + path = fetchurl { + name = "d3_collection___d3_collection_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz"; + sha1 = "349bd2aa9977db071091c13144d5e4f16b5b310e"; + }; + } + { + name = "d3_color___d3_color_1.2.8.tgz"; + path = fetchurl { + name = "d3_color___d3_color_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.8.tgz"; + sha1 = "4eaf9b60ef188c893fcf8b28f3546aafebfbd9f4"; + }; + } + { + name = "d3_contour___d3_contour_1.3.2.tgz"; + path = fetchurl { + name = "d3_contour___d3_contour_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz"; + sha1 = "652aacd500d2264cb3423cee10db69f6f59bead3"; + }; + } + { + name = "d3_dispatch___d3_dispatch_1.0.5.tgz"; + path = fetchurl { + name = "d3_dispatch___d3_dispatch_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.5.tgz"; + sha1 = "e25c10a186517cd6c82dd19ea018f07e01e39015"; + }; + } + { + name = "d3_drag___d3_drag_1.2.3.tgz"; + path = fetchurl { + name = "d3_drag___d3_drag_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.3.tgz"; + sha1 = "46e206ad863ec465d88c588098a1df444cd33c64"; + }; + } + { + name = "d3_dsv___d3_dsv_1.1.1.tgz"; + path = fetchurl { + name = "d3_dsv___d3_dsv_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.1.1.tgz"; + sha1 = "aaa830ecb76c4b5015572c647cc6441e3c7bb701"; + }; + } + { + name = "d3_ease___d3_ease_1.0.5.tgz"; path = fetchurl { - name = "d3___d3_3.5.17.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz"; - sha1 = "bc46748004378b21a360c9fc7cf5231790762fb8"; + name = "d3_ease___d3_ease_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.5.tgz"; + sha1 = "8ce59276d81241b1b72042d6af2d40e76d936ffb"; + }; + } + { + name = "d3_fetch___d3_fetch_1.1.2.tgz"; + path = fetchurl { + name = "d3_fetch___d3_fetch_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz"; + sha1 = "957c8fbc6d4480599ba191b1b2518bf86b3e1be2"; + }; + } + { + name = "d3_force___d3_force_1.2.1.tgz"; + path = fetchurl { + name = "d3_force___d3_force_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz"; + sha1 = "fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"; + }; + } + { + name = "d3_format___d3_format_1.3.2.tgz"; + path = fetchurl { + name = "d3_format___d3_format_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz"; + sha1 = "6a96b5e31bcb98122a30863f7d92365c00603562"; + }; + } + { + name = "d3_geo___d3_geo_1.11.6.tgz"; + path = fetchurl { + name = "d3_geo___d3_geo_1.11.6.tgz"; + url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.6.tgz"; + sha1 = "134f2ef035ff75a448075fafdea92702a2e0e0cf"; + }; + } + { + name = "d3_hierarchy___d3_hierarchy_1.1.8.tgz"; + path = fetchurl { + name = "d3_hierarchy___d3_hierarchy_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz"; + sha1 = "7a6317bd3ed24e324641b6f1e76e978836b008cc"; + }; + } + { + name = "d3_interpolate___d3_interpolate_1.3.2.tgz"; + path = fetchurl { + name = "d3_interpolate___d3_interpolate_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz"; + sha1 = "417d3ebdeb4bc4efcc8fd4361c55e4040211fd68"; + }; + } + { + name = "d3_path___d3_path_1.0.8.tgz"; + path = fetchurl { + name = "d3_path___d3_path_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.8.tgz"; + sha1 = "4a0606a794d104513ec4a8af43525f374b278719"; + }; + } + { + name = "d3_polygon___d3_polygon_1.0.5.tgz"; + path = fetchurl { + name = "d3_polygon___d3_polygon_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.5.tgz"; + sha1 = "9a645a0a64ff6cbf9efda96ee0b4a6909184c363"; + }; + } + { + name = "d3_quadtree___d3_quadtree_1.0.6.tgz"; + path = fetchurl { + name = "d3_quadtree___d3_quadtree_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.6.tgz"; + sha1 = "d1ab2a95a7f27bbde88582c94166f6ae35f32056"; + }; + } + { + name = "d3_random___d3_random_1.1.2.tgz"; + path = fetchurl { + name = "d3_random___d3_random_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz"; + sha1 = "2833be7c124360bf9e2d3fd4f33847cfe6cab291"; + }; + } + { + name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz"; + path = fetchurl { + name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz"; + sha1 = "dad4366f0edcb288f490128979c3c793583ed3c0"; + }; + } + { + name = "d3_scale___d3_scale_2.2.2.tgz"; + path = fetchurl { + name = "d3_scale___d3_scale_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz"; + sha1 = "4e880e0b2745acaaddd3ede26a9e908a9e17b81f"; + }; + } + { + name = "d3_selection___d3_selection_1.4.0.tgz"; + path = fetchurl { + name = "d3_selection___d3_selection_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz"; + sha1 = "ab9ac1e664cf967ebf1b479cc07e28ce9908c474"; + }; + } + { + name = "d3_shape___d3_shape_1.3.5.tgz"; + path = fetchurl { + name = "d3_shape___d3_shape_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.5.tgz"; + sha1 = "e81aea5940f59f0a79cfccac012232a8987c6033"; + }; + } + { + name = "d3_time_format___d3_time_format_2.1.3.tgz"; + path = fetchurl { + name = "d3_time_format___d3_time_format_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.3.tgz"; + sha1 = "ae06f8e0126a9d60d6364eac5b1533ae1bac826b"; + }; + } + { + name = "d3_time___d3_time_1.0.11.tgz"; + path = fetchurl { + name = "d3_time___d3_time_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.11.tgz"; + sha1 = "1d831a3e25cd189eb256c17770a666368762bbce"; + }; + } + { + name = "d3_timer___d3_timer_1.0.9.tgz"; + path = fetchurl { + name = "d3_timer___d3_timer_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.9.tgz"; + sha1 = "f7bb8c0d597d792ff7131e1c24a36dd471a471ba"; + }; + } + { + name = "d3_transition___d3_transition_1.2.0.tgz"; + path = fetchurl { + name = "d3_transition___d3_transition_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.2.0.tgz"; + sha1 = "f538c0e21b2aa1f05f3e965f8567e81284b3b2b8"; + }; + } + { + name = "d3_voronoi___d3_voronoi_1.1.4.tgz"; + path = fetchurl { + name = "d3_voronoi___d3_voronoi_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz"; + sha1 = "dd3c78d7653d2bb359284ae478645d95944c8297"; + }; + } + { + name = "d3_zoom___d3_zoom_1.7.3.tgz"; + path = fetchurl { + name = "d3_zoom___d3_zoom_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.3.tgz"; + sha1 = "f444effdc9055c38077c4299b4df999eb1d47ccb"; + }; + } + { + name = "d3___d3_5.9.7.tgz"; + path = fetchurl { + name = "d3___d3_5.9.7.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.9.7.tgz"; + sha1 = "f3835648a172b438e89ed57eb6c525bdabdcd7dc"; }; } { @@ -2858,11 +4154,11 @@ }; } { - name = "dagre_d3_renderer___dagre_d3_renderer_0.4.26.tgz"; + name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; path = fetchurl { - name = "dagre_d3_renderer___dagre_d3_renderer_0.4.26.tgz"; - url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.4.26.tgz"; - sha1 = "648a491209b853ae96ddf3fea41a1f104479a5a1"; + name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; + url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz"; + sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3"; }; } { @@ -2906,11 +4202,11 @@ }; } { - name = "dateformat___dateformat_2.2.0.tgz"; + name = "de_indent___de_indent_1.0.2.tgz"; path = fetchurl { - name = "dateformat___dateformat_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz"; - sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; + name = "de_indent___de_indent_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; } { @@ -2994,14 +4290,6 @@ }; } { - name = "defaults___defaults_1.0.3.tgz"; - path = fetchurl { - name = "defaults___defaults_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - } - { name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; @@ -3066,6 +4354,14 @@ }; } { + name = "denque___denque_1.4.1.tgz"; + path = fetchurl { + name = "denque___denque_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz"; + sha1 = "6744ff7641c148c3f8a69c307e51235c1f4a37cf"; + }; + } + { name = "depd___depd_2.0.0.tgz"; path = fetchurl { name = "depd___depd_2.0.0.tgz"; @@ -3082,14 +4378,6 @@ }; } { - name = "deprecated___deprecated_0.0.1.tgz"; - path = fetchurl { - name = "deprecated___deprecated_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - } - { name = "des.js___des.js_1.0.0.tgz"; path = fetchurl { name = "des.js___des.js_1.0.0.tgz"; @@ -3106,11 +4394,11 @@ }; } { - name = "detect_file___detect_file_0.1.0.tgz"; + name = "detab___detab_2.0.2.tgz"; path = fetchurl { - name = "detect_file___detect_file_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz"; - sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; + name = "detab___detab_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz"; + sha1 = "074970d1a807b045d0258a4235df5928dd683561"; }; } { @@ -3138,6 +4426,14 @@ }; } { + name = "detective___detective_4.7.1.tgz"; + path = fetchurl { + name = "detective___detective_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz"; + sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e"; + }; + } + { name = "diagnostics___diagnostics_1.1.1.tgz"; path = fetchurl { name = "diagnostics___diagnostics_1.1.1.tgz"; @@ -3170,6 +4466,14 @@ }; } { + name = "diff___diff_4.0.1.tgz"; + path = fetchurl { + name = "diff___diff_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; + sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; + }; + } + { name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; path = fetchurl { name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; @@ -3202,6 +4506,14 @@ }; } { + name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; + path = fetchurl { + name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz"; + sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57"; + }; + } + { name = "doctrine___doctrine_1.5.0.tgz"; path = fetchurl { name = "doctrine___doctrine_1.5.0.tgz"; @@ -3218,6 +4530,14 @@ }; } { + name = "documentation___documentation_12.1.0.tgz"; + path = fetchurl { + name = "documentation___documentation_12.1.0.tgz"; + url = "https://registry.yarnpkg.com/documentation/-/documentation-12.1.0.tgz"; + sha1 = "0cabc4e88507872fd847129c00ae7d0e2482049c"; + }; + } + { name = "dom_converter___dom_converter_0.2.0.tgz"; path = fetchurl { name = "dom_converter___dom_converter_0.2.0.tgz"; @@ -3298,11 +4618,11 @@ }; } { - name = "dottie___dottie_1.1.1.tgz"; + name = "dottie___dottie_2.0.1.tgz"; path = fetchurl { - name = "dottie___dottie_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz"; - sha1 = "45c2a3f48bd6528eeed267a69a848eaaca6faa6a"; + name = "dottie___dottie_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz"; + sha1 = "697ad9d72004db7574d21f892466a3c285893659"; }; } { @@ -3314,11 +4634,11 @@ }; } { - name = "duplexer2___duplexer2_0.0.2.tgz"; + name = "duplexer2___duplexer2_0.1.4.tgz"; path = fetchurl { - name = "duplexer2___duplexer2_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + name = "duplexer2___duplexer2_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; } { @@ -3410,6 +4730,14 @@ }; } { + name = "electron_to_chromium___electron_to_chromium_1.3.210.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.210.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz"; + sha1 = "0ce6247366c5771d4f5663a5879388fd1adefb7e"; + }; + } + { name = "elliptic___elliptic_6.4.1.tgz"; path = fetchurl { name = "elliptic___elliptic_6.4.1.tgz"; @@ -3418,6 +4746,14 @@ }; } { + name = "emoji_regex___emoji_regex_6.1.1.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz"; + sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + }; + } + { name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { name = "emoji_regex___emoji_regex_7.0.3.tgz"; @@ -3426,6 +4762,14 @@ }; } { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { name = "emojify.js___emojify.js_1.1.0.tgz"; path = fetchurl { name = "emojify.js___emojify.js_1.1.0.tgz"; @@ -3466,14 +4810,6 @@ }; } { - name = "end_of_stream___end_of_stream_0.1.5.tgz"; - path = fetchurl { - name = "end_of_stream___end_of_stream_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz"; - sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; - }; - } - { name = "engine.io_client___engine.io_client_3.2.1.tgz"; path = fetchurl { name = "engine.io_client___engine.io_client_3.2.1.tgz"; @@ -3546,6 +4882,14 @@ }; } { + name = "error___error_7.0.2.tgz"; + path = fetchurl { + name = "error___error_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz"; + sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; + }; + } + { name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { name = "es_abstract___es_abstract_1.13.0.tgz"; @@ -3626,6 +4970,14 @@ }; } { + name = "escaper___escaper_2.5.3.tgz"; + path = fetchurl { + name = "escaper___escaper_2.5.3.tgz"; + url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz"; + sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5"; + }; + } + { name = "escodegen___escodegen_1.11.1.tgz"; path = fetchurl { name = "escodegen___escodegen_1.11.1.tgz"; @@ -3786,6 +5138,14 @@ }; } { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { name = "esutils___esutils_2.0.2.tgz"; path = fetchurl { name = "esutils___esutils_2.0.2.tgz"; @@ -3850,14 +5210,6 @@ }; } { - name = "execa___execa_0.7.0.tgz"; - path = fetchurl { - name = "execa___execa_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - } - { name = "execa___execa_1.0.0.tgz"; path = fetchurl { name = "execa___execa_1.0.0.tgz"; @@ -3890,14 +5242,6 @@ }; } { - name = "expand_tilde___expand_tilde_1.2.2.tgz"; - path = fetchurl { - name = "expand_tilde___expand_tilde_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz"; - sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; - }; - } - { name = "expand_tilde___expand_tilde_2.0.2.tgz"; path = fetchurl { name = "expand_tilde___expand_tilde_2.0.2.tgz"; @@ -4098,6 +5442,14 @@ }; } { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + } + { name = "fd_slicer___fd_slicer_1.0.1.tgz"; path = fetchurl { name = "fd_slicer___fd_slicer_1.0.1.tgz"; @@ -4210,14 +5562,6 @@ }; } { - name = "find_index___find_index_0.1.1.tgz"; - path = fetchurl { - name = "find_index___find_index_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - } - { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { name = "find_up___find_up_2.1.0.tgz"; @@ -4234,14 +5578,6 @@ }; } { - name = "findup_sync___findup_sync_1.0.0.tgz"; - path = fetchurl { - name = "findup_sync___findup_sync_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz"; - sha1 = "6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec"; - }; - } - { name = "findup_sync___findup_sync_2.0.0.tgz"; path = fetchurl { name = "findup_sync___findup_sync_2.0.0.tgz"; @@ -4250,30 +5586,6 @@ }; } { - name = "fined___fined_1.2.0.tgz"; - path = fetchurl { - name = "fined___fined_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz"; - sha1 = "d00beccf1aa2b475d16d423b0238b713a2c4a37b"; - }; - } - { - name = "first_chunk_stream___first_chunk_stream_1.0.0.tgz"; - path = fetchurl { - name = "first_chunk_stream___first_chunk_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - } - { - name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; - path = fetchurl { - name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz"; - sha1 = "e7de6f1279ddd9ca9aac8a5971d618606b3aab41"; - }; - } - { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -4322,14 +5634,6 @@ }; } { - name = "for_own___for_own_1.0.0.tgz"; - path = fetchurl { - name = "for_own___for_own_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz"; - sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; - }; - } - { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { name = "forever_agent___forever_agent_0.6.1.tgz"; @@ -4426,14 +5730,6 @@ }; } { - name = "fs_exists_sync___fs_exists_sync_0.1.0.tgz"; - path = fetchurl { - name = "fs_exists_sync___fs_exists_sync_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; - }; - } - { name = "fs_extra___fs_extra_1.0.0.tgz"; path = fetchurl { name = "fs_extra___fs_extra_1.0.0.tgz"; @@ -4442,11 +5738,11 @@ }; } { - name = "fs_extra___fs_extra_4.0.3.tgz"; + name = "fs_extra___fs_extra_7.0.1.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz"; - sha1 = "0d852122e5bc5beb453fb028e9c0c9bf36340c94"; + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; }; } { @@ -4458,6 +5754,14 @@ }; } { + name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; + path = fetchurl { + name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"; + sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; + }; + } + { name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; path = fetchurl { name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; @@ -4514,19 +5818,11 @@ }; } { - name = "gaze___gaze_0.5.2.tgz"; + name = "generate_function___generate_function_2.3.1.tgz"; path = fetchurl { - name = "gaze___gaze_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - } - { - name = "generic_pool___generic_pool_2.4.2.tgz"; - path = fetchurl { - name = "generic_pool___generic_pool_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz"; - sha1 = "886bc5bf0beb7db96e81bcbba078818de5a62683"; + name = "generate_function___generate_function_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz"; + sha1 = "f069617690c10c868e73b8465746764f97c3479f"; }; } { @@ -4546,11 +5842,19 @@ }; } { - name = "get_stream___get_stream_3.0.0.tgz"; + name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { - name = "get_stream___get_stream_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_port___get_port_4.2.0.tgz"; + path = fetchurl { + name = "get_port___get_port_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; + sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; }; } { @@ -4586,6 +5890,38 @@ }; } { + name = "git_up___git_up_2.1.0.tgz"; + path = fetchurl { + name = "git_up___git_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz"; + sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c"; + }; + } + { + name = "git_url_parse___git_url_parse_10.1.0.tgz"; + path = fetchurl { + name = "git_url_parse___git_url_parse_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz"; + sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e"; + }; + } + { + name = "github_slugger___github_slugger_1.2.0.tgz"; + path = fetchurl { + name = "github_slugger___github_slugger_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz"; + sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a"; + }; + } + { + name = "github_slugger___github_slugger_1.2.1.tgz"; + path = fetchurl { + name = "github_slugger___github_slugger_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz"; + sha1 = "47e904e70bf2dccd0014748142d31126cfd49508"; + }; + } + { name = "glob_base___glob_base_0.3.0.tgz"; path = fetchurl { name = "glob_base___glob_base_0.3.0.tgz"; @@ -4610,27 +5946,11 @@ }; } { - name = "glob_stream___glob_stream_3.1.18.tgz"; - path = fetchurl { - name = "glob_stream___glob_stream_3.1.18.tgz"; - url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - } - { - name = "glob_watcher___glob_watcher_0.0.6.tgz"; - path = fetchurl { - name = "glob_watcher___glob_watcher_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - } - { - name = "glob2base___glob2base_0.0.12.tgz"; + name = "glob_stream___glob_stream_6.1.0.tgz"; path = fetchurl { - name = "glob2base___glob2base_0.0.12.tgz"; - url = "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; + name = "glob_stream___glob_stream_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; }; } { @@ -4642,14 +5962,6 @@ }; } { - name = "glob___glob_4.5.3.tgz"; - path = fetchurl { - name = "glob___glob_4.5.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - } - { name = "glob___glob_6.0.4.tgz"; path = fetchurl { name = "glob___glob_6.0.4.tgz"; @@ -4666,22 +5978,6 @@ }; } { - name = "glob___glob_3.1.21.tgz"; - path = fetchurl { - name = "glob___glob_3.1.21.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - } - { - name = "global_modules___global_modules_0.2.3.tgz"; - path = fetchurl { - name = "global_modules___global_modules_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz"; - sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; - }; - } - { name = "global_modules___global_modules_1.0.0.tgz"; path = fetchurl { name = "global_modules___global_modules_1.0.0.tgz"; @@ -4690,14 +5986,6 @@ }; } { - name = "global_prefix___global_prefix_0.1.5.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz"; - sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; - }; - } - { name = "global_prefix___global_prefix_1.0.2.tgz"; path = fetchurl { name = "global_prefix___global_prefix_1.0.2.tgz"; @@ -4706,6 +5994,14 @@ }; } { + name = "globals_docs___globals_docs_2.4.0.tgz"; + path = fetchurl { + name = "globals_docs___globals_docs_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz"; + sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb"; + }; + } + { name = "globals___globals_11.12.0.tgz"; path = fetchurl { name = "globals___globals_11.12.0.tgz"; @@ -4730,22 +6026,6 @@ }; } { - name = "globule___globule_0.1.0.tgz"; - path = fetchurl { - name = "globule___globule_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - } - { - name = "glogg___glogg_1.0.2.tgz"; - path = fetchurl { - name = "glogg___glogg_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz"; - sha1 = "2d7dd702beda22eb3bffadf880696da6d846313f"; - }; - } - { name = "good_listener___good_listener_1.2.2.tgz"; path = fetchurl { name = "good_listener___good_listener_1.2.2.tgz"; @@ -4762,27 +6042,11 @@ }; } { - name = "graceful_fs___graceful_fs_3.0.11.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_3.0.11.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - } - { - name = "graceful_fs___graceful_fs_1.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.0.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }; - } - { - name = "graphlib___graphlib_2.1.7.tgz"; - path = fetchurl { - name = "graphlib___graphlib_2.1.7.tgz"; - url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz"; - sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"; + name = "graceful_fs___graceful_fs_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz"; + sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b"; }; } { @@ -4802,35 +6066,11 @@ }; } { - name = "gulp_help___gulp_help_1.6.1.tgz"; + name = "gulp_print___gulp_print_5.0.2.tgz"; path = fetchurl { - name = "gulp_help___gulp_help_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/gulp-help/-/gulp-help-1.6.1.tgz"; - sha1 = "261db186e18397fef3f6a2c22e9c315bfa88ae0c"; - }; - } - { - name = "gulp_util___gulp_util_3.0.8.tgz"; - path = fetchurl { - name = "gulp_util___gulp_util_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; - }; - } - { - name = "gulp___gulp_3.9.1.tgz"; - path = fetchurl { - name = "gulp___gulp_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - } - { - name = "gulplog___gulplog_1.0.0.tgz"; - path = fetchurl { - name = "gulplog___gulplog_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz"; - sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; + name = "gulp_print___gulp_print_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/gulp-print/-/gulp-print-5.0.2.tgz"; + sha1 = "8f379148218d2e168461baa74352e11d1bf7aa75"; }; } { @@ -4898,14 +6138,6 @@ }; } { - name = "has_gulplog___has_gulplog_0.1.0.tgz"; - path = fetchurl { - name = "has_gulplog___has_gulplog_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha1 = "6414c82913697da51590397dafb12f22967811ce"; - }; - } - { name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { name = "has_symbols___has_symbols_1.0.0.tgz"; @@ -4986,6 +6218,38 @@ }; } { + name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; + path = fetchurl { + name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz"; + sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4"; + }; + } + { + name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; + path = fetchurl { + name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz"; + sha1 = "4e60d66336bd67e52354d581967467029a933f2e"; + }; + } + { + name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; + path = fetchurl { + name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz"; + sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a"; + }; + } + { + name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; + path = fetchurl { + name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz"; + sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34"; + }; + } + { name = "he___he_1.1.1.tgz"; path = fetchurl { name = "he___he_1.1.1.tgz"; @@ -5050,6 +6314,14 @@ }; } { + name = "highlight.js___highlight.js_9.15.9.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_9.15.9.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz"; + sha1 = "865257da1dbb4a58c4552d46c4b3854f77f0e6d5"; + }; + } + { name = "highlight.js___highlight.js_9.12.0.tgz"; path = fetchurl { name = "highlight.js___highlight.js_9.12.0.tgz"; @@ -5146,6 +6418,22 @@ }; } { + name = "html_minifier___html_minifier_4.0.0.tgz"; + path = fetchurl { + name = "html_minifier___html_minifier_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz"; + sha1 = "cca9aad8bce1175e02e17a8c33e46d8988889f56"; + }; + } + { + name = "html_void_elements___html_void_elements_1.0.4.tgz"; + path = fetchurl { + name = "html_void_elements___html_void_elements_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz"; + sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5"; + }; + } + { name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.2.tgz"; path = fetchurl { name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.2.tgz"; @@ -5170,6 +6458,14 @@ }; } { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + path = fetchurl { + name = "http_parser_js___http_parser_js_0.4.10.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + }; + } + { name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { name = "http_signature___http_signature_1.2.0.tgz"; @@ -5394,14 +6690,6 @@ }; } { - name = "inherits___inherits_1.0.2.tgz"; - path = fetchurl { - name = "inherits___inherits_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; - }; - } - { name = "inherits___inherits_2.0.3.tgz"; path = fetchurl { name = "inherits___inherits_2.0.3.tgz"; @@ -5450,14 +6738,6 @@ }; } { - name = "invert_kv___invert_kv_1.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - } - { name = "invert_kv___invert_kv_2.0.0.tgz"; path = fetchurl { name = "invert_kv___invert_kv_2.0.0.tgz"; @@ -5514,6 +6794,30 @@ }; } { + name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; + path = fetchurl { + name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; + sha1 = "eb04cc47219a8895d8450ace4715abff2258a1f8"; + }; + } + { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + path = fetchurl { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; + sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4"; + }; + } + { + name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; + path = fetchurl { + name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; + sha1 = "57ae21c374277b3defe0274c640a5704b8f6657c"; + }; + } + { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; @@ -5538,6 +6842,14 @@ }; } { + name = "is_bluebird___is_bluebird_1.0.2.tgz"; + path = fetchurl { + name = "is_bluebird___is_bluebird_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz"; + sha1 = "096439060f4aa411abee19143a84d6a55346d6e2"; + }; + } + { name = "is_buffer___is_buffer_1.1.6.tgz"; path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; @@ -5546,6 +6858,14 @@ }; } { + name = "is_buffer___is_buffer_2.0.3.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; + sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; + }; + } + { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { name = "is_callable___is_callable_1.1.4.tgz"; @@ -5586,6 +6906,14 @@ }; } { + name = "is_decimal___is_decimal_1.0.3.tgz"; + path = fetchurl { + name = "is_decimal___is_decimal_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz"; + sha1 = "381068759b9dc807d8c0dc0bfbae2b68e1da48b7"; + }; + } + { name = "is_descriptor___is_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_descriptor___is_descriptor_0.1.6.tgz"; @@ -5682,6 +7010,14 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_glob___is_glob_2.0.1.tgz"; path = fetchurl { name = "is_glob___is_glob_2.0.1.tgz"; @@ -5706,6 +7042,22 @@ }; } { + name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; + path = fetchurl { + name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; + sha1 = "e8a426a69b6d31470d3a33a47bb825cda02506ee"; + }; + } + { + name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; + path = fetchurl { + name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + } + { name = "is_number___is_number_2.1.0.tgz"; path = fetchurl { name = "is_number___is_number_2.1.0.tgz"; @@ -5738,6 +7090,14 @@ }; } { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + } + { name = "is_plain_object___is_plain_object_2.0.4.tgz"; path = fetchurl { name = "is_plain_object___is_plain_object_2.0.4.tgz"; @@ -5770,6 +7130,14 @@ }; } { + name = "is_property___is_property_1.0.2.tgz"; + path = fetchurl { + name = "is_property___is_property_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + } + { name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { name = "is_regex___is_regex_1.0.4.tgz"; @@ -5778,6 +7146,14 @@ }; } { + name = "is_regexp___is_regexp_1.0.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + } + { name = "is_relative___is_relative_1.0.0.tgz"; path = fetchurl { name = "is_relative___is_relative_1.0.0.tgz"; @@ -5794,6 +7170,14 @@ }; } { + name = "is_ssh___is_ssh_1.3.1.tgz"; + path = fetchurl { + name = "is_ssh___is_ssh_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz"; + sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3"; + }; + } + { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; @@ -5842,11 +7226,19 @@ }; } { - name = "is_windows___is_windows_0.2.0.tgz"; + name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; path = fetchurl { - name = "is_windows___is_windows_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz"; - sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; + sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; + }; + } + { + name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; + path = fetchurl { + name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; + sha1 = "b3ad9546d916d7d3ffa78204bca0c26b56257fac"; }; } { @@ -5858,6 +7250,14 @@ }; } { + name = "is_word_character___is_word_character_1.0.3.tgz"; + path = fetchurl { + name = "is_word_character___is_word_character_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz"; + sha1 = "264d15541cbad0ba833d3992c34e6b40873b08aa"; + }; + } + { name = "is_wsl___is_wsl_1.1.0.tgz"; path = fetchurl { name = "is_wsl___is_wsl_1.1.0.tgz"; @@ -5970,6 +7370,14 @@ }; } { + name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; + path = fetchurl { + name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; + sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d"; + }; + } + { name = "js-sequence-diagrams.git"; path = let @@ -6050,6 +7458,14 @@ }; } { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { name = "jsesc___jsesc_0.5.0.tgz"; path = fetchurl { name = "jsesc___jsesc_0.5.0.tgz"; @@ -6130,6 +7546,14 @@ }; } { + name = "json5___json5_2.1.0.tgz"; + path = fetchurl { + name = "json5___json5_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; + sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + }; + } + { name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { name = "jsonfile___jsonfile_2.4.0.tgz"; @@ -6154,6 +7578,14 @@ }; } { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } + { name = "jsonparse___jsonparse_1.2.0.tgz"; path = fetchurl { name = "jsonparse___jsonparse_1.2.0.tgz"; @@ -6258,14 +7690,6 @@ }; } { - name = "lcid___lcid_1.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - } - { name = "lcid___lcid_2.0.0.tgz"; path = fetchurl { name = "lcid___lcid_2.0.0.tgz"; @@ -6298,6 +7722,14 @@ }; } { + name = "lead___lead_1.0.0.tgz"; + path = fetchurl { + name = "lead___lead_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz"; + sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; + }; + } + { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { name = "left_pad___left_pad_1.3.0.tgz"; @@ -6330,14 +7762,6 @@ }; } { - name = "liftoff___liftoff_2.5.0.tgz"; - path = fetchurl { - name = "liftoff___liftoff_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz"; - sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; - }; - } - { name = "linkify_it___linkify_it_2.1.0.tgz"; path = fetchurl { name = "linkify_it___linkify_it_2.1.0.tgz"; @@ -6354,6 +7778,14 @@ }; } { + name = "livereload_js___livereload_js_2.4.0.tgz"; + path = fetchurl { + name = "livereload_js___livereload_js_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz"; + sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c"; + }; + } + { name = "load_json_file___load_json_file_2.0.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_2.0.0.tgz"; @@ -6362,6 +7794,14 @@ }; } { + name = "load_json_file___load_json_file_4.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + } + { name = "loader_runner___loader_runner_2.4.0.tgz"; path = fetchurl { name = "loader_runner___loader_runner_2.4.0.tgz"; @@ -6402,78 +7842,6 @@ }; } { - name = "lodash._basecopy___lodash._basecopy_3.0.1.tgz"; - path = fetchurl { - name = "lodash._basecopy___lodash._basecopy_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - } - { - name = "lodash._basetostring___lodash._basetostring_3.0.1.tgz"; - path = fetchurl { - name = "lodash._basetostring___lodash._basetostring_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; - }; - } - { - name = "lodash._basevalues___lodash._basevalues_3.0.0.tgz"; - path = fetchurl { - name = "lodash._basevalues___lodash._basevalues_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; - }; - } - { - name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; - path = fetchurl { - name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - } - { - name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz"; - path = fetchurl { - name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - } - { - name = "lodash._reescape___lodash._reescape_3.0.0.tgz"; - path = fetchurl { - name = "lodash._reescape___lodash._reescape_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; - }; - } - { - name = "lodash._reevaluate___lodash._reevaluate_3.0.0.tgz"; - path = fetchurl { - name = "lodash._reevaluate___lodash._reevaluate_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; - }; - } - { - name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; - path = fetchurl { - name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - } - { - name = "lodash._root___lodash._root_3.0.1.tgz"; - path = fetchurl { - name = "lodash._root___lodash._root_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; - sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; - }; - } - { name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; path = fetchurl { name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; @@ -6498,14 +7866,6 @@ }; } { - name = "lodash.escape___lodash.escape_3.2.0.tgz"; - path = fetchurl { - name = "lodash.escape___lodash.escape_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; - }; - } - { name = "lodash.filter___lodash.filter_4.6.0.tgz"; path = fetchurl { name = "lodash.filter___lodash.filter_4.6.0.tgz"; @@ -6530,30 +7890,6 @@ }; } { - name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; - path = fetchurl { - name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; - }; - } - { - name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; - path = fetchurl { - name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; - }; - } - { - name = "lodash.keys___lodash.keys_3.1.2.tgz"; - path = fetchurl { - name = "lodash.keys___lodash.keys_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - } - { name = "lodash.map___lodash.map_4.6.0.tgz"; path = fetchurl { name = "lodash.map___lodash.map_4.6.0.tgz"; @@ -6602,14 +7938,6 @@ }; } { - name = "lodash.restparam___lodash.restparam_3.6.1.tgz"; - path = fetchurl { - name = "lodash.restparam___lodash.restparam_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; - }; - } - { name = "lodash.some___lodash.some_4.6.0.tgz"; path = fetchurl { name = "lodash.some___lodash.some_4.6.0.tgz"; @@ -6626,22 +7954,6 @@ }; } { - name = "lodash.template___lodash.template_3.6.2.tgz"; - path = fetchurl { - name = "lodash.template___lodash.template_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz"; - sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; - }; - } - { - name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz"; - path = fetchurl { - name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; - }; - } - { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -6658,11 +7970,11 @@ }; } { - name = "lodash___lodash_1.0.2.tgz"; + name = "lodash___lodash_4.17.15.tgz"; path = fetchurl { - name = "lodash___lodash_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; }; } { @@ -6674,6 +7986,22 @@ }; } { + name = "long___long_4.0.0.tgz"; + path = fetchurl { + name = "long___long_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; + sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; + }; + } + { + name = "longest_streak___longest_streak_2.0.3.tgz"; + path = fetchurl { + name = "longest_streak___longest_streak_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz"; + sha1 = "3de7a3f47ee18e9074ded8575b5c091f5d0a4105"; + }; + } + { name = "longest___longest_1.0.1.tgz"; path = fetchurl { name = "longest___longest_1.0.1.tgz"; @@ -6770,14 +8098,6 @@ }; } { - name = "make_iterator___make_iterator_1.0.1.tgz"; - path = fetchurl { - name = "make_iterator___make_iterator_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz"; - sha1 = "29b33f312aa8f547c4a5e490f56afcec99133ad6"; - }; - } - { name = "make_plural___make_plural_3.0.6.tgz"; path = fetchurl { name = "make_plural___make_plural_3.0.6.tgz"; @@ -6810,6 +8130,14 @@ }; } { + name = "map_stream___map_stream_0.0.7.tgz"; + path = fetchurl { + name = "map_stream___map_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz"; + sha1 = "8a1f07896d82b10926bd3744a2420009f88974a8"; + }; + } + { name = "map_visit___map_visit_1.0.0.tgz"; path = fetchurl { name = "map_visit___map_visit_1.0.0.tgz"; @@ -6818,6 +8146,14 @@ }; } { + name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; + path = fetchurl { + name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; + sha1 = "6155e10416efaafab665d466ce598216375195f5"; + }; + } + { name = "markdown_it_abbr___markdown_it_abbr_1.0.4.tgz"; path = fetchurl { name = "markdown_it_abbr___markdown_it_abbr_1.0.4.tgz"; @@ -6930,11 +8266,19 @@ }; } { - name = "marked___marked_0.6.2.tgz"; + name = "markdown_table___markdown_table_1.1.3.tgz"; path = fetchurl { - name = "marked___marked_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz"; - sha1 = "c574be8b545a8b48641456ca1dbe0e37b6dccc1a"; + name = "markdown_table___markdown_table_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz"; + sha1 = "9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"; + }; + } + { + name = "marked___marked_0.7.0.tgz"; + path = fetchurl { + name = "marked___marked_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz"; + sha1 = "b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"; }; } { @@ -6986,6 +8330,54 @@ }; } { + name = "mdast_util_compact___mdast_util_compact_1.0.3.tgz"; + path = fetchurl { + name = "mdast_util_compact___mdast_util_compact_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz"; + sha1 = "98a25cc8a7865761a41477b3a87d1dcef0b1e79d"; + }; + } + { + name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; + path = fetchurl { + name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz"; + sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7"; + }; + } + { + name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; + path = fetchurl { + name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz"; + sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675"; + }; + } + { + name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; + path = fetchurl { + name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz"; + sha1 = "132001b266031192348d3366a6b011f28e54dc40"; + }; + } + { + name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; + path = fetchurl { + name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz"; + sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d"; + }; + } + { + name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; + path = fetchurl { + name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz"; + sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934"; + }; + } + { name = "mdn_data___mdn_data_1.1.4.tgz"; path = fetchurl { name = "mdn_data___mdn_data_1.1.4.tgz"; @@ -7010,14 +8402,6 @@ }; } { - name = "mem___mem_1.1.0.tgz"; - path = fetchurl { - name = "mem___mem_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; - }; - } - { name = "mem___mem_4.3.0.tgz"; path = fetchurl { name = "mem___mem_4.3.0.tgz"; @@ -7050,11 +8434,11 @@ }; } { - name = "mermaid___mermaid_7.1.2.tgz"; + name = "mermaid___mermaid_8.2.3.tgz"; path = fetchurl { - name = "mermaid___mermaid_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-7.1.2.tgz"; - sha1 = "6265728156c2e0891e004cba60a44022174487ad"; + name = "mermaid___mermaid_8.2.3.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.3.tgz"; + sha1 = "609bad45bedc3ee1a935161c11c3c22689cfecd9"; }; } { @@ -7071,8 +8455,8 @@ let repo = fetchgit { url = "https://github.com/codimd/meta-marked"; - rev = "04fd9775b38566e41b71e3e63bd78717d3eb4445"; - sha256 = "196dx12l1zlshhr2vy4qfbgz13xdj24fm6z1ddrbfj3f86gsd8vk"; + rev = "30852d0efa633418865df179f5956cd3df0fd0b3"; + sha256 = "0d112jhxvp2zy3gwdp1cc5hk61h2ggfrjdjjhr6qhikf78w10080"; }; in runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' @@ -7162,6 +8546,14 @@ }; } { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { name = "mimic_fn___mimic_fn_1.2.0.tgz"; path = fetchurl { name = "mimic_fn___mimic_fn_1.2.0.tgz"; @@ -7186,6 +8578,14 @@ }; } { + name = "minify___minify_4.1.3.tgz"; + path = fetchurl { + name = "minify___minify_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/minify/-/minify-4.1.3.tgz"; + sha1 = "58467922d14303f55a3a28fa79641371955b8fbd"; + }; + } + { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; path = fetchurl { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; @@ -7306,6 +8706,22 @@ }; } { + name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; + path = fetchurl { + name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz"; + sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74"; + }; + } + { + name = "moment_mini___moment_mini_2.22.1.tgz"; + path = fetchurl { + name = "moment_mini___moment_mini_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz"; + sha1 = "bc32d73e43a4505070be6b53494b17623183420d"; + }; + } + { name = "moment_timezone___moment_timezone_0.5.25.tgz"; path = fetchurl { name = "moment_timezone___moment_timezone_0.5.25.tgz"; @@ -7354,14 +8770,6 @@ }; } { - name = "multipipe___multipipe_0.1.2.tgz"; - path = fetchurl { - name = "multipipe___multipipe_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz"; - sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; - }; - } - { name = "mustache___mustache_3.0.1.tgz"; path = fetchurl { name = "mustache___mustache_3.0.1.tgz"; @@ -7386,11 +8794,19 @@ }; } { - name = "mysql___mysql_2.17.1.tgz"; + name = "mysql2___mysql2_1.6.5.tgz"; path = fetchurl { - name = "mysql___mysql_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/mysql/-/mysql-2.17.1.tgz"; - sha1 = "62bba4a039a9b2f73638cd1652ce50fc6f682899"; + name = "mysql2___mysql2_1.6.5.tgz"; + url = "https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.5.tgz"; + sha1 = "6695304fa2ce793dda5c98e8bbec65cbd2e6cb9d"; + }; + } + { + name = "named_placeholders___named_placeholders_1.1.2.tgz"; + path = fetchurl { + name = "named_placeholders___named_placeholders_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz"; + sha1 = "ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"; }; } { @@ -7410,14 +8826,6 @@ }; } { - name = "natives___natives_1.1.6.tgz"; - path = fetchurl { - name = "natives___natives_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; - sha1 = "a603b4a498ab77173612b9ea1acdec4d980f00bb"; - }; - } - { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; @@ -7538,6 +8946,14 @@ }; } { + name = "node_releases___node_releases_1.1.26.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.26.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz"; + sha1 = "f30563edc5c7dc20cf524cc8652ffa7be0762937"; + }; + } + { name = "node_static___node_static_0.7.11.tgz"; path = fetchurl { name = "node_static___node_static_0.7.11.tgz"; @@ -7594,6 +9010,14 @@ }; } { + name = "normalize_url___normalize_url_1.9.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + } + { name = "normalize_url___normalize_url_3.3.0.tgz"; path = fetchurl { name = "normalize_url___normalize_url_3.3.0.tgz"; @@ -7602,6 +9026,14 @@ }; } { + name = "now_and_later___now_and_later_2.0.1.tgz"; + path = fetchurl { + name = "now_and_later___now_and_later_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz"; + sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c"; + }; + } + { name = "npm_bundled___npm_bundled_1.0.6.tgz"; path = fetchurl { name = "npm_bundled___npm_bundled_1.0.6.tgz"; @@ -7690,14 +9122,6 @@ }; } { - name = "object_assign___object_assign_3.0.0.tgz"; - path = fetchurl { - name = "object_assign___object_assign_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; - }; - } - { name = "object_assign___object_assign_4.1.1.tgz"; path = fetchurl { name = "object_assign___object_assign_4.1.1.tgz"; @@ -7738,11 +9162,11 @@ }; } { - name = "object.defaults___object.defaults_1.1.0.tgz"; + name = "object.assign___object.assign_4.1.0.tgz"; path = fetchurl { - name = "object.defaults___object.defaults_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz"; - sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + name = "object.assign___object.assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; + sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; }; } { @@ -7754,14 +9178,6 @@ }; } { - name = "object.map___object.map_1.0.1.tgz"; - path = fetchurl { - name = "object.map___object.map_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz"; - sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; - }; - } - { name = "object.omit___object.omit_2.0.1.tgz"; path = fetchurl { name = "object.omit___object.omit_2.0.1.tgz"; @@ -7810,14 +9226,6 @@ }; } { - name = "once___once_1.3.3.tgz"; - path = fetchurl { - name = "once___once_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - } - { name = "one_time___one_time_0.0.4.tgz"; path = fetchurl { name = "one_time___one_time_0.0.4.tgz"; @@ -7866,19 +9274,11 @@ }; } { - name = "orchestrator___orchestrator_0.3.8.tgz"; + name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; path = fetchurl { - name = "orchestrator___orchestrator_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; - }; - } - { - name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz"; - path = fetchurl { - name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; + sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; } { @@ -7898,14 +9298,6 @@ }; } { - name = "os_locale___os_locale_2.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; - sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; - }; - } - { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { name = "os_locale___os_locale_3.1.0.tgz"; @@ -8058,6 +9450,14 @@ }; } { + name = "parse_entities___parse_entities_1.2.2.tgz"; + path = fetchurl { + name = "parse_entities___parse_entities_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz"; + sha1 = "c31bf0f653b6661354f8973559cb86dd1d5edf50"; + }; + } + { name = "parse_filepath___parse_filepath_1.0.2.tgz"; path = fetchurl { name = "parse_filepath___parse_filepath_1.0.2.tgz"; @@ -8106,6 +9506,22 @@ }; } { + name = "parse_path___parse_path_3.0.4.tgz"; + path = fetchurl { + name = "parse_path___parse_path_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz"; + sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4"; + }; + } + { + name = "parse_url___parse_url_3.0.2.tgz"; + path = fetchurl { + name = "parse_url___parse_url_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz"; + sha1 = "602787a7063a795d72b8673197505e72f60610be"; + }; + } + { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -8898,6 +10314,14 @@ }; } { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { name = "preserve___preserve_0.2.0.tgz"; path = fetchurl { name = "preserve___preserve_0.2.0.tgz"; @@ -8914,14 +10338,6 @@ }; } { - name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; - path = fetchurl { - name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; - sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; - }; - } - { name = "prismjs___prismjs_1.16.0.tgz"; path = fetchurl { name = "prismjs___prismjs_1.16.0.tgz"; @@ -8938,6 +10354,14 @@ }; } { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; path = fetchurl { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; @@ -8994,6 +10418,14 @@ }; } { + name = "property_information___property_information_4.2.0.tgz"; + path = fetchurl { + name = "property_information___property_information_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz"; + sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e"; + }; + } + { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; @@ -9002,6 +10434,14 @@ }; } { + name = "protocols___protocols_1.4.7.tgz"; + path = fetchurl { + name = "protocols___protocols_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz"; + sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32"; + }; + } + { name = "proxy_addr___proxy_addr_2.0.5.tgz"; path = fetchurl { name = "proxy_addr___proxy_addr_2.0.5.tgz"; @@ -9130,6 +10570,14 @@ }; } { + name = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } + { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; @@ -9234,6 +10682,14 @@ }; } { + name = "raw_body___raw_body_1.1.7.tgz"; + path = fetchurl { + name = "raw_body___raw_body_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz"; + sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; + }; + } + { name = "raw_loader___raw_loader_0.5.1.tgz"; path = fetchurl { name = "raw_loader___raw_loader_0.5.1.tgz"; @@ -9258,6 +10714,14 @@ }; } { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; + }; + } + { name = "read_pkg___read_pkg_2.0.0.tgz"; path = fetchurl { name = "read_pkg___read_pkg_2.0.0.tgz"; @@ -9266,6 +10730,14 @@ }; } { + name = "read_pkg___read_pkg_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + } + { name = "readable_stream___readable_stream_2.3.6.tgz"; path = fetchurl { name = "readable_stream___readable_stream_2.3.6.tgz"; @@ -9298,14 +10770,6 @@ }; } { - name = "readable_stream___readable_stream_1.1.14.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_1.1.14.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - } - { name = "readable_stream___readable_stream_2.0.6.tgz"; path = fetchurl { name = "readable_stream___readable_stream_2.0.6.tgz"; @@ -9314,6 +10778,14 @@ }; } { + name = "readable_stream___readable_stream_2.1.5.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + } + { name = "readdirp___readdirp_2.2.1.tgz"; path = fetchurl { name = "readdirp___readdirp_2.2.1.tgz"; @@ -9330,22 +10802,6 @@ }; } { - name = "rechoir___rechoir_0.6.2.tgz"; - path = fetchurl { - name = "rechoir___rechoir_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; - }; - } - { - name = "redefine___redefine_0.2.1.tgz"; - path = fetchurl { - name = "redefine___redefine_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/redefine/-/redefine-0.2.1.tgz"; - sha1 = "e89ee7a6f24d19fff62590569332dc60380a89a3"; - }; - } - { name = "reduce_component___reduce_component_1.0.1.tgz"; path = fetchurl { name = "reduce_component___reduce_component_1.0.1.tgz"; @@ -9402,6 +10858,14 @@ }; } { + name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; + sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + }; + } + { name = "regex_cache___regex_cache_0.4.4.tgz"; path = fetchurl { name = "regex_cache___regex_cache_0.4.4.tgz"; @@ -9418,6 +10882,14 @@ }; } { + name = "regexp_tree___regexp_tree_0.1.11.tgz"; + path = fetchurl { + name = "regexp_tree___regexp_tree_0.1.11.tgz"; + url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz"; + sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"; + }; + } + { name = "regexpp___regexpp_2.0.1.tgz"; path = fetchurl { name = "regexpp___regexpp_2.0.1.tgz"; @@ -9490,6 +10962,62 @@ }; } { + name = "remark_html___remark_html_8.0.0.tgz"; + path = fetchurl { + name = "remark_html___remark_html_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz"; + sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a"; + }; + } + { + name = "remark_parse___remark_parse_5.0.0.tgz"; + path = fetchurl { + name = "remark_parse___remark_parse_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz"; + sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95"; + }; + } + { + name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; + path = fetchurl { + name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz"; + sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab"; + }; + } + { + name = "remark_slug___remark_slug_5.1.2.tgz"; + path = fetchurl { + name = "remark_slug___remark_slug_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz"; + sha1 = "715ecdef8df1226786204b1887d31ab16aa24609"; + }; + } + { + name = "remark_stringify___remark_stringify_5.0.0.tgz"; + path = fetchurl { + name = "remark_stringify___remark_stringify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz"; + sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba"; + }; + } + { + name = "remark_toc___remark_toc_5.1.1.tgz"; + path = fetchurl { + name = "remark_toc___remark_toc_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz"; + sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78"; + }; + } + { + name = "remark___remark_9.0.0.tgz"; + path = fetchurl { + name = "remark___remark_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz"; + sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"; + }; + } + { name = "remarkable___remarkable_1.7.1.tgz"; path = fetchurl { name = "remarkable___remarkable_1.7.1.tgz"; @@ -9498,6 +11026,22 @@ }; } { + name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; + path = fetchurl { + name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; + sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53"; + }; + } + { + name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; + path = fetchurl { + name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; + sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; + }; + } + { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; @@ -9538,11 +11082,11 @@ }; } { - name = "replace_ext___replace_ext_0.0.1.tgz"; + name = "replace_ext___replace_ext_1.0.0.tgz"; path = fetchurl { - name = "replace_ext___replace_ext_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + name = "replace_ext___replace_ext_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; } { @@ -9594,6 +11138,14 @@ }; } { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { name = "require_relative___require_relative_0.8.7.tgz"; path = fetchurl { name = "require_relative___require_relative_0.8.7.tgz"; @@ -9610,14 +11162,6 @@ }; } { - name = "resolve_dir___resolve_dir_0.1.1.tgz"; - path = fetchurl { - name = "resolve_dir___resolve_dir_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz"; - sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; - }; - } - { name = "resolve_dir___resolve_dir_1.0.1.tgz"; path = fetchurl { name = "resolve_dir___resolve_dir_1.0.1.tgz"; @@ -9642,6 +11186,14 @@ }; } { + name = "resolve_options___resolve_options_1.1.0.tgz"; + path = fetchurl { + name = "resolve_options___resolve_options_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz"; + sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; + }; + } + { name = "resolve_url___resolve_url_0.2.1.tgz"; path = fetchurl { name = "resolve_url___resolve_url_0.2.1.tgz"; @@ -9650,6 +11202,22 @@ }; } { + name = "resolve___resolve_1.1.7.tgz"; + path = fetchurl { + name = "resolve___resolve_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + } + { + name = "resolve___resolve_1.12.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; + sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + }; + } + { name = "resolve___resolve_1.11.0.tgz"; path = fetchurl { name = "resolve___resolve_1.11.0.tgz"; @@ -9674,11 +11242,11 @@ }; } { - name = "retry_as_promised___retry_as_promised_2.3.2.tgz"; + name = "retry_as_promised___retry_as_promised_3.2.0.tgz"; path = fetchurl { - name = "retry_as_promised___retry_as_promised_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-2.3.2.tgz"; - sha1 = "cd974ee4fd9b5fe03cbf31871ee48221c07737b7"; + name = "retry_as_promised___retry_as_promised_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz"; + sha1 = "769f63d536bec4783549db0777cb56dadd9d8543"; }; } { @@ -9786,6 +11354,14 @@ }; } { + name = "rw___rw_1.3.3.tgz"; + path = fetchurl { + name = "rw___rw_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + } + { name = "rxjs___rxjs_6.5.2.tgz"; path = fetchurl { name = "rxjs___rxjs_6.5.2.tgz"; @@ -9802,6 +11378,22 @@ }; } { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { + name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; + path = fetchurl { + name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; + sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; + }; + } + { name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; path = fetchurl { name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; @@ -9882,6 +11474,14 @@ }; } { + name = "scope_css___scope_css_1.2.1.tgz"; + path = fetchurl { + name = "scope_css___scope_css_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz"; + sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e"; + }; + } + { name = "script_loader___script_loader_0.7.2.tgz"; path = fetchurl { name = "script_loader___script_loader_0.7.2.tgz"; @@ -9938,11 +11538,11 @@ }; } { - name = "semver___semver_4.3.6.tgz"; + name = "semver___semver_6.1.1.tgz"; path = fetchurl { - name = "semver___semver_4.3.6.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + name = "semver___semver_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz"; + sha1 = "53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"; }; } { @@ -9954,27 +11554,35 @@ }; } { - name = "sequelize_cli___sequelize_cli_2.8.0.tgz"; + name = "seq_queue___seq_queue_0.0.5.tgz"; path = fetchurl { - name = "sequelize_cli___sequelize_cli_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-2.8.0.tgz"; - sha1 = "4304cce60e499169603f838dedbab421c9849e74"; + name = "seq_queue___seq_queue_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz"; + sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"; }; } { - name = "sequelize___sequelize_3.34.0.tgz"; + name = "sequelize_cli___sequelize_cli_5.5.0.tgz"; path = fetchurl { - name = "sequelize___sequelize_3.34.0.tgz"; - url = "https://registry.yarnpkg.com/sequelize/-/sequelize-3.34.0.tgz"; - sha1 = "edbceb53dd7c9e5a0fd6b35fb89565239e8f09e4"; + name = "sequelize_cli___sequelize_cli_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.0.tgz"; + sha1 = "b0570352f70eaa489a25dccf55cf316675d6ff06"; }; } { - name = "sequencify___sequencify_0.0.7.tgz"; + name = "sequelize_pool___sequelize_pool_2.2.0.tgz"; path = fetchurl { - name = "sequencify___sequencify_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; + name = "sequelize_pool___sequelize_pool_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.2.0.tgz"; + sha1 = "fd4eb05ccefb5df5c23d2cc6fd934c20fd9c5dab"; + }; + } + { + name = "sequelize___sequelize_5.8.12.tgz"; + path = fetchurl { + name = "sequelize___sequelize_5.8.12.tgz"; + url = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.8.12.tgz"; + sha1 = "91f46f16789307d40c68f8c039c10d1d0f230ad2"; }; } { @@ -10066,11 +11674,11 @@ }; } { - name = "shimmer___shimmer_1.1.0.tgz"; + name = "shimmer___shimmer_1.2.1.tgz"; path = fetchurl { - name = "shimmer___shimmer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/shimmer/-/shimmer-1.1.0.tgz"; - sha1 = "97d7377137ffbbab425522e429fe0aa89a488b35"; + name = "shimmer___shimmer_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz"; + sha1 = "610859f7de327b587efebf501fb43117f9aff337"; }; } { @@ -10122,6 +11730,14 @@ }; } { + name = "slugify___slugify_1.3.4.tgz"; + path = fetchurl { + name = "slugify___slugify_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz"; + sha1 = "78d2792d7222b55cd9fc81fa018df99af779efeb"; + }; + } + { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; path = fetchurl { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; @@ -10186,6 +11802,14 @@ }; } { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } + { name = "source_list_map___source_list_map_2.0.1.tgz"; path = fetchurl { name = "source_list_map___source_list_map_2.0.1.tgz"; @@ -10258,11 +11882,11 @@ }; } { - name = "sparkles___sparkles_1.0.1.tgz"; + name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; path = fetchurl { - name = "sparkles___sparkles_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz"; - sha1 = "008db65edce6c50eec0c5e228e1945061dd0437c"; + name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz"; + sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa"; }; } { @@ -10402,6 +12026,14 @@ }; } { + name = "state_toggle___state_toggle_1.0.2.tgz"; + path = fetchurl { + name = "state_toggle___state_toggle_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz"; + sha1 = "75e93a61944116b4959d665c8db2d243631d6ddc"; + }; + } + { name = "static_extend___static_extend_0.1.2.tgz"; path = fetchurl { name = "static_extend___static_extend_0.1.2.tgz"; @@ -10434,6 +12066,14 @@ }; } { + name = "stream_array___stream_array_1.1.2.tgz"; + path = fetchurl { + name = "stream_array___stream_array_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz"; + sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5"; + }; + } + { name = "stream_browserify___stream_browserify_2.0.2.tgz"; path = fetchurl { name = "stream_browserify___stream_browserify_2.0.2.tgz"; @@ -10442,11 +12082,11 @@ }; } { - name = "stream_consume___stream_consume_0.1.1.tgz"; + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; path = fetchurl { - name = "stream_consume___stream_consume_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz"; - sha1 = "d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"; + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; } { @@ -10482,6 +12122,14 @@ }; } { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + } + { name = "string_loader___string_loader_0.0.1.tgz"; path = fetchurl { name = "string_loader___string_loader_0.0.1.tgz"; @@ -10498,6 +12146,14 @@ }; } { + name = "string_template___string_template_0.2.1.tgz"; + path = fetchurl { + name = "string_template___string_template_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz"; + sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + }; + } + { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; @@ -10522,19 +12178,19 @@ }; } { - name = "string___string_3.3.3.tgz"; + name = "string_width___string_width_4.1.0.tgz"; path = fetchurl { - name = "string___string_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz"; - sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; + name = "string_width___string_width_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz"; + sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff"; }; } { - name = "string_decoder___string_decoder_1.2.0.tgz"; + name = "string___string_3.3.3.tgz"; path = fetchurl { - name = "string_decoder___string_decoder_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz"; - sha1 = "fe86e738b19544afe70469243b2a1ee9240eae8d"; + name = "string___string_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz"; + sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; } { @@ -10546,6 +12202,14 @@ }; } { + name = "string_decoder___string_decoder_1.2.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz"; + sha1 = "fe86e738b19544afe70469243b2a1ee9240eae8d"; + }; + } + { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; @@ -10554,6 +12218,14 @@ }; } { + name = "stringify_entities___stringify_entities_1.3.2.tgz"; + path = fetchurl { + name = "stringify_entities___stringify_entities_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha1 = "a98417e5471fd227b3e45d3db1861c11caf668f7"; + }; + } + { name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; @@ -10586,14 +12258,6 @@ }; } { - name = "strip_bom___strip_bom_1.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; - }; - } - { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { name = "strip_bom___strip_bom_3.0.0.tgz"; @@ -10602,6 +12266,14 @@ }; } { + name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; + path = fetchurl { + name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz"; + sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89"; + }; + } + { name = "strip_eof___strip_eof_1.0.0.tgz"; path = fetchurl { name = "strip_eof___strip_eof_1.0.0.tgz"; @@ -10634,6 +12306,14 @@ }; } { + name = "subarg___subarg_1.0.0.tgz"; + path = fetchurl { + name = "subarg___subarg_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + } + { name = "superagent___superagent_1.8.3.tgz"; path = fetchurl { name = "superagent___superagent_1.8.3.tgz"; @@ -10738,22 +12418,6 @@ }; } { - name = "terraformer_wkt_parser___terraformer_wkt_parser_1.2.0.tgz"; - path = fetchurl { - name = "terraformer_wkt_parser___terraformer_wkt_parser_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz"; - sha1 = "c9d6ac3dff25f4c0bd344e961f42694961834c34"; - }; - } - { - name = "terraformer___terraformer_1.0.9.tgz"; - path = fetchurl { - name = "terraformer___terraformer_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/terraformer/-/terraformer-1.0.9.tgz"; - sha1 = "77851fef4a49c90b345dc53cf26809fdf29dcda6"; - }; - } - { name = "terser_webpack_plugin___terser_webpack_plugin_1.3.0.tgz"; path = fetchurl { name = "terser_webpack_plugin___terser_webpack_plugin_1.3.0.tgz"; @@ -10794,6 +12458,14 @@ }; } { + name = "through2_filter___through2_filter_3.0.0.tgz"; + path = fetchurl { + name = "through2_filter___through2_filter_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz"; + sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254"; + }; + } + { name = "through2___through2_0.6.5.tgz"; path = fetchurl { name = "through2___through2_0.6.5.tgz"; @@ -10818,14 +12490,6 @@ }; } { - name = "tildify___tildify_1.2.0.tgz"; - path = fetchurl { - name = "tildify___tildify_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz"; - sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; - }; - } - { name = "time_stamp___time_stamp_1.1.0.tgz"; path = fetchurl { name = "time_stamp___time_stamp_1.1.0.tgz"; @@ -10866,6 +12530,14 @@ }; } { + name = "tiny_lr___tiny_lr_1.1.1.tgz"; + path = fetchurl { + name = "tiny_lr___tiny_lr_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz"; + sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab"; + }; + } + { name = "tmp___tmp_0.0.29.tgz"; path = fetchurl { name = "tmp___tmp_0.0.29.tgz"; @@ -10882,6 +12554,14 @@ }; } { + name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; + path = fetchurl { + name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + }; + } + { name = "to_array___to_array_0.1.4.tgz"; path = fetchurl { name = "to_array___to_array_0.1.4.tgz"; @@ -10914,6 +12594,14 @@ }; } { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { name = "to_object_path___to_object_path_0.3.0.tgz"; path = fetchurl { name = "to_object_path___to_object_path_0.3.0.tgz"; @@ -10938,6 +12626,14 @@ }; } { + name = "to_through___to_through_2.0.0.tgz"; + path = fetchurl { + name = "to_through___to_through_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz"; + sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; + }; + } + { name = "toidentifier___toidentifier_1.0.0.tgz"; path = fetchurl { name = "toidentifier___toidentifier_1.0.0.tgz"; @@ -10978,6 +12674,14 @@ }; } { + name = "trim_lines___trim_lines_1.1.2.tgz"; + path = fetchurl { + name = "trim_lines___trim_lines_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz"; + sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b"; + }; + } + { name = "trim_right___trim_right_1.0.1.tgz"; path = fetchurl { name = "trim_right___trim_right_1.0.1.tgz"; @@ -10986,6 +12690,22 @@ }; } { + name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; + path = fetchurl { + name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; + sha1 = "d2f1e153161152e9f02fabc670fb40bec2ea2e3a"; + }; + } + { + name = "trim___trim_0.0.1.tgz"; + path = fetchurl { + name = "trim___trim_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + } + { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; @@ -10994,6 +12714,30 @@ }; } { + name = "trough___trough_1.0.4.tgz"; + path = fetchurl { + name = "trough___trough_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz"; + sha1 = "3b52b1f13924f460c3fbfd0df69b587dbcbc762e"; + }; + } + { + name = "try_catch___try_catch_2.0.0.tgz"; + path = fetchurl { + name = "try_catch___try_catch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz"; + sha1 = "a491141d597f8b72b46757fe1c47059341a16aed"; + }; + } + { + name = "try_to_catch___try_to_catch_1.1.1.tgz"; + path = fetchurl { + name = "try_to_catch___try_to_catch_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz"; + sha1 = "770162dd13b9a0e55da04db5b7f888956072038a"; + }; + } + { name = "tslib___tslib_1.9.3.tgz"; path = fetchurl { name = "tslib___tslib_1.9.3.tgz"; @@ -11122,6 +12866,14 @@ }; } { + name = "uglify_js___uglify_js_3.6.0.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz"; + sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5"; + }; + } + { name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; path = fetchurl { name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; @@ -11162,11 +12914,11 @@ }; } { - name = "umzug___umzug_1.12.0.tgz"; + name = "umzug___umzug_2.2.0.tgz"; path = fetchurl { - name = "umzug___umzug_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/umzug/-/umzug-1.12.0.tgz"; - sha1 = "a79c91f2862eee3130c6c347f2b90ad68a66e8b8"; + name = "umzug___umzug_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz"; + sha1 = "6160bdc1817e4a63a625946775063c638623e62e"; }; } { @@ -11218,6 +12970,14 @@ }; } { + name = "unherit___unherit_1.1.2.tgz"; + path = fetchurl { + name = "unherit___unherit_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz"; + sha1 = "14f1f397253ee4ec95cec167762e77df83678449"; + }; + } + { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; path = fetchurl { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; @@ -11250,6 +13010,14 @@ }; } { + name = "unified___unified_6.2.0.tgz"; + path = fetchurl { + name = "unified___unified_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz"; + sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba"; + }; + } + { name = "union_value___union_value_1.0.0.tgz"; path = fetchurl { name = "union_value___union_value_1.0.0.tgz"; @@ -11290,11 +13058,91 @@ }; } { - name = "unique_stream___unique_stream_1.0.0.tgz"; + name = "unique_stream___unique_stream_2.3.1.tgz"; + path = fetchurl { + name = "unique_stream___unique_stream_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz"; + sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"; + }; + } + { + name = "unist_builder___unist_builder_1.0.4.tgz"; path = fetchurl { - name = "unique_stream___unique_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + name = "unist_builder___unist_builder_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz"; + sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17"; + }; + } + { + name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; + path = fetchurl { + name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz"; + sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7"; + }; + } + { + name = "unist_util_is___unist_util_is_2.1.3.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.3.tgz"; + sha1 = "459182db31f4742fceaea88d429693cbf0043d20"; + }; + } + { + name = "unist_util_is___unist_util_is_3.0.0.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz"; + sha1 = "d9e84381c2468e82629e4a5be9d7d05a2dd324cd"; + }; + } + { + name = "unist_util_position___unist_util_position_3.0.3.tgz"; + path = fetchurl { + name = "unist_util_position___unist_util_position_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz"; + sha1 = "fff942b879538b242096c148153826664b1ca373"; + }; + } + { + name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; + path = fetchurl { + name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; + sha1 = "d91aa8b89b30cb38bad2924da11072faa64fd972"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; + sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3"; + }; + } + { + name = "unist_util_visit_parents___unist_util_visit_parents_2.1.2.tgz"; + path = fetchurl { + name = "unist_util_visit_parents___unist_util_visit_parents_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"; + sha1 = "25e43e55312166f3348cae6743588781d112c1e9"; + }; + } + { + name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; + path = fetchurl { + name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha1 = "4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"; }; } { @@ -11498,14 +13346,6 @@ }; } { - name = "validator___validator_5.7.0.tgz"; - path = fetchurl { - name = "validator___validator_5.7.0.tgz"; - url = "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz"; - sha1 = "7a87a58146b695ac486071141c0c49d67da05e5c"; - }; - } - { name = "validator___validator_9.4.1.tgz"; path = fetchurl { name = "validator___validator_9.4.1.tgz"; @@ -11514,6 +13354,14 @@ }; } { + name = "value_or_function___value_or_function_3.0.0.tgz"; + path = fetchurl { + name = "value_or_function___value_or_function_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz"; + sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; + }; + } + { name = "vary___vary_1.1.2.tgz"; path = fetchurl { name = "vary___vary_1.1.2.tgz"; @@ -11562,27 +13410,91 @@ }; } { - name = "vinyl_fs___vinyl_fs_0.3.14.tgz"; + name = "vfile_location___vfile_location_2.0.5.tgz"; + path = fetchurl { + name = "vfile_location___vfile_location_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz"; + sha1 = "c83eb02f8040228a8d2b3f10e485be3e3433e0a2"; + }; + } + { + name = "vfile_message___vfile_message_1.1.1.tgz"; path = fetchurl { - name = "vinyl_fs___vinyl_fs_0.3.14.tgz"; - url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; + name = "vfile_message___vfile_message_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz"; + sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1"; }; } { - name = "vinyl___vinyl_0.4.6.tgz"; + name = "vfile_message___vfile_message_2.0.1.tgz"; path = fetchurl { - name = "vinyl___vinyl_0.4.6.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + name = "vfile_message___vfile_message_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz"; + sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d"; }; } { - name = "vinyl___vinyl_0.5.3.tgz"; + name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; path = fetchurl { - name = "vinyl___vinyl_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz"; - sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; + name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz"; + sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e"; + }; + } + { + name = "vfile_sort___vfile_sort_2.2.1.tgz"; + path = fetchurl { + name = "vfile_sort___vfile_sort_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz"; + sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567"; + }; + } + { + name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; + path = fetchurl { + name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz"; + sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60"; + }; + } + { + name = "vfile___vfile_2.3.0.tgz"; + path = fetchurl { + name = "vfile___vfile_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz"; + sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a"; + }; + } + { + name = "vfile___vfile_4.0.1.tgz"; + path = fetchurl { + name = "vfile___vfile_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz"; + sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c"; + }; + } + { + name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; + path = fetchurl { + name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; + sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7"; + }; + } + { + name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; + path = fetchurl { + name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"; + sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; + }; + } + { + name = "vinyl___vinyl_2.2.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; + sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; }; } { @@ -11610,6 +13522,14 @@ }; } { + name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; + path = fetchurl { + name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz"; + sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc"; + }; + } + { name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; path = fetchurl { name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; @@ -11698,6 +13618,22 @@ }; } { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; + sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; + sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + }; + } + { name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; path = fetchurl { name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; @@ -11778,11 +13714,11 @@ }; } { - name = "wkx___wkx_0.2.0.tgz"; + name = "wkx___wkx_0.4.7.tgz"; path = fetchurl { - name = "wkx___wkx_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/wkx/-/wkx-0.2.0.tgz"; - sha1 = "76c24f16acd0cd8f93cd34aa331e0f7961256e84"; + name = "wkx___wkx_0.4.7.tgz"; + url = "https://registry.yarnpkg.com/wkx/-/wkx-0.4.7.tgz"; + sha1 = "ba0e4f9e785e95c9975856c1834f19a95c65cfb5"; }; } { @@ -11826,6 +13762,14 @@ }; } { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; @@ -11874,6 +13818,14 @@ }; } { + name = "x_is_string___x_is_string_0.1.0.tgz"; + path = fetchurl { + name = "x_is_string___x_is_string_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + } + { name = "x_xss_protection___x_xss_protection_1.1.0.tgz"; path = fetchurl { name = "x_xss_protection___x_xss_protection_1.1.0.tgz"; @@ -12002,19 +13954,19 @@ }; } { - name = "xtraverse___xtraverse_0.1.0.tgz"; + name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { - name = "xtraverse___xtraverse_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz"; - sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732"; + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; }; } { - name = "y18n___y18n_3.2.1.tgz"; + name = "xtraverse___xtraverse_0.1.0.tgz"; path = fetchurl { - name = "y18n___y18n_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + name = "xtraverse___xtraverse_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz"; + sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732"; }; } { @@ -12050,11 +14002,11 @@ }; } { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; + name = "yargs_parser___yargs_parser_13.1.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + name = "yargs_parser___yargs_parser_13.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; }; } { @@ -12066,11 +14018,11 @@ }; } { - name = "yargs___yargs_8.0.2.tgz"; + name = "yargs___yargs_13.2.4.tgz"; path = fetchurl { - name = "yargs___yargs_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + name = "yargs___yargs_13.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz"; + sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83"; }; } { diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 9c1e01745a8d..e848cb83c529 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "matomo"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - sha256 = "1mzqn2wh63ffzv6436cr8shl40nlj8sazsj2j37lx9pkz89n2wjz"; + sha256 = "1fbnmmzzsi3dfm9qm30wypxjcazl37mryaik9mlrb19hnp2md40q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix new file mode 100644 index 000000000000..4f47890cc87a --- /dev/null +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, writeText }: + +let + version = "3.7.1"; + stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); +in + +stdenv.mkDerivation rec { + pname = "moodle"; + inherit version; + + src = fetchurl { + url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; + sha256 = "0xfriw0nfaf9hlcjviwg2acwpd192jf2ahw8sw3s6bj3pr1isxmd"; + }; + + phpConfig = writeText "config.php" '' + <?php + return require(getenv('MOODLE_CONFIG')); + ?> + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/moodle + cp -r . $out/share/moodle + cp ${phpConfig} $out/share/moodle/config.php + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Free and open-source learning management system (LMS) written in PHP"; + license = licenses.gpl3Plus; + homepage = "https://moodle.org/"; + maintainers = with maintainers; [ aanderse ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index c4f49b36bf80..a53c726587f2 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib } : +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "pgpkeyserver-lite-${version}"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { cp -R 404.html assets favicon.ico index.html robots.txt $out ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/mattrude/pgpkeyserver-lite; description = "A lightweight static front-end for a sks keyserver."; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.calbrecht ]; + license = licenses.gpl3; + maintainers = with maintainers; [ calbrecht globin ]; }; } diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 59d3a387b606..6545151df230 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -51,6 +51,6 @@ buildPythonApplication rec { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz ]; + maintainers = with maintainers; [ matejc fpletz globin ]; }; } diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 64ae1dbbe1d5..0ec31e7dc4fa 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.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "1x3a2chagng749cv48zkvjvfwbggqskv6ckkbbmp4fx9qzy2c32k"; + sha256 = "1psijcmi24hk0gxh1zdsm299xj11i7find2045nnx3r96cgnwjpn"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3be672c29f17..66d4643de39f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2159,11 +2159,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sis-0.10.9"; + name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; - sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2; + sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 426b848a138d..beeffc21e562 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -117,7 +117,7 @@ mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5db000e7a4a2..7e092c523493 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "19.05"; - name = "ejabberd-${version}"; + version = "19.08"; + pname = "ejabberd"; src = fetchurl { - url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h"; + url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz"; + sha256 = "0ivkw31civcznv9k645hvrzn1yc6a4qsrsywjrakniwaaxlsnj8w"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1bdghq8vsr8y4rka4c8vbcmazw1avs2nlcp5id1cihvnscmyjbc3"; + outputHash = "0h1amqp2x6ir29bdh9x8bm0abj67k81nmkqi8gidwccsa5z94s2c"; }; configureFlags = diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 5a052df9e0a5..996bd6a8fb6e 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation rec { # build-time dependencies DateManip DBI DBDmysql LWP SysMmap # run-time dependencies not checked at build-time - ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate + ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate ]); nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index 560aef16644c..90bbc5e37dd6 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -8,4 +8,6 @@ patch: [ (patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") (patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") (patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") +(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") +(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") ] diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 48c8fd0815ec..9f1bf3ce6af1 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl }: -let - version = "0.6.0"; -in -stdenv.mkDerivation { - name = "oil-${version}"; + +stdenv.mkDerivation rec { + pname = "oil"; + version = "0.7.pre3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl"; + sha256 = "01zc36zaasaagr54rnh90k0j7pbnj0cc6a9pvz6gs6pk91i80lqg"; }; postPatch = '' @@ -22,10 +21,9 @@ stdenv.mkDerivation { dontStrip = true; meta = { + description = "A new unix shell"; homepage = https://www.oilshell.org/; - description = "A new unix shell, still in its early stages"; - license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 8a5956161e0d..3a6eb6378f0a 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,21 +1,21 @@ { stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl, pam, lttng-ust }: +, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }: 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" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl ] ++ + libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); 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/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 2c43bb420eba..2697050144b4 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.9"; + version = "0.9.10"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "0c6ywzn72clcclawgf1khwaaj3snn49fmajz8qfhc5mpbnvdp7q0"; + sha256 = "0dil7vannl8sblzz528503ich8m8g0ld0p496bgw6jjh0pzkdskc"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b74b2fc43f30..e9458520bb49 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/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 89e2a7a8031c..1a96d9b3acf7 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 be79e7626c55..a11b280b047e 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 1b6c540b3d88..173963135f87 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/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 516ed9da272b..b0ef813b455a 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -2,12 +2,12 @@ libpng, libtool, libxml2, pkgconfig, which, xorg }: stdenv.mkDerivation rec { name = "nx-libs-${version}"; - version = "3.5.99.20"; + version = "3.5.99.21"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "1c3xjbmnylw53h04g77lk9va1sk1dgg7zhirwz3mpn73r6dkyzix"; + sha256 = "10xid8mhhid5mrap5jb51k9fm63cm03ss4k4sfymc8zsn0wrqnr9"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig which diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index a9ebbff8203d..496fa422877a 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "1c4iyy4db7zhbfnng8h1r7d2fmng4zspgl9zfr8vc86sk5wmfnjc"; + sha256 = "0j2wci85918zsrrvd4qpcqv9bzhzj7qvjchvhvl11fn035jml5l0"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 2f925b11ba5c..4e400ee8a247 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "A tiny monitor calibration loader for X and MS-Windows"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index c72fab015d9f..066b566be1fe 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt docbook_xsl makeWrapper ]; preFixup = '' + # fallback values need to be last wrapProgram "$out/bin/xdg-user-dirs-update" \ - --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + --suffix XDG_CONFIG_DIRS : "$out/etc/xdg" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index e3bbd5990757..c49a3dedb126 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xkb-switch-${version}"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ierton"; repo = "xkb-switch"; rev = version; - sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78"; + sha256 = "11yn0y1kx04rqxh0d81b5q7kbyz58pi48bl7hyhlv7p8yndkfg4b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix index f5a264108359..92a47aa65638 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 d9c9042467c0..d25eef154b3c 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/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 863c02fb23dd..ffede7d58b22 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.5"; + version = "2.5.3"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x"; + sha256 = "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys"; }; patches = [ @@ -56,7 +56,7 @@ in buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pillow rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy pygobject3 pycairo gst-python pam - pyopengl paramiko opencv python-uinput pyxdg + pyopengl paramiko opencv4 python-uinput pyxdg ipaddress idna ]; diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index ac8107235be5..eb982682586b 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -1,15 +1,8 @@ +gdiff --git a/setup.py b/setup.py +index 8d3df15..6156206 100755 --- a/setup.py +++ b/setup.py -@@ -1885,7 +1885,7 @@ - if OSX: - pycairo = "py3cairo" - else: -- pycairo = "pycairo" -+ pycairo = "py3cairo" - cython_add(Extension("xpra.client.gtk3.cairo_workaround", - ["xpra/client/gtk3/cairo_workaround.pyx"], - **pkgconfig(pycairo) -@@ -2363,10 +2363,7 @@ +@@ -2359,10 +2359,7 @@ if v4l2_ENABLED: v4l2_pkgconfig = pkgconfig() #fuly warning: cython makes this difficult, #we have to figure out if "device_caps" exists in the headers: @@ -21,14 +14,16 @@ kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) cython_add(Extension("xpra.codecs.v4l2.pusher", +diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx +index bd7023d..064c6b5 100644 --- a/xpra/x11/bindings/keyboard_bindings.pyx +++ b/xpra/x11/bindings/keyboard_bindings.pyx -@@ -19,7 +19,7 @@ - +@@ -21,7 +21,7 @@ from libc.stdlib cimport free, malloc + DEF PATH_MAX = 1024 DEF DFLT_XKB_RULES_FILE = b"base" -DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb" +DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb" - + ################################### # Headers, python magic diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 3314089d746c..827a19d4bed7 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: stdenv.mkDerivation rec { name = "acme.sh-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "1xpci41494jrwf2qfnv83zwd1jd99ddpy1ardrshj9n4jdnzd19w"; + sha256 = "07bq6axgq33djp87kkx7c5cv8n80gclvj247n9j514zqly6abdxy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d0731c1f5996..68046be2eeea 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/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index a5e2df9ad212..aaf59d72f980 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.3.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh"; + sha256 = "0vyz02yli2lnzzzzy8dv9y5g69ljr671p1lgx84z8ys2ihwj3yc3"; }; - modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4"; + modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695"; subPackages = [ "cmd/eksctl" ]; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index ec31d3ebbe93..37a27127bab0 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,42 +1,77 @@ -{ stdenv, fetchurl, gobject-introspection -, gnutls, cairo, libtool, glib, pkgconfig -, cyrus_sasl, intltool, libpulseaudio -, libgcrypt, gtk3, vala, gnome3 -, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gobject-introspection +, gnutls +, cairo +, glib +, pkgconfig +, cyrus_sasl +, libpulseaudio +, libgcrypt +, gtk3 +, vala +, gettext +, perl +, gnome3 +, gdk-pixbuf +, zlib +}: stdenv.mkDerivation rec { - name = "gtk-vnc-${version}"; - version = "0.9.0"; + pname = "gtk-vnc"; + version = "1.0.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; }; - nativeBuildInputs = [ - python3 pkgconfig intltool libtool gobject-introspection vala + patches = [ + # Fix undeclared gio-unix-2.0 in example program. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch"; + sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4"; + }) ]; - buildInputs = [ - gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3 + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + vala + gettext + perl # for pod2man ]; - configureFlags = [ - "--with-examples" + buildInputs = [ + gnutls + cairo + gdk-pixbuf + zlib + glib + libgcrypt + cyrus_sasl + libpulseaudio + gtk3 ]; passthru = { updateScript = gnome3.updateScript { - packageName = "gtk-vnc"; + packageName = pname; versionPolicy = "none"; }; }; meta = with stdenv.lib; { - description = "A GTK VNC widget"; + description = "GTK VNC widget"; homepage = https://wiki.gnome.org/Projects/gtk-vnc; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 688ff3c7ca08..bf4261682cf9 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "lego"; - version = "2.6.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "0jxwdqqx6qn09jf658968s9vy9b59ji998j3x1hldq3w9wcrn6sn"; + sha256 = "0q73522yblcjsyscsppwnxfw6m249zr9whb93bhv5i5z012gy6mx"; }; - goPackagePath = "github.com/go-acme/lego"; + modSha256 = "00pl8l8h01rfxyd0l4487x55kfqhpm0ls84kxmgz3vph7irm6hcq"; meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 9d55e6bdefad..3c50a7948d90 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -51,7 +51,7 @@ buildGoPackage rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = https://linuxcontainers.org/lxd/; license = licenses.asl20; - maintainers = with maintainers; [ globin fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 288a2a31ed05..97abeadffc09 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 584a2dc46f74..6c587f5cc5c6 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 e9727e101a06..4bb9dd885743 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/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 262d3dd389eb..0503f9bad694 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qttools, alsaLib }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "1.5"; pname = "OPL3BankEditor"; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 02b37784eaa9..e5e26169b745 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 2fd67765aaf3..be8746932caf 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/borg/default.nix b/pkgs/tools/backup/borg/default.nix index beb3db5e78b3..593056f403ed 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { homepage = https://www.borgbackup.org; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ flokli dotlambda ]; + maintainers = with maintainers; [ flokli dotlambda globin ]; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dfa28203dbf2..91809af415a3 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/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index a2e962d7f855..4a18deeb57c8 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,4 +1,13 @@ -{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang +{stdenv +, fetchurl +, fetchpatch +, bzip2 +, zlib +, newt +, openssl +, pkgconfig +, slang +, autoreconfHook }: stdenv.mkDerivation { name = "partimage-0.6.9"; @@ -8,20 +17,19 @@ stdenv.mkDerivation { url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; + configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [bzip2 zlib newt newt openssl slang - # automake autoconf libtool gettext - ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ bzip2 zlib newt newt openssl slang ]; patches = [ ./gentoos-zlib.patch (fetchpatch { - name = "no-SSLv2.patch"; - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk" - + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e"; - sha256 = "17dfqwvwnkinz8vs0l3bjjbmfx3a7y8nv3wn67gjsqpmggcpdnd6"; + name = "openssl-1.1.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/partimage/files/" + + "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447"; + sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg"; }) ]; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 1bd8ebfd44b6..b71f032bd7ae 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/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 3b66ac1b491f..42a3f51ee609 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = https://github.com/wal-e/wal-e; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 3421045fe4c6..a794296bfd95 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }: +{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ]; + buildInputs = [ libxml2 lzma openssl zlib bzip2 fts autoconf ]; + + prePatch = '' + substituteInPlace configure.ac \ + --replace 'OpenSSL_add_all_ciphers' 'OPENSSL_init_crypto' \ + --replace 'openssl/evp.h' 'openssl/crypto.h' + ''; + + preConfigure = "./autogen.sh"; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 257396e04289..5a153393ccdb 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { - sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv"; + sha256 = "0mmgs98cfh92gcbjyv37vz8nq7x4x7fbzymlxyqd9awwpv9v0i5n"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 89016b3ff40f..830e5f10ef6d 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 000000000000..9ee0b8133260 --- /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 5fc614de4a7f..35e26828176d 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/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index e3ee04f6e2ea..95923f202cf4 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-07-13"; + version = "2019-08-21"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "692eadd6ca9b45f12971126b326b6a89d7117e67"; - sha256 = "0d2kqy5p89qjrk38iqfk9zsh14c2x40d21kic9kcybdhalfq5q31"; + rev = "72a408f84846fe702b8db4f158b678ee20bbf835"; + sha256 = "0y5700afv1x1i3wnp3g71i3zhyhkwmx79j0irxr63fmg47n0ys1i"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 168542f57df8..2ef70ca78479 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/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index dbdd0bf1790e..a96830feb2a5 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1qjkzpxv7zy9i6lvcrn8yp8dfsqak6c7ffx8g0xfavdx7am458ns"; + sha256 = "03sdnnq0x44jlwf41snrrma4hxdiixmhynw35gjhm84slpljnngp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index e915cc1c132a..606e41e582ee 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, +{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, @@ -15,25 +15,26 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "4.0.0"; + version = "6.5"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3"; + sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a"; }; + buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper - (python2.withPackages (pkgs: [ + acl sqlite liburcu attr makeWrapper utillinux + (python3.withPackages (pkgs: [ pkgs.flask pkgs.prettytable pkgs.requests pkgs.pyxattr ])) - # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`, + # NOTE: `python3` has to be *AFTER* the above `python3.withPackages`, # to ensure that the packages are available but the `toPythonPath` # shell function used in `postFixup` is also still available. - python2 + python3 ]; # Some of the headers reference acl propagatedBuildInputs = [ @@ -65,21 +66,15 @@ rec { inherit (s) name version; inherit buildInputs propagatedBuildInputs; - postPatch = '' - sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am - ''; - patches = [ - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed - ./glusterfs-use-PATH-instead-of-hardcodes.patch - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed - ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed - ./glusterfs-glusterfind-log-remote-node_cmd-error.patch ]; + postPatch = '' + sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + ''; + # Note that the VERSION file is something that is present in release tarballs # but not in git tags (at least not as of writing in v3.10.1). # That's why we have to create it. @@ -92,6 +87,7 @@ rec { preConfigure = '' echo "v${s.version}" > VERSION ./autogen.sh + export PYTHON=${python3}/bin/python ''; configureFlags = [ @@ -178,6 +174,9 @@ rec { # on a real TTY for testing purposes. echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path) $out/share/glusterfs/scripts/eventsdash.py --help + + # this gets falsely loaded as module by glusterfind + rm -r $out/bin/conf.py ''; src = fetchurl { diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index f679fb8f4c1b..f08d73cf3a65 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -18,10 +18,10 @@ index f87d8a454..b4d3f5d10 100644 fi GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" -+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" ++GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd" prefix=$old_prefix exec_prefix=$old_exec_prefix - --- + +-- 2.12.0 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch deleted file mode 100644 index 8bc00fdbf75c..000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 92a6b84a37e7e2e0ec0655ca45cedb64ab72080e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Fri, 8 Sep 2017 02:40:01 +0200 -Subject: [PATCH] glusterfind: Log remote stderr on `node_cmd` error. - -The problem of lost stderr was introduced in -commit feea851fad4f89b48bfe89fe3b75250cc7bd6501. - -Change-Id: Ic98f9bc9682ae3bd9c3ebea3855667fc8ba2843d ---- - tools/glusterfind/src/main.py | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py -index c125f970a..6fffce4b3 100644 ---- a/tools/glusterfind/src/main.py -+++ b/tools/glusterfind/src/main.py -@@ -75,12 +75,27 @@ def node_cmd(host, host_uuid, task, cmd, args, opts): - cmd = ["ssh", - "-oNumberOfPasswordPrompts=0", - "-oStrictHostKeyChecking=no", -+ # We force TTY allocation (-t -t) so that Ctrl+C is handed -+ # through; see: -+ # https://bugzilla.redhat.com/show_bug.cgi?id=1382236 -+ # Note that this turns stderr of the remote `cmd` -+ # into stdout locally. - "-t", - "-t", - "-i", pem_key_path, - "root@%s" % host] + cmd - -- execute(cmd, exit_msg="%s - %s failed" % (host, task), logger=logger) -+ (returncode, err, out) = execute(cmd, logger=logger) -+ if returncode != 0: -+ # Because the `-t -t` above turns the remote stderr into -+ # local stdout, we need to log both stderr and stdout -+ # here to print all error messages. -+ fail("%s - %s failed; stdout (including remote stderr):\n" -+ "%s\n" -+ "stderr:\n" -+ "%s" % (host, task, out, err), -+ returncode, -+ logger=logger) - - if opts.get("copy_outfile", False) and not localdir: - cmd_copy = ["scp", --- -2.12.0 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch deleted file mode 100644 index 4757f2fce771..000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch +++ /dev/null @@ -1,156 +0,0 @@ -From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Sat, 13 May 2017 18:54:36 +0200 -Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593 - -`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. - -Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8 ---- - api/examples/getvolfile.py | 2 +- - geo-replication/syncdaemon/libcxattr.py | 3 +-- - geo-replication/syncdaemon/libgfchangelog.py | 6 ++---- - tests/features/ipctest.py | 10 ++-------- - tests/utils/libcxattr.py | 5 ++--- - tools/glusterfind/src/libgfchangelog.py | 3 +-- - .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +-- - 7 files changed, 10 insertions(+), 22 deletions(-) - -diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py -index 0c95213f0..32c2268b3 100755 ---- a/api/examples/getvolfile.py -+++ b/api/examples/getvolfile.py -@@ -3,7 +3,7 @@ - import ctypes - import ctypes.util - --api = ctypes.CDLL(ctypes.util.find_library("gfapi")) -+api = ctypes.CDLL("libgfapi.so") - api.glfs_get_volfile.argtypes = [ctypes.c_void_p, - ctypes.c_void_p, - ctypes.c_ulong] -diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py -index 3671e102c..f576648b7 100644 ---- a/geo-replication/syncdaemon/libcxattr.py -+++ b/geo-replication/syncdaemon/libcxattr.py -@@ -10,7 +10,6 @@ - - import os - from ctypes import CDLL, create_string_buffer, get_errno --from ctypes.util import find_library - - - class Xattr(object): -@@ -25,7 +24,7 @@ class Xattr(object): - sizes we expect - """ - -- libc = CDLL(find_library("c"), use_errno=True) -+ libc = CDLL("libc.so.6", use_errno=True) - - @classmethod - def geterrno(cls): -diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py -index 334f5e9ea..093ae157a 100644 ---- a/geo-replication/syncdaemon/libgfchangelog.py -+++ b/geo-replication/syncdaemon/libgfchangelog.py -@@ -9,14 +9,12 @@ - # - - import os --from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \ -- get_errno, byref, c_ulong --from ctypes.util import find_library -+from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong - from syncdutils import ChangelogException, ChangelogHistoryNotAvailable - - - class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, - use_errno=True) - - @classmethod -diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py -index 5aff319b8..933924861 100755 ---- a/tests/features/ipctest.py -+++ b/tests/features/ipctest.py -@@ -1,14 +1,8 @@ - #!/usr/bin/python - - import ctypes --import ctypes.util -- --# find_library does not lookup LD_LIBRARY_PATH and may miss the --# function. In that case, retry with less portable but explicit name. --libgfapi = ctypes.util.find_library("gfapi") --if libgfapi == None: -- libgfapi = "libgfapi.so" --api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL) -+ -+api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL) - - api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ] - api.glfs_ipc.restype = ctypes.c_int -diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py -index 149db72e6..4e6e6c46d 100644 ---- a/tests/utils/libcxattr.py -+++ b/tests/utils/libcxattr.py -@@ -11,7 +11,6 @@ - import os - import sys - from ctypes import CDLL, c_int, create_string_buffer --from ctypes.util import find_library - - - class Xattr(object): -@@ -28,9 +27,9 @@ class Xattr(object): - - if sys.hexversion >= 0x02060000: - from ctypes import DEFAULT_MODE -- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True) -+ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True) - else: -- libc = CDLL(find_library("libc")) -+ libc = CDLL("libc.so.6") - - @classmethod - def geterrno(cls): -diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py -index 0f6b40d6c..9ca3f326b 100644 ---- a/tools/glusterfind/src/libgfchangelog.py -+++ b/tools/glusterfind/src/libgfchangelog.py -@@ -11,14 +11,13 @@ - import os - from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref - from ctypes import RTLD_GLOBAL --from ctypes.util import find_library - - - class ChangelogException(OSError): - pass - - --libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL) -+libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL) - - - def raise_oserr(): -diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -index 10e73c02b..2cdbf1152 100644 ---- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py -+++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -@@ -1,9 +1,8 @@ - import os - from ctypes import * --from ctypes.util import find_library - - class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) - - @classmethod - def geterrno(cls): --- -2.12.0 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch deleted file mode 100644 index acb15464e48f..000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Sat, 13 May 2017 02:45:49 +0200 -Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes - #1450546. - -Instead, rely on programs to be in PATH, as gluster already -does in many places across its code base. - -Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246 ---- - contrib/fuse-lib/mount-common.c | 8 ++++---- - xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++--- - xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++--- - xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++-- - xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +------------- - 5 files changed, 13 insertions(+), 25 deletions(-) - -diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c -index e9f80fe81..6380dd867 100644 ---- a/contrib/fuse-lib/mount-common.c -+++ b/contrib/fuse-lib/mount-common.c -@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt, - exit (1); - } - #ifdef GF_LINUX_HOST_OS -- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt, -+ execl ("umount", "umount", "-i", rel_mnt, - lazy ? "-l" : NULL, NULL); -- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s", -+ GFFUSE_LOGERR ("%s: failed to execute umount: %s", - progname, strerror (errno)); - #elif __NetBSD__ - /* exitting the filesystem causes the umount */ - exit (0); - #else -- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL); -- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s", -+ execl ("umount", "umount", "-f", rel_mnt, NULL); -+ GFFUSE_LOGERR ("%s: failed to execute umount: %s", - progname, strerror (errno)); - #endif /* GF_LINUX_HOST_OS */ - exit (1); -diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c -index 0e6629cf0..fcb4738b7 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-quota.c -+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c -@@ -30,7 +30,7 @@ - - #ifndef _PATH_SETFATTR - # ifdef GF_LINUX_HOST_OS --# define _PATH_SETFATTR "/usr/bin/setfattr" -+# define _PATH_SETFATTR "setfattr" - # endif - # ifdef __NetBSD__ - # define _PATH_SETFATTR "/usr/pkg/bin/setfattr" -@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, - - if (type == GF_QUOTA_OPTION_TYPE_ENABLE || - type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS) -- runner_add_args (&runner, "/usr/bin/find", ".", NULL); -+ runner_add_args (&runner, "find", ".", NULL); - - else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) { - -@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, - VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1", - "{}", "\\", ";", NULL); - #else -- runner_add_args (&runner, "/usr/bin/find", ".", -+ runner_add_args (&runner, "find", ".", - "-exec", _PATH_SETFATTR, "-n", - VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v", - "1", "{}", "\\", ";", NULL); -diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -index da0152366..f0d135350 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c -+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname, - } - - runinit (&runner); -- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name", -+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name", - device, NULL); - runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); - snprintf (msg, sizeof (msg), "Get volume group for device %s", device); -@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno) - - runinit (&runner); - -- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv", -+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv", - device, NULL); - runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); - runner_log (&runner, this->name, GF_LOG_DEBUG, msg); -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 51db13df0..6fa7b92f9 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -6027,7 +6027,6 @@ static struct fs_info { - char *fs_tool_pattern; - char *fs_tool_pkg; - } glusterd_fs[] = { -- /* some linux have these in /usr/sbin/and others in /sbin/? */ - { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" }, - { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, - { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, -@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) - char *trail = NULL; - runner_t runner = {0, }; - struct fs_info *fs = NULL; -- char fs_tool_name[256] = {0, }; - static dict_t *cached_fs = NULL; - - memset (key, 0, sizeof (key)); -@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) - cur_word = "N/A"; - goto cached; - } -- -- snprintf (fs_tool_name, sizeof (fs_tool_name), -- "/usr/sbin/%s", fs->fs_tool_name); -- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) -- runner_add_arg (&runner, fs_tool_name); -- else { -- snprintf (fs_tool_name, sizeof (fs_tool_name), -- "/sbin/%s", fs->fs_tool_name); -- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) -- runner_add_arg (&runner, fs_tool_name); -- } -+ runner_add_arg (&runner, fs->fs_tool_name); - break; - } - } --- -2.12.0 - diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 73227b3d9f03..1e89b5729c70 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 679704197c65..23a1f26db976 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'"; @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { homepage = http://www.argyllcms.com; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 035e135a2e40..2f4862b06458 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,32 +1,25 @@ -{ stdenv, fetchurl, fetchzip, giblib, xlibsWrapper }: +{ stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook +, autoconf-archive, libXfixes, libXcursor }: -let - debPatch = fetchzip { - url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz; - sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx"; - }; -in stdenv.mkDerivation rec { - name = "scrot-0.8-18"; + pname = "scrot"; + version = "1.2"; - src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; - sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; + src = fetchFromGitHub { + owner = "resurrecting-open-source-projects"; + repo = pname; + rev = version; + sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"; }; - postPatch = '' - for patch in $(cat ${debPatch}/patches/series); do - patch -p1 < "${debPatch}/patches/$patch" - done - ''; - - buildInputs = [ giblib xlibsWrapper ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive ]; + buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; meta = with stdenv.lib; { homepage = http://linuxbrit.co.uk/scrot/; description = "A command-line screen capture utility"; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ globin ]; license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 237c9bb398b1..ebd8953853c9 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg +{ mkDerivation, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns +, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "0.12.5"; name = "wkhtmltopdf-${version}"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender - qt5.qtwebkit qt5.qtsvg qt5.qtxmlpatterns + qtwebkit qtsvg qtxmlpatterns ]; prePatch = '' @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://wkhtmltopdf.org/; description = "Tools for rendering web pages to PDF or images"; longDescription = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 3f2ab1fc96a9..8e34cb860a65 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobject-introspection -, ibus, python3 }: +, ibus, python3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "ibus-table-${version}"; + pname = "ibus-table"; version = "1.9.21"; src = fetchFromGitHub { @@ -30,18 +30,29 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ])) + dconf + gtk3 + gobject-introspection + ibus + (python3.withPackages (pypkgs: with pypkgs; [ + pygobject3 + (toPythonModule ibus) + ])) ]; - nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + autoreconfHook + docbook2x + pkgconfig + python3.pkgs.wrapPython + wrapGAppsHook + ]; postUnpack = '' substituteInPlace $sourceRoot/engine/Makefile.am \ --replace "docbook2man" "docbook2man --sgml" ''; - postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; 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 2b2cc1a34992..2ee6944eeb3b 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/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix index 1115e4e232fc..56ddf93af45f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix @@ -4,7 +4,7 @@ let - hunspellDirs = with lib; makeSearchPath ":" (flatten (flip map langs (lang: [ + hunspellDirs = with lib; makeSearchPath ":" (flatten (forEach langs (lang: [ "${hunspellDicts.${lang}}/share/hunspell" "${hunspellDicts.${lang}}/share/myspell" "${hunspellDicts.${lang}}/share/myspell/dicts" diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile new file mode 100644 index 000000000000..17a1086d78f0 --- /dev/null +++ b/pkgs/tools/misc/3llo/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem '3llo', '0.3.0' diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock new file mode 100644 index 000000000000..0696ba341651 --- /dev/null +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + 3llo (0.3.0) + tty-prompt (~> 0.12.0) + equatable (0.6.1) + necromancer (0.4.0) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + tty-color (0.5.0) + tty-cursor (0.4.0) + tty-prompt (0.12.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.0) + tty-cursor (~> 0.4.0) + wisper (~> 1.6.1) + wisper (1.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + 3llo (= 0.3.0) + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix new file mode 100644 index 000000000000..1f59d1f16a78 --- /dev/null +++ b/pkgs/tools/misc/3llo/default.nix @@ -0,0 +1,31 @@ +{ lib, ruby, bundlerApp, fetchpatch }: + +bundlerApp { + pname = "3llo"; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + + gemset = lib.recursiveUpdate (import ./gemset.nix) ({ + "3llo" = { + dontBuild = false; + patches = [ + (fetchpatch { + url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch; + sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; + }) + ]; + }; + }); + + inherit ruby; + + exes = [ "3llo" ]; + + meta = with lib; { + description = "Trello interactive CLI on terminal"; + license = licenses.mit; + homepage = https://github.com/qcam/3llo; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix new file mode 100644 index 000000000000..5c50ea9b2122 --- /dev/null +++ b/pkgs/tools/misc/3llo/gemset.nix @@ -0,0 +1,85 @@ +{ + "3llo" = { + dependencies = ["tty-prompt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy"; + type = "gem"; + }; + version = "0.3.0"; + }; + equatable = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; + type = "gem"; + }; + version = "0.6.1"; + }; + necromancer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + type = "gem"; + }; + version = "0.4.0"; + }; + pastel = { + dependencies = ["equatable" "tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + type = "gem"; + }; + version = "0.7.3"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da"; + type = "gem"; + }; + version = "0.5.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; + type = "gem"; + }; + version = "0.4.0"; + }; + tty-prompt = { + dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; + type = "gem"; + }; + version = "0.12.0"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; + type = "gem"; + }; + version = "1.6.1"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 423fc9d85350..3b3a96e8b6e1 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -51,11 +51,11 @@ in sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/phillipberndt/autorandr/; description = "Automatically select a display configuration based on connected devices"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.coroa ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 2bde876c68c1..930d4dfaabac 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/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 8a269e3eb4b3..61d0bf60a4d6 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.8"; + version = "3.2.11"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; + sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; }; buildInputs = [ diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 00ab4cd75d0c..5055ce67d306 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 f15dfc2adba7..4eb6f302f1b0 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 4fb1bd535528..6641a58931dd 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/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fdb0f008a6cb..e913d5176839 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, substituteAll, udev +{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev , pkgconfig, qtbase, cmake, zlib, kmod }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "0.3.2"; name = "ckb-next-${version}"; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cmake ]; + cmakeFlags = [ + "-DINSTALL_DIR_ANIMATIONS=libexec" + ]; + patches = [ ./install-dirs.patch ./systemd-service.patch diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix new file mode 100644 index 000000000000..10347e6e794d --- /dev/null +++ b/pkgs/tools/misc/claws/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "claws"; + version = "0.3.2"; + + goPackagePath = "github.com/thehowl/${pname}"; + + src = fetchFromGitHub { + rev = version; + owner = "thehowl"; + repo = pname; + sha256 = "0nl7xvdivnabqr98mh3m1pwqznprsaqpagny6zcwwmz480x4pmfz"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/thehowl/claws"; + description = "Interactive command line client for testing websocket servers"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ petabyteboy ]; + }; +} 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 000000000000..ae1a02d4d202 --- /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 c80bb64d0bbd..cbe97dda9e5a 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/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 979b3be04933..47abcf79869d 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { name = "docui-${version}"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "1kbap36hccwlj273is98cvgf5z5cl2c3s6p46nh6bnykz3zqzs71"; + sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs"; }; - modSha256 = "1qma9bnd4k594cr5dcv74xns53mhfyl4jsm01chf85dxywjjd9vd"; + modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz"; meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = https://github.com/skanehira/docui; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aethelz ]; }; } diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index e2f2f51ccfb9..6cb01f14a2c0 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,38 +1,26 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dynamic-colors-${version}"; - version = "0.2.2.1"; + pname = "dynamic-colors"; + version = "0.2.2.2"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "dynamic-colors"; rev = "v${version}"; - sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw"; + sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5"; }; - dontBuild = true; - dontStrip = true; + PREFIX = placeholder "out"; - installPhase = '' - mkdir -p \ - $out/bin \ - $out/share/dynamic-colors/colorschemes \ - $out/share/bash-completion/completions \ - $out/share/zsh/site-packages - - install -m755 bin/dynamic-colors $out/bin/ - install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors - install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors - install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes - - substituteInPlace $out/bin/dynamic-colors \ + postPatch = '' + substituteInPlace bin/dynamic-colors \ --replace /usr/share/dynamic-colors $out/share/dynamic-colors ''; meta = with stdenv.lib; { description = "Change terminal colors on the fly"; - homepage = https://github.com/peterhoeg/dynamic-colors; + homepage = "https://github.com/peterhoeg/dynamic-colors"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 7c43638ea562..1447c70412b6 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -52,6 +52,6 @@ buildRustPackage rec { ''; homepage = https://the.exa.website; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball ]; + maintainers = with maintainers; [ ehegnes lilyball globin ]; }; } diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 64bceb355a29..91c1b3b70719 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir globin ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix new file mode 100644 index 000000000000..7b275220c197 --- /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/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 22697cfb24d3..73734ee5ea0f 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.49"; + version = "0.2.50"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "08x0kakhn75yzajxpvpdp1ml9z77i2x2k02kqcx3ssr6mbc7xnpf"; + sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh"; }; - cargoSha256 = "1dmkij25gj0ya1i6h5l7pkjnqvj02zvsx15hddbjn1q06pihcsjm"; + cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 6271eb599b58..8b7c2b430882 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, python27 }: +{ stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { name = "fpp-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; rev = version; - sha256 = "03n8sc2fvs2vk46jv6qfkjbyqz85yxnphvabji7qnmd3jv631w47"; + sha256 = "00916xx4scd4xr9zxqkyhilczi27f2qm5y042592wr79ddix4n9v"; }; postPatch = '' - substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27.interpreter}"' + substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python3.interpreter}"' ''; installPhase = '' diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index fddb1c99634d..d71227ae8f53 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri"; + sha256 = "0s3v8frflqqifyzq84xi6322wg8c9f5wcaic9zlpdf6wylqsiali"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 6834a555e4d5..49a2809b6042 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 000000000000..a42ed785de94 --- /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 bdb919006fd0..59ac70a8162f 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/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 451828b0f47b..828d4e4dab78 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }: +{ stdenv, fetchFromGitHub, python3Packages }: -stdenv.mkDerivation rec { - name = "grc-${version}"; +python3Packages.buildPythonApplication rec { + pname = "grc"; version = "1.11.3"; + format = "other"; src = fetchFromGitHub { owner = "garabik"; @@ -11,22 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; }; - buildInputs = with python3Packages; [ wrapPython makeWrapper ]; + postPatch = '' + for f in grc grcat; do + substituteInPlace $f \ + --replace /usr/local/ $out/ + done + ''; installPhase = '' runHook preInstall ./install.sh "$out" "$out" - - for f in $out/bin/* ; do - patchPythonScript $f - substituteInPlace $f \ - --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \ - --replace "'/etc/grc.conf'" "'$out/etc/grc.conf'" \ - --replace "'/usr/share/grc/'" "'$out/share/grc/'" - wrapProgram $f \ - --prefix PATH : $out/bin - done + install -Dm444 -t $out/share/zsh/vendor-completions _grc runHook postInstall ''; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 5080203d515c..6b0d5d3387c2 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 4777d5d53e6c..256243f3d5d1 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 000000000000..a12fa04c5fce --- /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/ix/default.nix b/pkgs/tools/misc/ix/default.nix new file mode 100644 index 000000000000..fdbd7611dce5 --- /dev/null +++ b/pkgs/tools/misc/ix/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, makeWrapper, curl }: + +stdenv.mkDerivation rec { + pname = "ix"; + version = "20190815"; + + src = fetchurl { + url = "http://ix.io/client"; + sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + install -Dm +x $src $out/bin/ix + ''; + + postFixup = '' + wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + ''; + + meta = with stdenv.lib; { + homepage = "http://ix.io"; + description = "Command line pastebin"; + maintainers = with maintainers; [ asymmetric ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 5c2e410cd930..ce343c7cc394 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index ea8f781e4055..a8ca200129a0 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.5.5"; + version = "0.7"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "0h2c1f9r67i6a8ppspsg1ln9rkm272092aaaw55sd15xxr51s4hb"; + sha256 = "0vai88g31yf55988paqzs7fqlxgi0ydrsgszzjig9ai3x9c52xim"; }; - modSha256 = "1lrrwcr95fxk4dlinyg74vqyxwwzagymncfps9bgig5v5d8gdd8j"; + modSha256 = "1iin1m6s9xxdskvj6jy2jwlqrsrm432ld13cpa28hpx7pylx61ij"; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 18177c0a7e30..8009fe563ee1 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin"; - version = "3.5.0"; + version = "3.6.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd"; + sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index bb7924515647..6b2e7d681706 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; + sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe7875..74b1f96fad8a 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/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 9b45680ffca2..0b7a7826a972 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 -, libxslt, libarchive, bzip2, lzma, json-glib +{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl +, libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "1pihjwajmahldxi3isnq6wcsbwj0hsnq8z5kp3w4j615ygrn0cgl"; + sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ]; + nativeBuildInputs = [ pkgconfig gettext perl ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; 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 000000000000..9c334436162b --- /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 0054e38ed2da..9f423cf6a4da 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 d3ef7e08357a..8da2fb82dd0e 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 f26a924c0d83..1eccd74bfa7d 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/pazi/cargo-lock.patch b/pkgs/tools/misc/pazi/cargo-lock.patch index 4be7aa44c9c7..3abc3f0a2f88 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 48c248ad2055..325ac044552a 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/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 970cf28c26d7..69bf9cafa536 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0680f360209c..409e65dff773 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/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 6c757ca224a9..ced15038b0c1 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -1,12 +1,10 @@ -{ - stdenv, fetchFromGitHub, - openssl +{ stdenv, fetchFromGitHub, fetchpatch +, openssl }: -let +stdenv.mkDerivation rec { + pname = "shallot"; version = "0.0.3"; -in stdenv.mkDerivation { - name = "shallot-${version}"; src = fetchFromGitHub { owner = "katmagic"; @@ -17,6 +15,21 @@ in stdenv.mkDerivation { buildInputs = [ openssl ]; + patches = [ + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/c913088dfaaaf249494514f20a62f2a17b5c6606.patch"; + sha256 = "19l1ppbxpdb0736f7plhybj08wh6rqk1lr3bxsp8jpzpnkh114b2"; + }) + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/cd6628d97b981325e700a38f408a43df426fd569.patch"; + sha256 = "1gaffp5wp1l5p2qdk0ix3i5fhzpx4xphl0haa6ajhqn8db7hbr9y"; + }) + (fetchpatch { + url = "https://github.com/katmagic/Shallot/commit/5c7c1ccecbbad5a121c50ba7153cbbee7ee0ebf9.patch"; + sha256 = "1zmll4iqz39zwk8vj40n1dpvyq3403l64p2127gsjgh2l2v91s4k"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp ./shallot $out/bin/ diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index b45304a43c4b..c0f877f4c414 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sl-${version}"; - version = "5.04"; + version = "5.05"; src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; rev = version; - sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; + sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix new file mode 100644 index 000000000000..e0bd36b21952 --- /dev/null +++ b/pkgs/tools/misc/starship/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "starship"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "starship"; + repo = "starship"; + rev = "v${version}"; + sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04"; + }; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ pkgconfig ]; + + cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c"; + checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; + + meta = with stdenv.lib; { + description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; + homepage = "https://starship.rs"; + license = licenses.isc; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5502f2542f12..15b8f1bf3b42 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,27 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip -, rtmpdump, gitMinimal }: +, gitMinimal }: let inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln"; + sha256 = "02yjz17x8dl5spn7mcbj1ji7vsyx0qwwa60zqyrdxpr03g1rnhdz"; }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; + buildInputs = [ python perl nose mock makeWrapper ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip ]; postPatch = '' - substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \ - --replace '"rtmpdump"' '"${rtmpdump}/bin/rtmpdump"' - substituteInPlace scripts/run-tests.sh \ --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 9b587c271546..8cbea666f123 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 760f56726fab..d79e480327c2 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/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix new file mode 100644 index 000000000000..5c858944b3fe --- /dev/null +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, libusb +}: + +stdenv.mkDerivation rec { + pname = "uhubctl"; + version = "unstable-2019-07-31"; + + src = fetchFromGitHub { + owner = "mvp"; + repo = "uhubctl"; + rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46"; + sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1"; + }; + + buildInputs = [ libusb ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mvp/uhubctl"; + description = "Utility to control USB power per-port on smart USB hubs"; + license = licenses.gpl2; + maintainers = with maintainers; [ prusnak ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 8e2342f4269e..7d2e5e0c367d 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = stdenv.lib.licenses.mit; inherit version; + maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index b3b1b4b310a7..8f79f5463e30 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; src = fetchFromGitHub { - owner = "pimutils"; + owner = "spk"; repo = pname; - rev = "ac45cf144b0ceb72cc2a9f454808688f3ac9ba4f"; - sha256 = "0hqsjdpgvm7d34q5b2hzmrzfxk43ald1bx22mvgg559kw1ck54s9"; + # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798 + rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9"; + sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28"; }; native = rustPlatform.buildRustPackage { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - cargoSha256 = "1qziwlf6nlkpxb1hamb7qsipqg9ibp871rimgpwil38vqmyd570s"; + cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; }; @@ -36,18 +37,6 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; - patches = [ - # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 - (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; - sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; - }) - (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch; - sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80"; - }) - ]; - postPatch = '' # Invalid argument: 'perform_health_check' is not a valid setting substituteInPlace tests/conftest.py \ @@ -74,7 +63,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer gebner ]; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix deleted file mode 100644 index 83b91f6203ed..000000000000 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, openssl }: - -stdenv.mkDerivation rec { - name = "vfdecrypt-${version}"; - version = "unstable-2010-08-13"; - - src = fetchFromGitHub { - owner = "Tomer1510"; - repo = "VFDecrypt"; - rev = "4e2fa32816254907e82886b936afcae9859a876c"; - sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; - }; - - buildInputs = [ openssl ]; - - installPhase = '' - mkdir -p $out/bin - cp vfdecrypt $out/bin - ''; - - meta = with stdenv.lib; { - description = "A cross platform dmg decryption tool"; - license = licenses.mit; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix new file mode 100644 index 000000000000..fa69cc4445ee --- /dev/null +++ b/pkgs/tools/misc/wev/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl +, pkg-config, scdoc +, wayland, wayland-protocols, libxkbcommon +}: + +let + version = "2019-08-11"; + commit = "47d17393473be152cf601272faf5704fff1c3f92"; +in stdenv.mkDerivation { + pname = "wev-unstable"; + inherit version; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz"; + sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga"; + }; + + nativeBuildInputs = [ pkg-config scdoc ]; + buildInputs = [ wayland wayland-protocols libxkbcommon ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Wayland event viewer"; + longDescription = '' + This is a tool for debugging events on a Wayland window, analagous to the + X11 tool xev. + ''; + homepage = https://git.sr.ht/~sircmpwn/wev; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 0e88e79eb1ba..9fb5399fd724 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0jhr4ywn5x5s15sczhdyyaqy3xh5z4zsx3g42ma26prpnr4gjczz"; + sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.1.0"; + version = "1.2.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e571f5333990..1fe58f945041 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/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 44b2f3451c1d..810c2f49a5ec 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8"; + sha256 = "087ms9i0n3rm8a0hvc4a2dk3rffbm6rmgz0m8gbjk6g37iml6nb7"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 4358d22142d9..5d1ebc748003 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: stdenv.mkDerivation rec { - version = "2.19"; - name = "arping-${version}"; + version = "2.20"; + pname = "arping"; buildInputs = [ libnet libpcap ]; src = fetchFromGitHub { owner = "ThomasHabets"; - repo = "arping"; - rev = "arping-${version}"; - sha256 = "10gpil6ic17x8v628vhz9s98rnw1k8ci2xs56i52pr103irirczw"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0gmyip552k6mq7013cvy5yc4akn2rz28s3g4x4vdq35vnxf66cyk"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 6aa357dacb64..afa6cef1524d 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 ce372f6b7524..e593bccbd1d5 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/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 33f004190e40..127244a29927 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = with maintainers; [ rickynils fpletz ]; + maintainers = with maintainers; [ fpletz ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix new file mode 100644 index 000000000000..2073c0b8497e --- /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 fbf7efb69339..d2ae24c8a710 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/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 315e12cc155e..bcc1f39e8fd3 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ eelco fpletz globin ]; }; } diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 50a3c98af0f7..9ddc1a35ce37 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl_1_1 }: +{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl }: let /* dsniff's build system unconditionnaly wants static libraries and does not @@ -33,8 +33,8 @@ let dontDisableStatic = true; }); ssl = symlinkJoin { - inherit (openssl_1_1) name; - paths = with openssl_1_1.override { static = true; }; [ out dev ]; + inherit (openssl) name; + paths = with openssl.override { static = true; }; [ out dev ]; }; in stdenv.mkDerivation { pname = "dsniff"; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 78dc52905d83..cfd4658f63f8 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/httping/default.nix b/pkgs/tools/networking/httping/default.nix index abde3f2a380d..1a6aeb57ab87 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { latency of the webserver + network. It supports IPv6. ''; license = licenses.agpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index d1640ebc43df..f88998902c58 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,20 +1,31 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..ff2d50d +index 0000000..731829e --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1205 @@ +@@ -0,0 +1,1403 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "advapi32-sys" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "aho-corasick" -+version = "0.7.3" ++version = "0.6.9" +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.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -22,7 +33,7 @@ index 0000000..ff2d50d +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -35,9 +46,9 @@ index 0000000..ff2d50d +version = "0.2.11" +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)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -77,8 +88,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.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -87,7 +98,7 @@ 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]] @@ -106,7 +117,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,30 +125,39 @@ 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.28 (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.2.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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.32.0" +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)", -+ "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)", ++ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -156,7 +176,16 @@ index 0000000..ff2d50d +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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "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]] @@ -164,10 +193,15 @@ index 0000000..ff2d50d +version = "0.2.3" +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 = "core-foundation-sys" ++version = "0.6.2" ++source = "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" @@ -177,19 +211,19 @@ index 0000000..ff2d50d + +[[package]] +name = "crc32fast" -+version = "1.2.0" ++version = "1.1.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.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ctrlc" -+version = "3.1.2" ++version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -199,20 +233,19 @@ index 0000000..ff2d50d + +[[package]] +name = "embed-resource" -+version = "1.2.0" ++version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "flate2" -+version = "1.0.7" ++version = "1.0.6" +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)", ++ "crc32fast 1.1.2 (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.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)", +] @@ -232,7 +265,7 @@ index 0000000..ff2d50d + +[[package]] +name = "fuchsia-cprng" -+version = "0.1.1" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -241,43 +274,53 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "getrandom" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (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" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "https" -+version = "1.5.0" ++version = "1.5.2" +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)", -+ "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)", ++ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.6 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.2.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)", + "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.1.0 (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.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hyper" -+version = "0.10.16" ++version = "0.10.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -285,7 +328,7 @@ index 0000000..ff2d50d + "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.9.0 (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)", @@ -299,11 +342,21 @@ index 0000000..ff2d50d +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)", ++ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "hyper-native-tls" ++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.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -318,12 +371,12 @@ index 0000000..ff2d50d +version = "0.6.0" +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 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-native-tls 0.2.4 (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)", + "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.9.0 (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)", @@ -335,6 +388,15 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -346,7 +408,7 @@ index 0000000..ff2d50d + +[[package]] +name = "lazy_static" -+version = "1.3.0" ++version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -356,7 +418,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]] @@ -372,7 +434,7 @@ index 0000000..ff2d50d +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.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -386,13 +448,17 @@ 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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "mime" @@ -418,8 +484,8 @@ index 0000000..ff2d50d +version = "0.1.11" +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.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -435,9 +501,9 @@ index 0000000..ff2d50d +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)", ++ "cc 1.0.28 (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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -452,23 +518,40 @@ index 0000000..ff2d50d +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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.14 (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)", +] + +[[package]] ++name = "native-tls" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.2.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.6 (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.14 (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.11.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)", -+ "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)", ++ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (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)", +] + @@ -487,38 +570,51 @@ index 0000000..ff2d50d + +[[package]] +name = "num_cpus" -+version = "1.10.0" ++version = "1.9.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)", +] + +[[package]] -+name = "numtoa" -+version = "0.1.0" ++name = "openssl" ++version = "0.9.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)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.2.0 (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" -+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.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.6 (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)", ++ "lazy_static 1.2.0 (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)", ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.28 (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.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)", +] + @@ -576,6 +672,11 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "ppv-lite86" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -585,11 +686,11 @@ index 0000000..ff2d50d +version = "0.4.6" +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)", ++ "fuchsia-cprng 0.1.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.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)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -598,16 +699,28 @@ index 0000000..ff2d50d +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)", ++ "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_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_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_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.1 (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)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.10 (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]] @@ -620,6 +733,15 @@ index 0000000..ff2d50d +] + +[[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" @@ -633,6 +755,14 @@ index 0000000..ff2d50d +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.10 (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 +771,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,34 +788,34 @@ index 0000000..ff2d50d + +[[package]] +name = "rand_jitter" -+version = "0.1.3" ++version = "0.1.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)", ++ "libc 0.2.62 (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)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_os" -+version = "0.1.3" ++version = "0.1.2" +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.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.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.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)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_pcg" -+version = "0.1.2" ++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)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -698,7 +836,7 @@ index 0000000..ff2d50d + +[[package]] +name = "redox_syscall" -+version = "0.1.54" ++version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -706,24 +844,24 @@ index 0000000..ff2d50d +version = "0.1.1" +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)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex" -+version = "1.1.6" ++version = "1.1.0" +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.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.5 (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.5" +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)", @@ -734,7 +872,7 @@ index 0000000..ff2d50d +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -742,7 +880,7 @@ index 0000000..ff2d50d +version = "0.1.0" +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 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -764,11 +902,11 @@ index 0000000..ff2d50d + +[[package]] +name = "schannel" -+version = "0.1.15" ++version = "0.1.14" +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)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -778,17 +916,36 @@ index 0000000..ff2d50d +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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "security-framework" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -845,12 +1002,15 @@ index 0000000..ff2d50d + +[[package]] +name = "smallvec" -+version = "0.6.9" ++version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "strsim" -+version = "0.8.0" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -881,19 +1041,31 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (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.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "termion" -+version = "1.5.2" ++version = "1.5.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)", -+ "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)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "textwrap" -+version = "0.11.0" ++version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -904,7 +1076,7 @@ index 0000000..ff2d50d +version = "0.3.6" +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)", ++ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -912,9 +1084,9 @@ 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)", -+ "winapi 0.3.7 (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.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -955,7 +1127,7 @@ index 0000000..ff2d50d + +[[package]] +name = "unicase" -+version = "2.3.0" ++version = "2.2.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 +1146,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.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -988,6 +1160,14 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "unreachable" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1031,26 +1211,18 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "vswhom" -+version = "0.1.0" ++name = "wasi" ++version = "0.5.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)", -+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] -+name = "vswhom-sys" -+version = "0.1.0" ++name = "winapi" ++version = "0.2.8" +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)", -+] + +[[package]] +name = "winapi" -+version = "0.3.7" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1058,6 +1230,11 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1069,15 +1246,18 @@ index 0000000..ff2d50d + +[[package]] +name = "winreg" -+version = "0.5.1" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[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 advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" ++"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" +"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" @@ -1092,38 +1272,44 @@ index 0000000..ff2d50d +"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" +"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 clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" ++"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" ++"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" +"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 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -+"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 crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" ++"checksum ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "630391922b1b893692c6334369ff528dcc3a9d8061ccf4c803aa8f83cb13db5e" +"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 embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "59edbe56442f96505f79c9116006f2e26c7f5655cccdc2c1546b2528c63bd612" ++"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4" +"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 fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e" +"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" -+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" ++"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c" +"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 itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"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 lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" +"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 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.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" +"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" @@ -1131,13 +1317,15 @@ index 0000000..ff2d50d +"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" +"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.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" +"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 num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" +"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 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" @@ -1145,30 +1333,37 @@ index 0000000..ff2d50d +"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 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.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_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_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0" ++"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d" ++"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" +"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_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" +"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 regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f" ++"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861" +"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" +"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 schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" ++"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" +"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" +"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" +"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 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" @@ -1176,13 +1371,14 @@ index 0000000..ff2d50d +"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 strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" ++"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" +"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 textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" ++"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" +"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" @@ -1191,11 +1387,12 @@ index 0000000..ff2d50d +"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.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90" +"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 unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +"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" @@ -1203,9 +1400,10 @@ index 0000000..ff2d50d +"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 winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"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" -+"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a" ++"checksum winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf285379f20d7f26abd990d9a566be9d31ab7a9d335299baaa1f0604f5f96af" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 21fc08a39a9e..b7ee85da9d8d 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.2"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0mb2wifz8pba03bdpiqadih33jimhg9crs4b72rcyfmj9l8fd1ba"; + sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6"; }; - 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 = "18qr3sy4zj4lwbzrz98d82kwagfbzkmrxk5sxl7w9vhdzy2diskw"; 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 81a43d672fdc..000000000000 --- 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/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index 642fd739335a..c888f354eae7 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation { configureFlags = [ "--with-openssl=${openssl.dev}" ]; + + patches = [ + (fetchurl { + url = https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch; + sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0"; + }) + ]; meta = { inherit (s) version; description = ''CLI email sending tool''; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index ae8d3d964832..c3a076076f14 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "memtier-benchmark-${version}"; - version = "1.2.11"; + version = "1.2.17"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "0a1lz4j9whj6yf94xn7rna00abgrv2qs30vmpns1n9zqlpaj6b6a"; + sha256 = "18cka6sv3w8ffa81126nzi04if9g1wd3i3apxsgmv7xm2p8fsa39"; }; patchPhase = '' diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 59242551f929..1acd513be31f 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; @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { description = "A network diagnostics tool"; homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2; - maintainers = with maintainers; [ koral orivej raskin ]; + maintainers = with maintainers; [ koral orivej raskin globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index f7df0740ba17..0fb11e1b0ebb 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom rickynils ]; + maintainers = with maintainers; [ phreedom ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f2c83c661ae3..95d37e164788 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 = [ @@ -118,7 +120,7 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; + maintainers = with maintainers; [ phreedom domenkozar obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 5ad3adfc9153..977683f26ccb 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.17"; in +let version = "1.6.18"; in stdenv.mkDerivation { name = "nfdump-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "1z8zpvd9jfi2raafcbkykw55y0hd4mp74jvna19h3k0g86mqkxya"; + sha256 = "0hfgj9lghkjrjxww0jdk8gxr6g4gbmbdmfg9ddg5jj6gcra21gha"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch new file mode 100644 index 000000000000..eb97209a693e --- /dev/null +++ b/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch @@ -0,0 +1,120 @@ +From 0e0994c9716700c9484b3dccb25f98a9a59d1744 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Fri, 23 Aug 2019 18:42:51 +0200 +Subject: [PATCH] Search connectors in OFONO_PLUGIN_PATH + +Previously, the connectors would only be looked for in a single +directory, specified during compilation. This patch allows to +traverse a list of directories provided by an environment variable. +--- + src/plugin.c | 77 ++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 50 insertions(+), 27 deletions(-) + +diff --git a/src/plugin.c b/src/plugin.c +index 924a45ec..f05055c3 100644 +--- a/src/plugin.c ++++ b/src/plugin.c +@@ -99,35 +99,12 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc, + return TRUE; + } + +-#include "builtin.h" +- +-int __ofono_plugin_init(const char *pattern, const char *exclude) +-{ +- gchar **patterns = NULL; +- gchar **excludes = NULL; +- GSList *list; +- GDir *dir; ++static handle_dir(const gchar *plugin_path, const gchar **patterns, const gchar **excludes) { + const gchar *file; + gchar *filename; +- unsigned int i; +- +- DBG(""); +- +- if (pattern) +- patterns = g_strsplit_set(pattern, ":, ", -1); +- +- if (exclude) +- excludes = g_strsplit_set(exclude, ":, ", -1); +- +- for (i = 0; __ofono_builtin[i]; i++) { +- if (check_plugin(__ofono_builtin[i], +- patterns, excludes) == FALSE) +- continue; +- +- add_plugin(NULL, __ofono_builtin[i]); +- } ++ GDir *dir; + +- dir = g_dir_open(PLUGINDIR, 0, NULL); ++ dir = g_dir_open(plugin_path, 0, NULL); + if (dir != NULL) { + while ((file = g_dir_read_name(dir)) != NULL) { + void *handle; +@@ -137,7 +114,7 @@ int __ofono_plugin_init(const char *pattern, const char *exclude) + g_str_has_suffix(file, ".so") == FALSE) + continue; + +- filename = g_build_filename(PLUGINDIR, file, NULL); ++ filename = g_build_filename(plugin_path, file, NULL); + + handle = dlopen(filename, RTLD_NOW); + if (handle == NULL) { +@@ -168,6 +145,52 @@ int __ofono_plugin_init(const char *pattern, const char *exclude) + + g_dir_close(dir); + } ++} ++ ++#include "builtin.h" ++ ++int __ofono_plugin_init(const char *pattern, const char *exclude) ++{ ++ gchar **patterns = NULL; ++ gchar **excludes = NULL; ++ GSList *list; ++ unsigned int i; ++ ++ DBG(""); ++ ++ if (pattern) ++ patterns = g_strsplit_set(pattern, ":, ", -1); ++ ++ if (exclude) ++ excludes = g_strsplit_set(exclude, ":, ", -1); ++ ++ for (i = 0; __ofono_builtin[i]; i++) { ++ if (check_plugin(__ofono_builtin[i], ++ patterns, excludes) == FALSE) ++ continue; ++ ++ add_plugin(NULL, __ofono_builtin[i]); ++ } ++ ++ ++ const gchar *plugin_path; ++ ++ plugin_path = g_getenv ("OFONO_PLUGIN_PATH"); ++ ++ if (!plugin_path) { ++ gchar **plugin_path_list; ++ gsize i; ++ ++ plugin_path_list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0); ++ ++ for (i = 0; plugin_path_list[i]; i++) { ++ handle_dir(plugin_path_list, patterns, excludes); ++ } ++ ++ g_strfreev(plugin_path_list); ++ } ++ ++ handle_dir(PLUGINDIR, patterns, excludes); + + for (list = plugins; list; list = list->next) { + struct ofono_plugin *plugin = list->data; +-- +2.22.0 + diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix new file mode 100644 index 000000000000..21d1f9ee0675 --- /dev/null +++ b/pkgs/tools/networking/ofono/default.nix @@ -0,0 +1,58 @@ +{ 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"; + }; + + patches = [ + ./0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ell + systemd + bluez + mobile-broadband-provider-info + ]; + + configureFlags = [ + "--with-dbusconfdir=${placeholder ''out''}/share" + "--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 363963b1b141..38255a68ffed 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.3"; + version = "4.1.0"; 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 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5"; + sha256 = "0pkibvhk1f999mg1zv2ikxzjpkrrbb0wwq5x0gzpmvr5sgywr6k4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 524b75d5582d..f750e3b1bfe1 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,8 +1,8 @@ # NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent # This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others -{ stdenv, fetchFromGitHub, pkgconfig -, libtool, autoconf, automake, cppunit -, openssl, libsigcxx, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, cppunit, openssl, libsigcxx, zlib +}: stdenv.mkDerivation rec { pname = "libtorrent"; @@ -15,10 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libtool autoconf automake cppunit openssl libsigcxx zlib ]; - - preConfigure = "./autogen.sh"; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ cppunit openssl libsigcxx zlib ]; meta = with stdenv.lib; { homepage = "https://github.com/rakshasa/libtorrent"; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 03270ce87881..6a97abfab590 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/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 0ed1150159d2..9901194f3c62 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchFromGitHub, openssl, autoreconfHook, nettle }: stdenv.mkDerivation rec { - name = "radsecproxy-${version}"; - version = "1.6.9"; + pname = "radsecproxy"; + version = "1.8.0"; - src = fetchurl { - url = "https://software.nordu.net/radsecproxy/radsecproxy-${version}.tar.xz"; - sha256 = "6f2c7030236c222782c9ac2c52778baa63540a1865b75a7a6d8c1280ce6ad816"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1268lbysa82b6h0101jzs0v6ixvmy3x0d0a8hw37sy95filsjmia"; }; - buildInputs = [ openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl nettle ]; configureFlags = [ "--with-ssl=${openssl.dev}" diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index e584354952a4..a11bebe0dca1 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A TCP port redirector for UNIX"; homepage = https://github.com/troglobit/redir; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ globin ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index 5b046c6eeab7..9400ccbb0724 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -1,15 +1,19 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { name = "sipcalc-${version}"; version = "1.1.6"; + src = fetchurl { url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz"; sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357"; }; - meta = { + + meta = with stdenv.lib; { description = "Advanced console ip subnet calculator"; homepage = http://www.routemeister.net/projects/sipcalc/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 11af161893fb..99f0301c7c86 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; + broken = true; # broken with openssl 1.1 }; } diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 2abdab773ddf..a9b0d04360ef 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { A featureful, flexible, scriptable, transaction-oriented SMTP test tool ''; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils ndowens ]; + maintainers = with maintainers; [ ndowens ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8a4722aa5214..e0a9a7e76ae3 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 1df0f2c37fc2..8f502c5ef3f6 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -1,61 +1,44 @@ -{ stdenv, lib, fetchFromGitHub, openssl, zlib, libpcap, boost, cairo, automake, autoconf, useCairo ? false }: +{ stdenv, lib, fetchFromGitHub, automake, autoconf +, openssl, zlib, libpcap, boost +, useCairo ? false, cairo +}: stdenv.mkDerivation rec { - baseName = "tcpflow"; - version = "1.4.6"; - name = "${baseName}-${version}"; + pname = "tcpflow"; + version = "1.5.2"; src = fetchFromGitHub { owner = "simsong"; - repo = "tcpflow"; - rev = "017687365b8233d16260f4afd7572c8ad8873cf6"; - sha256 = "002cqmn786sjysf59xnbb7lgr23nqqslb2gvy29q2xpnq6my9w38"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy"; + fetchSubmodules = true; }; - be13_api = fetchFromGitHub { - owner = "simsong"; - repo = "be13_api"; - rev = "8f4f4b3fe0b4815babb3a6fb595eb9a6d07e8a2e"; - sha256 = "1dlys702x3m8cr9kf4b9j8n28yh6knhwgqkm6a5yhh1grd8r3ksm"; - }; - - dfxml = fetchFromGitHub { - owner = "simsong"; - repo = "dfxml"; - rev = "13a8cc22189a8336d16777f2897ada6ae2ee59de"; - sha256 = "0wzhbkp4c8sp6wrk4ilz3skxp14scdnm3mw2xmxxrsifymzs2f5n"; - }; - - httpparser = fetchFromGitHub { - owner = "nodejs"; - repo = "http-parser"; - rev = "8d9e5db981b623fffc93657abacdc80270cbee58"; - sha256 = "0x17wwhrc7b2ngiqy0clnzn1zz2gbcz5n9m29pcyrcplly782k52"; - }; - - buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo; - - postUnpack = '' - pushd "$sourceRoot/src" - cp -rv ${be13_api}/* be13_api/ - cp -rv ${dfxml}/* dfxml/ - cp -rv ${httpparser}/* http-parser/ - chmod -R u+w dfxml - popd - ''; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ openssl zlib libpcap boost ] + ++ lib.optional useCairo cairo; prePatch = '' - substituteInPlace ./bootstrap.sh \ - --replace \ git 'echo git' \ - --replace /bin/rm rm + substituteInPlace bootstrap.sh \ + --replace ".git" "" \ + --replace "/bin/rm" "rm" + substituteInPlace configure.ac \ + --replace "1.5.1" "1.5.2" ''; preConfigure = "bash ./bootstrap.sh"; meta = with stdenv.lib; { - description = ''TCP stream extractor''; - license = licenses.gpl3 ; - maintainers = with maintainers; [ raskin obadz ]; + description = "TCP stream extractor"; + longDescription = '' + tcpflow is a program that captures data transmitted as part of TCP + connections (flows), and stores the data in a way that is convenient for + protocol analysis and debugging. + ''; + inherit (src.meta) homepage; + license = licenses.gpl3; + maintainers = with maintainers; [ primeos raskin obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/tcpflow/default.upstream b/pkgs/tools/networking/tcpflow/default.upstream deleted file mode 100644 index 72802e4d0469..000000000000 --- a/pkgs/tools/networking/tcpflow/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://www.digitalcorpora.org/downloads/tcpflow/ diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 111d40478df1..9667f1a74c5a 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "07pipvxxa4bw11f0fxm8vjwd5ap7i82nsq93sw1kj353jn1mpwxw"; + sha256 = "1cp2iaa9fhlxmbml41wnq984jp2r75n6w0qxz38rd24jxsj5vz06"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 861a61c8f38f..5702483b88bb 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = https://www.unbound.net; - maintainers = with maintainers; [ ehmry fpletz ]; + maintainers = with maintainers; [ ehmry fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 7cb489a3f213..125c83da4c4f 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pam, openssl}: +{ stdenv, fetchurl, fetchpatch, pam, openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "uw-imap-2007f"; src = fetchurl { @@ -12,14 +12,20 @@ stdenv.mkDerivation { then "osx" else "lnp" # Linux with PAM modules; # -fPIC is required to compile php with imap on x86_64 systems - + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"; + + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC" + + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " CC=${stdenv.hostPlatform.config}-gcc RANLIB=${stdenv.hostPlatform.config}-ranlib"; hardeningDisable = [ "format" ]; buildInputs = [ openssl ] ++ stdenv.lib.optional (!stdenv.isDarwin) pam; - patchPhase = '' + patches = [ (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/uw-imap.git/plain/debian/patches/1006_openssl1.1_autoverify.patch?id=b4df81d246a6cdbfd035c21f43e844effda3582b"; + sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7"; + }) ]; + + postPatch = '' sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},' sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,' sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' @@ -46,4 +52,11 @@ stdenv.mkDerivation { passthru = { withSSL = true; }; -} +} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + # This is set here to prevent rebuilds on native compilation. + # Configure phase is a no-op there, because this package doesn't use ./configure scripts. + configurePhase = '' + echo "Cross-compilation, injecting make flags" + makeFlagsArray+=("ARRC=${stdenv.hostPlatform.config}-ar rc") + ''; +}) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index ac87a5c10e9f..4ea09cd7f006 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }: +{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { } ); + configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ]; - buildInputs = [ openssl libpcap python2 ]; + buildInputs = [ openssl libpcap ] + ++ stdenv.lib.optional withPython python2; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ddac709e5772..ee72cf4d2d89 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.5.0"; + version = "5.5.1"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb"; + sha256 = "05dbc58dgq5ln28pahififljdb19gqicwlcmnni0vw4ny4r7r9bg"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index f918949a0277..ef6b0d5c6410 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.zx2c4.com/WireGuard/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 76a2dbd8850a..59bab468c536 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "14iwhlxmxsnvnm9rrp6rysiz461w0v5nsmnz5p91rfi351103a63"; + sha256 = "1b78jr33xawdkn8dcs884g6klj0zg4dazwhr1qhrj7x54bs7gizr"; }; preConfigure = '' diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix new file mode 100644 index 000000000000..51e4e22bc5b6 --- /dev/null +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "nixpkgs-fmt"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = "v${version}"; + sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1"; + }; + + cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa"; + + meta = with lib; { + description = "Nix code formatter for nixpkgs"; + homepage = "https://nix-community.github.io/nixpkgs-fmt"; + license = licenses.asl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/tools/package-management/cargo-download/Cargo.nix index 9735bde199dc..21740ce2ead1 100644 --- a/pkgs/tools/package-management/cargo-download/Cargo.nix +++ b/pkgs/tools/package-management/cargo-download/Cargo.nix @@ -1,3138 +1,675 @@ -# Generated by carnix 0.7.2: carnix nix -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; - include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: - let p = toString (src + ("/" + f)); in - (path == p) || (type == "directory" && lib.strings.hasPrefix path p) - ) includedFiles - ) src; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); +# Generated by carnix 0.10.0: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; in rec { - cargo_download = f: cargo_download_0_1_1 { features = cargo_download_0_1_1_features { cargo_download_0_1_1 = f; }; }; + crates = cratesIO; + cargo_download = crates.crates.cargo_download."0.1.2" deps; __all = [ (cargo_download {}) ]; - adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "adler32"; - version = "1.0.3"; - authors = [ "Remi Rampin <remirampin@gmail.com>" ]; - sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.5.3"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; - }; - ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.9.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ]; - sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; - inherit dependencies buildDependencies features; - }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "arrayvec"; - version = "0.4.7"; - authors = [ "bluss" ]; - sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; - inherit dependencies buildDependencies features; - }; - atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.11"; - authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; - inherit dependencies buildDependencies features; - }; - base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "base64"; - version = "0.9.2"; - authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ]; - sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1"; - inherit dependencies buildDependencies features; - }; - bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; - inherit dependencies buildDependencies features; - }; - build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "build_const"; - version = "0.2.1"; - authors = [ "Garrett Berg <vitiral@gmail.com>" ]; - sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl"; - inherit dependencies buildDependencies features; - }; - byteorder_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "1.2.3"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1xghv5f5rydzsam8lnfqhfk090i8a1knb77ikbs0ik44bvrw2ij3"; - inherit dependencies buildDependencies features; - }; - bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bytes"; - version = "0.4.9"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6"; - inherit dependencies buildDependencies features; - }; - cargo_download_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cargo-download"; - version = "0.1.1"; - authors = [ "Karol Kuczmarski <karol.kuczmarski@gmail.com>" ]; - sha256 = "1xiffk4df6i9cvwimzwyf1finv6w8f8gr0zjp21fzbiz5c0ksx65"; - crateBin = [ { name = "cargo-download"; } ]; - inherit dependencies buildDependencies features; - }; - case_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "case"; - version = "0.1.0"; - authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ]; - sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; - inherit dependencies buildDependencies features; - }; - cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.18"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.4"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4"; - inherit dependencies buildDependencies features; - }; - chrono_0_2_25_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "chrono"; - version = "0.2.25"; - authors = [ "Kang Seonghoon <public+rust@mearie.org>" ]; - sha256 = "0gsvqk8cnmm43qj3xyngqvfqh50cbdbqas7ik0wjgnvknirmmca7"; - inherit dependencies buildDependencies features; - }; - clap_2_32_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.32.0"; - authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; - inherit dependencies buildDependencies features; - }; - conv_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "conv"; - version = "0.3.3"; - authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; - sha256 = "08rl72k1a48xah0ar5l9v1bw19pp8jdw2pdkd3vvj9ijsyyg9yik"; - inherit dependencies buildDependencies features; - }; - core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; - inherit dependencies buildDependencies features; - }; - core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "core-foundation-sys"; - version = "0.2.3"; - authors = [ "The Servo Project Developers" ]; - sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crc"; - version = "1.8.1"; - authors = [ "Rui Hu <code@mrhooray.com>" ]; - sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s"; - inherit dependencies buildDependencies features; - }; - crossbeam_0_2_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam"; - version = "0.2.12"; - authors = [ "Aaron Turon <aturon@mozilla.com>" ]; - sha256 = "0jkm95is7bwv4parwfq4aim6cigiwd4w9hz09cpild4hp5ry625i"; - inherit dependencies buildDependencies features; - }; - crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-deque"; - version = "0.3.1"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap"; - inherit dependencies buildDependencies features; - }; - crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-epoch"; - version = "0.4.3"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3"; - inherit dependencies buildDependencies features; - }; - crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "crossbeam-utils"; - version = "0.3.2"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql"; - inherit dependencies buildDependencies features; - }; - custom_derive_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "custom_derive"; - version = "0.1.7"; - authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; - sha256 = "160q3pzri2fgrr6czfdkwy1sbddki2za96r7ivvyii52qp1523zs"; - inherit dependencies buildDependencies features; - }; - derive_error_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "derive-error"; - version = "0.0.3"; - authors = [ "rushmorem <rushmore@webenchanter.com>" ]; - sha256 = "0239vzxn5xr9nm3i4d6hmqy7dv8llcjblgh1xixfk5dcgcqan77y"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.3"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; - inherit dependencies buildDependencies features; - }; - either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - inherit dependencies buildDependencies features; - }; - encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "encoding_rs"; - version = "0.7.2"; - authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ]; - sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q"; - inherit dependencies buildDependencies features; - }; - exitcode_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "exitcode"; - version = "1.1.2"; - authors = [ "Ben Wilber <benwilber@gmail.com>" ]; - sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; - inherit dependencies buildDependencies features; - }; - filetime_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "filetime"; - version = "0.2.1"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1wmbj3jnpl39851lymw64j9ac1nmy1z96h1wymvlvypspl68w5y0"; - inherit dependencies buildDependencies features; - }; - flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "flate2"; - version = "0.2.20"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; - inherit dependencies buildDependencies features; - }; - foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "foreign-types"; - version = "0.3.2"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; - inherit dependencies buildDependencies features; - }; - foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "foreign-types-shared"; - version = "0.1.1"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures"; - version = "0.1.23"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21"; - inherit dependencies buildDependencies features; - }; - futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "futures-cpupool"; - version = "0.1.8"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c"; - inherit dependencies buildDependencies features; - }; - httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "httparse"; - version = "1.3.2"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper"; - version = "0.11.27"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi"; - inherit dependencies buildDependencies features; - }; - hyper_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hyper-tls"; - version = "0.1.3"; - authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; - sha256 = "1dr5arj79pdyz9f2jggqmna1qpc578f9pdgsf2ana5amjpsp0j89"; - inherit dependencies buildDependencies features; - }; - idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "idna"; - version = "0.1.5"; - authors = [ "The rust-url developers" ]; - sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; - inherit dependencies buildDependencies features; - }; - iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "iovec"; - version = "0.1.2"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; - inherit dependencies buildDependencies features; - }; - isatty_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "isatty"; - version = "0.1.8"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1n5wzzkb1kxkfbcyv5vfrsybika0a1k01sp06ngad73ljx4kwj5h"; - inherit dependencies buildDependencies features; - }; - itertools_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itertools"; - version = "0.6.5"; - authors = [ "bluss" ]; - sha256 = "0gbhgn7s8qkxxw10i514fzpqnc3aissn4kcgylm2cvnv9zmg8mw1"; - inherit dependencies buildDependencies features; - }; - itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.4.2"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "language-tags"; - version = "0.2.2"; - authors = [ "Pyfisch <pyfisch@gmail.com>" ]; - sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.11"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.2"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r"; - inherit dependencies buildDependencies features; - }; - lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazycell"; - version = "0.6.0"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ]; - sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r"; - inherit dependencies buildDependencies features; - }; - libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.42"; - authors = [ "The Rust Project Developers" ]; - sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx"; - inherit dependencies buildDependencies features; - }; - libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libflate"; - version = "0.1.16"; - authors = [ "Takeru Ohta <phjgt308@gmail.com>" ]; - sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n"; - inherit dependencies buildDependencies features; - }; - log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.3.9"; - authors = [ "The Rust Project Developers" ]; - sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; - inherit dependencies buildDependencies features; - }; - log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.4.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250"; - inherit dependencies buildDependencies features; - }; - maplit_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "maplit"; - version = "0.1.6"; - authors = [ "bluss" ]; - sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; - inherit dependencies buildDependencies features; - }; - matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "matches"; - version = "0.1.7"; - authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; - sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "0.1.11"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; - inherit dependencies buildDependencies features; - }; - memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memoffset"; - version = "0.2.1"; - authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ]; - sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; - inherit dependencies buildDependencies features; - }; - mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mime"; - version = "0.3.8"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3"; - inherit dependencies buildDependencies features; - }; - mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mime_guess"; - version = "2.0.0-alpha.6"; - authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; - sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; - inherit dependencies buildDependencies features; - }; - miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "miniz-sys"; - version = "0.1.10"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; - libPath = "lib.rs"; - libName = "miniz_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "mio"; - version = "0.6.15"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa"; - inherit dependencies buildDependencies features; - }; - miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "miow"; - version = "0.2.1"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; - inherit dependencies buildDependencies features; - }; - native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "native-tls"; - version = "0.1.5"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf"; - inherit dependencies buildDependencies features; - }; - net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "net2"; - version = "0.2.33"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; - inherit dependencies buildDependencies features; - }; - nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nodrop"; - version = "0.1.12"; - authors = [ "bluss" ]; - sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; - inherit dependencies buildDependencies features; - }; - num_0_1_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num"; - version = "0.1.42"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1632gczzrmmxdsj3jignwcr793jq8vxw3qkdzpdvbip3vaf1ljgq"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.39"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_iter_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1rglyvi4yjfxfvfm2s7i60g1dkl5xmsyi77g6vy53jb11r6wl8ly"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num_cpus"; - version = "1.8.0"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; - inherit dependencies buildDependencies features; - }; - openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl"; - version = "0.9.24"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.33"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6"; - build = "build/main.rs"; - inherit dependencies buildDependencies features; - }; - percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf"; - version = "0.7.22"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.22"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs"; - inherit dependencies buildDependencies features; - }; - phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.22"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k"; - inherit dependencies buildDependencies features; - }; - phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.22"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.12"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh"; - inherit dependencies buildDependencies features; - }; - quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.3.15"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; - inherit dependencies buildDependencies features; - }; - rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.22"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.40"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.1.80"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.3.9"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; - inherit dependencies buildDependencies features; - }; - relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "relay"; - version = "0.1.1"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r"; - inherit dependencies buildDependencies features; - }; - remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.1"; - authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; - sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; - inherit dependencies buildDependencies features; - }; - reqwest_0_8_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "reqwest"; - version = "0.8.6"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "0ka9ndgybhf65fn44badnjbasn1fi0mvjfa3sfiw485mgg21n3a0"; - inherit dependencies buildDependencies features; - }; - safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "safemem"; - version = "0.2.0"; - authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; - sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; - inherit dependencies buildDependencies features; - }; - schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "schannel"; - version = "0.1.13"; - authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ]; - sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3"; - inherit dependencies buildDependencies features; - }; - scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scoped-tls"; - version = "0.1.2"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla"; - inherit dependencies buildDependencies features; - }; - scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scopeguard"; - version = "0.3.3"; - authors = [ "bluss" ]; - sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; - inherit dependencies buildDependencies features; - }; - security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework"; - version = "0.1.16"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm"; - inherit dependencies buildDependencies features; - }; - security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "security-framework-sys"; - version = "0.1.16"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - inherit dependencies buildDependencies features; - }; - semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - inherit dependencies buildDependencies features; - }; - serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.70"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.24"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1"; - inherit dependencies buildDependencies features; - }; - serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_urlencoded"; - version = "0.5.2"; - authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ]; - sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0"; - inherit dependencies buildDependencies features; - }; - siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.2"; - authors = [ "Frank Denis <github@pureftpd.org>" ]; - sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; - inherit dependencies buildDependencies features; - }; - slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slab"; - version = "0.3.0"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k"; - inherit dependencies buildDependencies features; - }; - slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slab"; - version = "0.4.0"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; - inherit dependencies buildDependencies features; - }; - slog_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog"; - version = "1.7.1"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "1qhnwv2gbxmnwasaa0vlhddq6cdhq6n3l8d6h3ql73367h7aav65"; - inherit dependencies buildDependencies features; - }; - slog_envlogger_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog-envlogger"; - version = "0.5.0"; - authors = [ "The Rust Project Developers" "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0ry9k2ppj7z6prdz2kf924w7l9y2kbysrigca6shni1kz2j163qb"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - slog_extra_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog-extra"; - version = "0.1.2"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0jrw0xcc81wwcl59xx9qglfcv5l3ad5kbpcyp6ygk94p9kxfrhyj"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - slog_stdlog_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog-stdlog"; - version = "1.1.0"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0ig4mjixr4y3dn3s53rlnrpplwkqb8b0z2zkaiiiwyv7nhjxdg46"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - slog_stream_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog-stream"; - version = "1.2.1"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "03dwzbydaamfzjpr16gm065i696lk86gqcpspv5qaqyv938fm2yj"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - slog_term_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "slog-term"; - version = "1.5.0"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0zq2kyvm7jhqj6sc09w540wqfrrpa46yxf9sgzq7jqpkr66wsiar"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "smallvec"; - version = "0.2.1"; - authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; - sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2"; - libPath = "lib.rs"; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.11.11"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; - inherit dependencies buildDependencies features; - }; - synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; - inherit dependencies buildDependencies features; - }; - take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "take"; - version = "0.1.0"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd"; - inherit dependencies buildDependencies features; - }; - tar_0_4_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tar"; - version = "0.4.16"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0s36d0nzn2hs20y805wpmpc4asd1jhrpabqwcpqf5ha442fa7f3b"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.10.0"; - authors = [ "Martin Geisler <martin@geisler.net>" ]; - sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; - inherit dependencies buildDependencies features; - }; - thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread-id"; - version = "2.0.0"; - authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ]; - sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; - inherit dependencies buildDependencies features; - }; - thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.2.7"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; - inherit dependencies buildDependencies features; - }; - tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio"; - version = "0.1.7"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; - inherit dependencies buildDependencies features; - }; - tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-codec"; - version = "0.1.0"; - authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ]; - sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7"; - inherit dependencies buildDependencies features; - }; - tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-core"; - version = "0.1.17"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs"; - inherit dependencies buildDependencies features; - }; - tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-executor"; - version = "0.1.2"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48"; - inherit dependencies buildDependencies features; - }; - tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-fs"; - version = "0.1.2"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2"; - inherit dependencies buildDependencies features; - }; - tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-io"; - version = "0.1.7"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2"; - inherit dependencies buildDependencies features; - }; - tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-proto"; - version = "0.1.1"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66"; - inherit dependencies buildDependencies features; - }; - tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-reactor"; - version = "0.1.2"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m"; - inherit dependencies buildDependencies features; - }; - tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-service"; - version = "0.1.0"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; - inherit dependencies buildDependencies features; - }; - tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-tcp"; - version = "0.1.0"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh"; - inherit dependencies buildDependencies features; - }; - tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-threadpool"; - version = "0.1.5"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc"; - inherit dependencies buildDependencies features; - }; - tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-timer"; - version = "0.2.4"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi"; - inherit dependencies buildDependencies features; - }; - tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-tls"; - version = "0.1.4"; - authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp"; - inherit dependencies buildDependencies features; - }; - tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tokio-udp"; - version = "0.1.1"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9"; - inherit dependencies buildDependencies features; - }; - try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "try-lock"; - version = "0.1.0"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3"; - inherit dependencies buildDependencies features; - }; - unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicase"; - version = "1.4.2"; - authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; - sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicase"; - version = "2.1.0"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - inherit dependencies buildDependencies features; - }; - unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.7"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.5"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.0.4"; - authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "url"; - version = "1.7.1"; - authors = [ "The rust-url developers" ]; - sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "0.1.3"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; - inherit dependencies buildDependencies features; - }; - uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "uuid"; - version = "0.6.5"; - authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ]; - sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.4"; - authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.1"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; - sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; - inherit dependencies buildDependencies features; - }; - version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "version_check"; - version = "0.1.4"; - authors = [ "Sergio Benitez <sb@sergio.bz>" ]; - sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "want"; - version = "0.0.4"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.5"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ws2_32-sys"; - version = "0.2.1"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; - libName = "ws2_32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - xattr_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "xattr"; - version = "0.2.2"; - authors = [ "Steven Allen <steven@stebalien.com>" ]; - sha256 = "01zqnn6bhrd58hvpj3y1nqnbmlswrvsdapn2zbi7h1bh5lspiyk5"; - inherit dependencies buildDependencies features; - }; - adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {}; - adler32_1_0_3_features = f: updateFeatures f (rec { - adler32_1_0_3.default = (f.adler32_1_0_3.default or true); - }) []; - aho_corasick_0_5_3 = { features?(aho_corasick_0_5_3_features {}) }: aho_corasick_0_5_3_ { - dependencies = mapFeatures features ([ memchr_0_1_11 ]); - }; - aho_corasick_0_5_3_features = f: updateFeatures f (rec { - aho_corasick_0_5_3.default = (f.aho_corasick_0_5_3.default or true); - memchr_0_1_11.default = true; - }) [ memchr_0_1_11_features ]; - ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { - ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); - }) []; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.errhandlingapi = true; - winapi_0_3_5.processenv = true; - }) [ winapi_0_3_5_features ]; - arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ { - dependencies = mapFeatures features ([ nodrop_0_1_12 ]); - features = mkFeatures (features.arrayvec_0_4_7 or {}); - }; - arrayvec_0_4_7_features = f: updateFeatures f (rec { - arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true); - arrayvec_0_4_7.serde = - (f.arrayvec_0_4_7.serde or false) || - (f.arrayvec_0_4_7.serde-1 or false) || - (arrayvec_0_4_7.serde-1 or false); - arrayvec_0_4_7.std = - (f.arrayvec_0_4_7.std or false) || - (f.arrayvec_0_4_7.default or false) || - (arrayvec_0_4_7.default or false); - nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false); - }) [ nodrop_0_1_12_features ]; - atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - atty_0_2_11_features = f: updateFeatures f (rec { - atty_0_2_11.default = (f.atty_0_2_11.default or true); - libc_0_2_42.default = (f.libc_0_2_42.default or false); - termion_1_5_1.default = true; - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.minwinbase = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.processenv = true; - winapi_0_3_5.winbase = true; - }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ]; - base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ { - dependencies = mapFeatures features ([ byteorder_1_2_3 safemem_0_2_0 ]); - }; - base64_0_9_2_features = f: updateFeatures f (rec { - base64_0_9_2.default = (f.base64_0_9_2.default or true); - byteorder_1_2_3.default = true; - safemem_0_2_0.default = true; - }) [ byteorder_1_2_3_features safemem_0_2_0_features ]; - bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { - features = mkFeatures (features.bitflags_0_9_1 or {}); - }; - bitflags_0_9_1_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); - bitflags_0_9_1.example_generated = - (f.bitflags_0_9_1.example_generated or false) || - (f.bitflags_0_9_1.default or false) || - (bitflags_0_9_1.default or false); - }) []; - bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { - features = mkFeatures (features.bitflags_1_0_3 or {}); - }; - bitflags_1_0_3_features = f: updateFeatures f (rec { - bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); - }) []; - build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ { - features = mkFeatures (features.build_const_0_2_1 or {}); - }; - build_const_0_2_1_features = f: updateFeatures f (rec { - build_const_0_2_1.default = (f.build_const_0_2_1.default or true); - build_const_0_2_1.std = - (f.build_const_0_2_1.std or false) || - (f.build_const_0_2_1.default or false) || - (build_const_0_2_1.default or false); - }) []; - byteorder_1_2_3 = { features?(byteorder_1_2_3_features {}) }: byteorder_1_2_3_ { - features = mkFeatures (features.byteorder_1_2_3 or {}); - }; - byteorder_1_2_3_features = f: updateFeatures f (rec { - byteorder_1_2_3.default = (f.byteorder_1_2_3.default or true); - byteorder_1_2_3.std = - (f.byteorder_1_2_3.std or false) || - (f.byteorder_1_2_3.default or false) || - (byteorder_1_2_3.default or false); - }) []; - bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ { - dependencies = mapFeatures features ([ byteorder_1_2_3 iovec_0_1_2 ]); - features = mkFeatures (features.bytes_0_4_9 or {}); - }; - bytes_0_4_9_features = f: updateFeatures f (rec { - byteorder_1_2_3.default = true; - byteorder_1_2_3.i128 = - (f.byteorder_1_2_3.i128 or false) || - (bytes_0_4_9.i128 or false) || - (f.bytes_0_4_9.i128 or false); - bytes_0_4_9.default = (f.bytes_0_4_9.default or true); - iovec_0_1_2.default = true; - }) [ byteorder_1_2_3_features iovec_0_1_2_features ]; - cargo_download_0_1_1 = { features?(cargo_download_0_1_1_features {}) }: cargo_download_0_1_1_ { - dependencies = mapFeatures features ([ ansi_term_0_9_0 clap_2_32_0 conv_0_3_3 derive_error_0_0_3 exitcode_1_1_2 flate2_0_2_20 isatty_0_1_8 itertools_0_6_5 lazy_static_0_2_11 log_0_3_9 maplit_0_1_6 reqwest_0_8_6 semver_0_9_0 serde_json_1_0_24 slog_1_7_1 slog_envlogger_0_5_0 slog_stdlog_1_1_0 slog_stream_1_2_1 tar_0_4_16 time_0_1_40 ]); - }; - cargo_download_0_1_1_features = f: updateFeatures f (rec { - ansi_term_0_9_0.default = true; - cargo_download_0_1_1.default = (f.cargo_download_0_1_1.default or true); - clap_2_32_0.default = true; - conv_0_3_3.default = true; - derive_error_0_0_3.default = true; - exitcode_1_1_2.default = true; - flate2_0_2_20.default = true; - isatty_0_1_8.default = true; - itertools_0_6_5.default = true; - lazy_static_0_2_11.default = true; - log_0_3_9.default = true; - maplit_0_1_6.default = true; - reqwest_0_8_6.default = true; - semver_0_9_0.default = true; - serde_json_1_0_24.default = true; - slog_1_7_1.default = true; - slog_envlogger_0_5_0.default = true; - slog_stdlog_1_1_0.default = true; - slog_stream_1_2_1.default = true; - tar_0_4_16.default = true; - time_0_1_40.default = true; - }) [ ansi_term_0_9_0_features clap_2_32_0_features conv_0_3_3_features derive_error_0_0_3_features exitcode_1_1_2_features flate2_0_2_20_features isatty_0_1_8_features itertools_0_6_5_features lazy_static_0_2_11_features log_0_3_9_features maplit_0_1_6_features reqwest_0_8_6_features semver_0_9_0_features serde_json_1_0_24_features slog_1_7_1_features slog_envlogger_0_5_0_features slog_stdlog_1_1_0_features slog_stream_1_2_1_features tar_0_4_16_features time_0_1_40_features ]; - case_0_1_0 = { features?(case_0_1_0_features {}) }: case_0_1_0_ {}; - case_0_1_0_features = f: updateFeatures f (rec { - case_0_1_0.default = (f.case_0_1_0.default or true); - }) []; - cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_18 or {}); - }; - cc_1_0_18_features = f: updateFeatures f (rec { - cc_1_0_18.default = (f.cc_1_0_18.default or true); - cc_1_0_18.rayon = - (f.cc_1_0_18.rayon or false) || - (f.cc_1_0_18.parallel or false) || - (cc_1_0_18.parallel or false); - }) []; - cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {}; - cfg_if_0_1_4_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true); - }) []; - chrono_0_2_25 = { features?(chrono_0_2_25_features {}) }: chrono_0_2_25_ { - dependencies = mapFeatures features ([ num_0_1_42 time_0_1_40 ]); - }; - chrono_0_2_25_features = f: updateFeatures f (rec { - chrono_0_2_25.default = (f.chrono_0_2_25.default or true); - num_0_1_42.default = (f.num_0_1_42.default or false); - time_0_1_40.default = true; - }) [ num_0_1_42_features time_0_1_40_features ]; - clap_2_32_0 = { features?(clap_2_32_0_features {}) }: clap_2_32_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_10_0 unicode_width_0_1_5 ] - ++ (if features.clap_2_32_0.atty or false then [ atty_0_2_11 ] else []) - ++ (if features.clap_2_32_0.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_32_0.vec_map or false then [ vec_map_0_8_1 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_32_0.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_32_0 or {}); - }; - clap_2_32_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_11.default = true; - bitflags_1_0_3.default = true; - clap_2_32_0.ansi_term = - (f.clap_2_32_0.ansi_term or false) || - (f.clap_2_32_0.color or false) || - (clap_2_32_0.color or false); - clap_2_32_0.atty = - (f.clap_2_32_0.atty or false) || - (f.clap_2_32_0.color or false) || - (clap_2_32_0.color or false); - clap_2_32_0.clippy = - (f.clap_2_32_0.clippy or false) || - (f.clap_2_32_0.lints or false) || - (clap_2_32_0.lints or false); - clap_2_32_0.color = - (f.clap_2_32_0.color or false) || - (f.clap_2_32_0.default or false) || - (clap_2_32_0.default or false); - clap_2_32_0.default = (f.clap_2_32_0.default or true); - clap_2_32_0.strsim = - (f.clap_2_32_0.strsim or false) || - (f.clap_2_32_0.suggestions or false) || - (clap_2_32_0.suggestions or false); - clap_2_32_0.suggestions = - (f.clap_2_32_0.suggestions or false) || - (f.clap_2_32_0.default or false) || - (clap_2_32_0.default or false); - clap_2_32_0.term_size = - (f.clap_2_32_0.term_size or false) || - (f.clap_2_32_0.wrap_help or false) || - (clap_2_32_0.wrap_help or false); - clap_2_32_0.vec_map = - (f.clap_2_32_0.vec_map or false) || - (f.clap_2_32_0.default or false) || - (clap_2_32_0.default or false); - clap_2_32_0.yaml = - (f.clap_2_32_0.yaml or false) || - (f.clap_2_32_0.doc or false) || - (clap_2_32_0.doc or false); - clap_2_32_0.yaml-rust = - (f.clap_2_32_0.yaml-rust or false) || - (f.clap_2_32_0.yaml or false) || - (clap_2_32_0.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_10_0.default = true; - textwrap_0_10_0.term_size = - (f.textwrap_0_10_0.term_size or false) || - (clap_2_32_0.wrap_help or false) || - (f.clap_2_32_0.wrap_help or false); - unicode_width_0_1_5.default = true; - vec_map_0_8_1.default = true; - }) [ atty_0_2_11_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_10_0_features unicode_width_0_1_5_features vec_map_0_8_1_features ansi_term_0_11_0_features ]; - conv_0_3_3 = { features?(conv_0_3_3_features {}) }: conv_0_3_3_ { - dependencies = mapFeatures features ([ custom_derive_0_1_7 ]); - }; - conv_0_3_3_features = f: updateFeatures f (rec { - conv_0_3_3.default = (f.conv_0_3_3.default or true); - custom_derive_0_1_7.default = true; - }) [ custom_derive_0_1_7_features ]; - core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); - }; - core_foundation_0_2_3_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; - core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - }; - core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); - libc_0_2_42.default = true; - }) [ libc_0_2_42_features ]; - crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ { - buildDependencies = mapFeatures features ([ build_const_0_2_1 ]); - features = mkFeatures (features.crc_1_8_1 or {}); - }; - crc_1_8_1_features = f: updateFeatures f (rec { - build_const_0_2_1.default = true; - crc_1_8_1.default = (f.crc_1_8_1.default or true); - crc_1_8_1.std = - (f.crc_1_8_1.std or false) || - (f.crc_1_8_1.default or false) || - (crc_1_8_1.default or false); - }) [ build_const_0_2_1_features ]; - crossbeam_0_2_12 = { features?(crossbeam_0_2_12_features {}) }: crossbeam_0_2_12_ { - features = mkFeatures (features.crossbeam_0_2_12 or {}); - }; - crossbeam_0_2_12_features = f: updateFeatures f (rec { - crossbeam_0_2_12.default = (f.crossbeam_0_2_12.default or true); - }) []; - crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ { - dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]); - }; - crossbeam_deque_0_3_1_features = f: updateFeatures f (rec { - crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true); - crossbeam_epoch_0_4_3.default = true; - crossbeam_utils_0_3_2.default = true; - }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ]; - crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ { - dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ] - ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else [])); - features = mkFeatures (features.crossbeam_epoch_0_4_3 or {}); - }; - crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec { - arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false); - arrayvec_0_4_7.use_union = - (f.arrayvec_0_4_7.use_union or false) || - (crossbeam_epoch_0_4_3.nightly or false) || - (f.crossbeam_epoch_0_4_3.nightly or false); - cfg_if_0_1_4.default = true; - crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true); - crossbeam_epoch_0_4_3.lazy_static = - (f.crossbeam_epoch_0_4_3.lazy_static or false) || - (f.crossbeam_epoch_0_4_3.use_std or false) || - (crossbeam_epoch_0_4_3.use_std or false); - crossbeam_epoch_0_4_3.use_std = - (f.crossbeam_epoch_0_4_3.use_std or false) || - (f.crossbeam_epoch_0_4_3.default or false) || - (crossbeam_epoch_0_4_3.default or false); - crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false); - crossbeam_utils_0_3_2.use_std = - (f.crossbeam_utils_0_3_2.use_std or false) || - (crossbeam_epoch_0_4_3.use_std or false) || - (f.crossbeam_epoch_0_4_3.use_std or false); - lazy_static_1_0_2.default = true; - memoffset_0_2_1.default = true; - scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false); - }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ]; - crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.crossbeam_utils_0_3_2 or {}); - }; - crossbeam_utils_0_3_2_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true); - crossbeam_utils_0_3_2.use_std = - (f.crossbeam_utils_0_3_2.use_std or false) || - (f.crossbeam_utils_0_3_2.default or false) || - (crossbeam_utils_0_3_2.default or false); - }) [ cfg_if_0_1_4_features ]; - custom_derive_0_1_7 = { features?(custom_derive_0_1_7_features {}) }: custom_derive_0_1_7_ { - features = mkFeatures (features.custom_derive_0_1_7 or {}); - }; - custom_derive_0_1_7_features = f: updateFeatures f (rec { - custom_derive_0_1_7.default = (f.custom_derive_0_1_7.default or true); - custom_derive_0_1_7.std = - (f.custom_derive_0_1_7.std or false) || - (f.custom_derive_0_1_7.default or false) || - (custom_derive_0_1_7.default or false); - }) []; - derive_error_0_0_3 = { features?(derive_error_0_0_3_features {}) }: derive_error_0_0_3_ { - dependencies = mapFeatures features ([ case_0_1_0 quote_0_3_15 syn_0_11_11 ]); - }; - derive_error_0_0_3_features = f: updateFeatures f (rec { - case_0_1_0.default = true; - derive_error_0_0_3.default = (f.derive_error_0_0_3.default or true); - quote_0_3_15.default = true; - syn_0_11_11.default = true; - }) [ case_0_1_0_features quote_0_3_15_features syn_0_11_11_features ]; - dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {}; - dtoa_0_4_3_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true); - }) []; - either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_5_0 or {}); - }; - either_1_5_0_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or true); - either_1_5_0.use_std = - (f.either_1_5_0.use_std or false) || - (f.either_1_5_0.default or false) || - (either_1_5_0.default or false); - }) []; - encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.encoding_rs_0_7_2 or {}); - }; - encoding_rs_0_7_2_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true); - encoding_rs_0_7_2.simd = - (f.encoding_rs_0_7_2.simd or false) || - (f.encoding_rs_0_7_2.simd-accel or false) || - (encoding_rs_0_7_2.simd-accel or false); - }) [ cfg_if_0_1_4_features ]; - exitcode_1_1_2 = { features?(exitcode_1_1_2_features {}) }: exitcode_1_1_2_ {}; - exitcode_1_1_2_features = f: updateFeatures f (rec { - exitcode_1_1_2.default = (f.exitcode_1_1_2.default or true); - }) []; - filetime_0_2_1 = { features?(filetime_0_2_1_features {}) }: filetime_0_2_1_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []); - }; - filetime_0_2_1_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - filetime_0_2_1.default = (f.filetime_0_2_1.default or true); - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - }) [ cfg_if_0_1_4_features redox_syscall_0_1_40_features libc_0_2_42_features ]; - flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { - dependencies = mapFeatures features ([ libc_0_2_42 ] - ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); - features = mkFeatures (features.flate2_0_2_20 or {}); - }; - flate2_0_2_20_features = f: updateFeatures f (rec { - flate2_0_2_20.default = (f.flate2_0_2_20.default or true); - flate2_0_2_20.futures = - (f.flate2_0_2_20.futures or false) || - (f.flate2_0_2_20.tokio or false) || - (flate2_0_2_20.tokio or false); - flate2_0_2_20.libz-sys = - (f.flate2_0_2_20.libz-sys or false) || - (f.flate2_0_2_20.zlib or false) || - (flate2_0_2_20.zlib or false); - flate2_0_2_20.miniz-sys = - (f.flate2_0_2_20.miniz-sys or false) || - (f.flate2_0_2_20.default or false) || - (flate2_0_2_20.default or false); - flate2_0_2_20.tokio-io = - (f.flate2_0_2_20.tokio-io or false) || - (f.flate2_0_2_20.tokio or false) || - (flate2_0_2_20.tokio or false); - libc_0_2_42.default = true; - miniz_sys_0_1_10.default = true; - }) [ libc_0_2_42_features miniz_sys_0_1_10_features ]; - foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ { - dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]); - }; - foreign_types_0_3_2_features = f: updateFeatures f (rec { - foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true); - foreign_types_shared_0_1_1.default = true; - }) [ foreign_types_shared_0_1_1_features ]; - foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {}; - foreign_types_shared_0_1_1_features = f: updateFeatures f (rec { - foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true); - }) []; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { - bitflags_1_0_3.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ { - features = mkFeatures (features.futures_0_1_23 or {}); - }; - futures_0_1_23_features = f: updateFeatures f (rec { - futures_0_1_23.default = (f.futures_0_1_23.default or true); - futures_0_1_23.use_std = - (f.futures_0_1_23.use_std or false) || - (f.futures_0_1_23.default or false) || - (futures_0_1_23.default or false); - futures_0_1_23.with-deprecated = - (f.futures_0_1_23.with-deprecated or false) || - (f.futures_0_1_23.default or false) || - (futures_0_1_23.default or false); - }) []; - futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ { - dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]); - features = mkFeatures (features.futures_cpupool_0_1_8 or {}); - }; - futures_cpupool_0_1_8_features = f: updateFeatures f (rec { - futures_0_1_23.default = (f.futures_0_1_23.default or false); - futures_0_1_23.use_std = true; - futures_0_1_23.with-deprecated = - (f.futures_0_1_23.with-deprecated or false) || - (futures_cpupool_0_1_8.with-deprecated or false) || - (f.futures_cpupool_0_1_8.with-deprecated or false); - futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true); - futures_cpupool_0_1_8.with-deprecated = - (f.futures_cpupool_0_1_8.with-deprecated or false) || - (f.futures_cpupool_0_1_8.default or false) || - (futures_cpupool_0_1_8.default or false); - num_cpus_1_8_0.default = true; - }) [ futures_0_1_23_features num_cpus_1_8_0_features ]; - httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ { - features = mkFeatures (features.httparse_1_3_2 or {}); - }; - httparse_1_3_2_features = f: updateFeatures f (rec { - httparse_1_3_2.default = (f.httparse_1_3_2.default or true); - httparse_1_3_2.std = - (f.httparse_1_3_2.std or false) || - (f.httparse_1_3_2.default or false) || - (httparse_1_3_2.default or false); - }) []; - hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ { - dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ] - ++ (if features.hyper_0_11_27.tokio-proto or false then [ tokio_proto_0_1_1 ] else [])); - features = mkFeatures (features.hyper_0_11_27 or {}); - }; - hyper_0_11_27_features = f: updateFeatures f (rec { - base64_0_9_2.default = true; - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - futures_cpupool_0_1_8.default = true; - httparse_1_3_2.default = true; - hyper_0_11_27.default = (f.hyper_0_11_27.default or true); - hyper_0_11_27.http = - (f.hyper_0_11_27.http or false) || - (f.hyper_0_11_27.compat or false) || - (hyper_0_11_27.compat or false); - hyper_0_11_27.server-proto = - (f.hyper_0_11_27.server-proto or false) || - (f.hyper_0_11_27.default or false) || - (hyper_0_11_27.default or false); - hyper_0_11_27.tokio-proto = - (f.hyper_0_11_27.tokio-proto or false) || - (f.hyper_0_11_27.server-proto or false) || - (hyper_0_11_27.server-proto or false); - iovec_0_1_2.default = true; - language_tags_0_2_2.default = true; - log_0_4_3.default = true; - mime_0_3_8.default = true; - net2_0_2_33.default = true; - percent_encoding_1_0_1.default = true; - relay_0_1_1.default = true; - time_0_1_40.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_proto_0_1_1.default = true; - tokio_service_0_1_0.default = true; - unicase_2_1_0.default = true; - want_0_0_4.default = true; - }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ]; - hyper_tls_0_1_3 = { features?(hyper_tls_0_1_3_features {}) }: hyper_tls_0_1_3_ { - dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]); - }; - hyper_tls_0_1_3_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - hyper_0_11_27.default = true; - hyper_tls_0_1_3.default = (f.hyper_tls_0_1_3.default or true); - native_tls_0_1_5.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_service_0_1_0.default = true; - tokio_tls_0_1_4.default = true; - }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ]; - idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ { - dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); - }; - idna_0_1_5_features = f: updateFeatures f (rec { - idna_0_1_5.default = (f.idna_0_1_5.default or true); - matches_0_1_7.default = true; - unicode_bidi_0_3_4.default = true; - unicode_normalization_0_1_7.default = true; - }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; - iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ { - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); - }; - iovec_0_1_2_features = f: updateFeatures f (rec { - iovec_0_1_2.default = (f.iovec_0_1_2.default or true); - libc_0_2_42.default = true; - winapi_0_2_8.default = true; - }) [ libc_0_2_42_features winapi_0_2_8_features ]; - isatty_0_1_8 = { features?(isatty_0_1_8_features {}) }: isatty_0_1_8_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - isatty_0_1_8_features = f: updateFeatures f (rec { - isatty_0_1_8.default = (f.isatty_0_1_8.default or true); - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - winapi_0_3_5.consoleapi = true; - winapi_0_3_5.default = true; - winapi_0_3_5.fileapi = true; - winapi_0_3_5.minwinbase = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.processenv = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.winnt = true; - }) [ redox_syscall_0_1_40_features libc_0_2_42_features winapi_0_3_5_features ]; - itertools_0_6_5 = { features?(itertools_0_6_5_features {}) }: itertools_0_6_5_ { - dependencies = mapFeatures features ([ either_1_5_0 ]); - }; - itertools_0_6_5_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or false); - itertools_0_6_5.default = (f.itertools_0_6_5.default or true); - }) [ either_1_5_0_features ]; - itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ { - features = mkFeatures (features.itoa_0_4_2 or {}); - }; - itoa_0_4_2_features = f: updateFeatures f (rec { - itoa_0_4_2.default = (f.itoa_0_4_2.default or true); - itoa_0_4_2.std = - (f.itoa_0_4_2.std or false) || - (f.itoa_0_4_2.default or false) || - (itoa_0_4_2.default or false); - }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.language_tags_0_2_2 or {}); - }; - language_tags_0_2_2_features = f: updateFeatures f (rec { - language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); - language_tags_0_2_2.heapsize = - (f.language_tags_0_2_2.heapsize or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - language_tags_0_2_2.heapsize_plugin = - (f.language_tags_0_2_2.heapsize_plugin or false) || - (f.language_tags_0_2_2.heap_size or false) || - (language_tags_0_2_2.heap_size or false); - }) []; - lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_0_2_11 or {}); - }; - lazy_static_0_2_11_features = f: updateFeatures f (rec { - lazy_static_0_2_11.compiletest_rs = - (f.lazy_static_0_2_11.compiletest_rs or false) || - (f.lazy_static_0_2_11.compiletest or false) || - (lazy_static_0_2_11.compiletest or false); - lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); - lazy_static_0_2_11.nightly = - (f.lazy_static_0_2_11.nightly or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - lazy_static_0_2_11.spin = - (f.lazy_static_0_2_11.spin or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - }) []; - lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_2 or {}); - }; - lazy_static_1_0_2_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true); - lazy_static_1_0_2.nightly = - (f.lazy_static_1_0_2.nightly or false) || - (f.lazy_static_1_0_2.spin_no_std or false) || - (lazy_static_1_0_2.spin_no_std or false); - lazy_static_1_0_2.spin = - (f.lazy_static_1_0_2.spin or false) || - (f.lazy_static_1_0_2.spin_no_std or false) || - (lazy_static_1_0_2.spin_no_std or false); - }) []; - lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazycell_0_6_0 or {}); - }; - lazycell_0_6_0_features = f: updateFeatures f (rec { - lazycell_0_6_0.clippy = - (f.lazycell_0_6_0.clippy or false) || - (f.lazycell_0_6_0.nightly-testing or false) || - (lazycell_0_6_0.nightly-testing or false); - lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true); - lazycell_0_6_0.nightly = - (f.lazycell_0_6_0.nightly or false) || - (f.lazycell_0_6_0.nightly-testing or false) || - (lazycell_0_6_0.nightly-testing or false); - }) []; - libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ { - features = mkFeatures (features.libc_0_2_42 or {}); - }; - libc_0_2_42_features = f: updateFeatures f (rec { - libc_0_2_42.default = (f.libc_0_2_42.default or true); - libc_0_2_42.use_std = - (f.libc_0_2_42.use_std or false) || - (f.libc_0_2_42.default or false) || - (libc_0_2_42.default or false); - }) []; - libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ { - dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_3 crc_1_8_1 ]); - }; - libflate_0_1_16_features = f: updateFeatures f (rec { - adler32_1_0_3.default = true; - byteorder_1_2_3.default = true; - crc_1_8_1.default = true; - libflate_0_1_16.default = (f.libflate_0_1_16.default or true); - }) [ adler32_1_0_3_features byteorder_1_2_3_features crc_1_8_1_features ]; - log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { - dependencies = mapFeatures features ([ log_0_4_3 ]); - features = mkFeatures (features.log_0_3_9 or {}); - }; - log_0_3_9_features = f: updateFeatures f (rec { - log_0_3_9.default = (f.log_0_3_9.default or true); - log_0_3_9.use_std = - (f.log_0_3_9.use_std or false) || - (f.log_0_3_9.default or false) || - (log_0_3_9.default or false); - log_0_4_3.default = true; - log_0_4_3.max_level_debug = - (f.log_0_4_3.max_level_debug or false) || - (log_0_3_9.max_level_debug or false) || - (f.log_0_3_9.max_level_debug or false); - log_0_4_3.max_level_error = - (f.log_0_4_3.max_level_error or false) || - (log_0_3_9.max_level_error or false) || - (f.log_0_3_9.max_level_error or false); - log_0_4_3.max_level_info = - (f.log_0_4_3.max_level_info or false) || - (log_0_3_9.max_level_info or false) || - (f.log_0_3_9.max_level_info or false); - log_0_4_3.max_level_off = - (f.log_0_4_3.max_level_off or false) || - (log_0_3_9.max_level_off or false) || - (f.log_0_3_9.max_level_off or false); - log_0_4_3.max_level_trace = - (f.log_0_4_3.max_level_trace or false) || - (log_0_3_9.max_level_trace or false) || - (f.log_0_3_9.max_level_trace or false); - log_0_4_3.max_level_warn = - (f.log_0_4_3.max_level_warn or false) || - (log_0_3_9.max_level_warn or false) || - (f.log_0_3_9.max_level_warn or false); - log_0_4_3.release_max_level_debug = - (f.log_0_4_3.release_max_level_debug or false) || - (log_0_3_9.release_max_level_debug or false) || - (f.log_0_3_9.release_max_level_debug or false); - log_0_4_3.release_max_level_error = - (f.log_0_4_3.release_max_level_error or false) || - (log_0_3_9.release_max_level_error or false) || - (f.log_0_3_9.release_max_level_error or false); - log_0_4_3.release_max_level_info = - (f.log_0_4_3.release_max_level_info or false) || - (log_0_3_9.release_max_level_info or false) || - (f.log_0_3_9.release_max_level_info or false); - log_0_4_3.release_max_level_off = - (f.log_0_4_3.release_max_level_off or false) || - (log_0_3_9.release_max_level_off or false) || - (f.log_0_3_9.release_max_level_off or false); - log_0_4_3.release_max_level_trace = - (f.log_0_4_3.release_max_level_trace or false) || - (log_0_3_9.release_max_level_trace or false) || - (f.log_0_3_9.release_max_level_trace or false); - log_0_4_3.release_max_level_warn = - (f.log_0_4_3.release_max_level_warn or false) || - (log_0_3_9.release_max_level_warn or false) || - (f.log_0_3_9.release_max_level_warn or false); - log_0_4_3.std = - (f.log_0_4_3.std or false) || - (log_0_3_9.use_std or false) || - (f.log_0_3_9.use_std or false); - }) [ log_0_4_3_features ]; - log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]); - features = mkFeatures (features.log_0_4_3 or {}); - }; - log_0_4_3_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - log_0_4_3.default = (f.log_0_4_3.default or true); - }) [ cfg_if_0_1_4_features ]; - maplit_0_1_6 = { features?(maplit_0_1_6_features {}) }: maplit_0_1_6_ {}; - maplit_0_1_6_features = f: updateFeatures f (rec { - maplit_0_1_6.default = (f.maplit_0_1_6.default or true); - }) []; - matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {}; - matches_0_1_7_features = f: updateFeatures f (rec { - matches_0_1_7.default = (f.matches_0_1_7.default or true); - }) []; - memchr_0_1_11 = { features?(memchr_0_1_11_features {}) }: memchr_0_1_11_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - }; - memchr_0_1_11_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - memchr_0_1_11.default = (f.memchr_0_1_11.default or true); - }) [ libc_0_2_42_features ]; - memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {}; - memoffset_0_2_1_features = f: updateFeatures f (rec { - memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true); - }) []; - mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ { - dependencies = mapFeatures features ([ unicase_2_1_0 ]); - }; - mime_0_3_8_features = f: updateFeatures f (rec { - mime_0_3_8.default = (f.mime_0_3_8.default or true); - unicase_2_1_0.default = true; - }) [ unicase_2_1_0_features ]; - mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ { - dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]); - buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]); - features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {}); - }; - mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec { - mime_0_3_8.default = true; - mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true); - phf_0_7_22.default = true; - phf_0_7_22.unicase = true; - phf_codegen_0_7_22.default = true; - unicase_1_4_2.default = true; - }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ]; - miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - buildDependencies = mapFeatures features ([ cc_1_0_18 ]); - }; - miniz_sys_0_1_10_features = f: updateFeatures f (rec { - cc_1_0_18.default = true; - libc_0_2_42.default = true; - miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); - }) [ libc_0_2_42_features cc_1_0_18_features ]; - mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ { - dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); - features = mkFeatures (features.mio_0_6_15 or {}); - }; - mio_0_6_15_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - fuchsia_zircon_sys_0_3_3.default = true; - iovec_0_1_2.default = true; - kernel32_sys_0_2_2.default = true; - lazycell_0_6_0.default = true; - libc_0_2_42.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = (f.mio_0_6_15.default or true); - mio_0_6_15.with-deprecated = - (f.mio_0_6_15.with-deprecated or false) || - (f.mio_0_6_15.default or false) || - (mio_0_6_15.default or false); - miow_0_2_1.default = true; - net2_0_2_33.default = true; - slab_0_4_0.default = true; - winapi_0_2_8.default = true; - }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; - miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]); - }; - miow_0_2_1_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - miow_0_2_1.default = (f.miow_0_2_1.default or true); - net2_0_2_33.default = (f.net2_0_2_33.default or false); - winapi_0_2_8.default = true; - ws2_32_sys_0_2_1.default = true; - }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; - native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ { - dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else []) - ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []); - }; - native_tls_0_1_5_features = f: updateFeatures f (rec { - lazy_static_0_2_11.default = true; - libc_0_2_42.default = true; - native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true); - openssl_0_9_24.default = true; - schannel_0_1_13.default = true; - security_framework_0_1_16.OSX_10_8 = true; - security_framework_0_1_16.default = true; - security_framework_sys_0_1_16.default = true; - tempdir_0_3_7.default = true; - }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ]; - net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ]) - ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - features = mkFeatures (features.net2_0_2_33 or {}); - }; - net2_0_2_33_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - libc_0_2_42.default = true; - net2_0_2_33.default = (f.net2_0_2_33.default or true); - net2_0_2_33.duration = - (f.net2_0_2_33.duration or false) || - (f.net2_0_2_33.default or false) || - (net2_0_2_33.default or false); - winapi_0_3_5.default = true; - winapi_0_3_5.handleapi = true; - winapi_0_3_5.winsock2 = true; - winapi_0_3_5.ws2def = true; - winapi_0_3_5.ws2ipdef = true; - winapi_0_3_5.ws2tcpip = true; - }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ]; - nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.nodrop_0_1_12 or {}); - }; - nodrop_0_1_12_features = f: updateFeatures f (rec { - nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true); - nodrop_0_1_12.nodrop-union = - (f.nodrop_0_1_12.nodrop-union or false) || - (f.nodrop_0_1_12.use_union or false) || - (nodrop_0_1_12.use_union or false); - nodrop_0_1_12.std = - (f.nodrop_0_1_12.std or false) || - (f.nodrop_0_1_12.default or false) || - (nodrop_0_1_12.default or false); - }) []; - num_0_1_42 = { features?(num_0_1_42_features {}) }: num_0_1_42_ { - dependencies = mapFeatures features ([ num_integer_0_1_39 num_iter_0_1_37 num_traits_0_2_5 ]); - features = mkFeatures (features.num_0_1_42 or {}); - }; - num_0_1_42_features = f: updateFeatures f (rec { - num_0_1_42.bigint = - (f.num_0_1_42.bigint or false) || - (f.num_0_1_42.default or false) || - (num_0_1_42.default or false); - num_0_1_42.complex = - (f.num_0_1_42.complex or false) || - (f.num_0_1_42.default or false) || - (num_0_1_42.default or false); - num_0_1_42.default = (f.num_0_1_42.default or true); - num_0_1_42.num-bigint = - (f.num_0_1_42.num-bigint or false) || - (f.num_0_1_42.bigint or false) || - (num_0_1_42.bigint or false); - num_0_1_42.num-complex = - (f.num_0_1_42.num-complex or false) || - (f.num_0_1_42.complex or false) || - (num_0_1_42.complex or false); - num_0_1_42.num-rational = - (f.num_0_1_42.num-rational or false) || - (f.num_0_1_42.rational or false) || - (num_0_1_42.rational or false); - num_0_1_42.rational = - (f.num_0_1_42.rational or false) || - (f.num_0_1_42.default or false) || - (num_0_1_42.default or false); - num_0_1_42.rustc-serialize = - (f.num_0_1_42.rustc-serialize or false) || - (f.num_0_1_42.default or false) || - (num_0_1_42.default or false); - num_integer_0_1_39.default = true; - num_iter_0_1_37.default = true; - num_traits_0_2_5.default = true; - }) [ num_integer_0_1_39_features num_iter_0_1_37_features num_traits_0_2_5_features ]; - num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ { - dependencies = mapFeatures features ([ num_traits_0_2_5 ]); - features = mkFeatures (features.num_integer_0_1_39 or {}); - }; - num_integer_0_1_39_features = f: updateFeatures f (rec { - num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true); - num_integer_0_1_39.std = - (f.num_integer_0_1_39.std or false) || - (f.num_integer_0_1_39.default or false) || - (num_integer_0_1_39.default or false); - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); - num_traits_0_2_5.i128 = - (f.num_traits_0_2_5.i128 or false) || - (num_integer_0_1_39.i128 or false) || - (f.num_integer_0_1_39.i128 or false); - num_traits_0_2_5.std = - (f.num_traits_0_2_5.std or false) || - (num_integer_0_1_39.std or false) || - (f.num_integer_0_1_39.std or false); - }) [ num_traits_0_2_5_features ]; - num_iter_0_1_37 = { features?(num_iter_0_1_37_features {}) }: num_iter_0_1_37_ { - dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ]); - features = mkFeatures (features.num_iter_0_1_37 or {}); - }; - num_iter_0_1_37_features = f: updateFeatures f (rec { - num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false); - num_integer_0_1_39.i128 = - (f.num_integer_0_1_39.i128 or false) || - (num_iter_0_1_37.i128 or false) || - (f.num_iter_0_1_37.i128 or false); - num_integer_0_1_39.std = - (f.num_integer_0_1_39.std or false) || - (num_iter_0_1_37.std or false) || - (f.num_iter_0_1_37.std or false); - num_iter_0_1_37.default = (f.num_iter_0_1_37.default or true); - num_iter_0_1_37.std = - (f.num_iter_0_1_37.std or false) || - (f.num_iter_0_1_37.default or false) || - (num_iter_0_1_37.default or false); - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false); - num_traits_0_2_5.i128 = - (f.num_traits_0_2_5.i128 or false) || - (num_iter_0_1_37.i128 or false) || - (f.num_iter_0_1_37.i128 or false); - num_traits_0_2_5.std = - (f.num_traits_0_2_5.std or false) || - (num_iter_0_1_37.std or false) || - (f.num_iter_0_1_37.std or false); - }) [ num_integer_0_1_39_features num_traits_0_2_5_features ]; - num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ { - features = mkFeatures (features.num_traits_0_2_5 or {}); - }; - num_traits_0_2_5_features = f: updateFeatures f (rec { - num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true); - num_traits_0_2_5.std = - (f.num_traits_0_2_5.std or false) || - (f.num_traits_0_2_5.default or false) || - (num_traits_0_2_5.default or false); - }) []; - num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - }; - num_cpus_1_8_0_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true); - }) [ libc_0_2_42_features ]; - openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]); - features = mkFeatures (features.openssl_0_9_24 or {}); - }; - openssl_0_9_24_features = f: updateFeatures f (rec { - bitflags_0_9_1.default = true; - foreign_types_0_3_2.default = true; - lazy_static_1_0_2.default = true; - libc_0_2_42.default = true; - openssl_0_9_24.default = (f.openssl_0_9_24.default or true); - openssl_sys_0_9_33.default = true; - }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ]; - openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]) - ++ (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]); - }; - openssl_sys_0_9_33_features = f: updateFeatures f (rec { - cc_1_0_18.default = true; - libc_0_2_42.default = true; - openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true); - pkg_config_0_3_12.default = true; - }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ]; - percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f (rec { - percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); - }) []; - phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ { - dependencies = mapFeatures features ([ phf_shared_0_7_22 ]); - features = mkFeatures (features.phf_0_7_22 or {}); - }; - phf_0_7_22_features = f: updateFeatures f (rec { - phf_0_7_22.default = (f.phf_0_7_22.default or true); - phf_shared_0_7_22.core = - (f.phf_shared_0_7_22.core or false) || - (phf_0_7_22.core or false) || - (f.phf_0_7_22.core or false); - phf_shared_0_7_22.default = true; - phf_shared_0_7_22.unicase = - (f.phf_shared_0_7_22.unicase or false) || - (phf_0_7_22.unicase or false) || - (f.phf_0_7_22.unicase or false); - }) [ phf_shared_0_7_22_features ]; - phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ { - dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]); - }; - phf_codegen_0_7_22_features = f: updateFeatures f (rec { - phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true); - phf_generator_0_7_22.default = true; - phf_shared_0_7_22.default = true; - }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ]; - phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ { - dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]); - }; - phf_generator_0_7_22_features = f: updateFeatures f (rec { - phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true); - phf_shared_0_7_22.default = true; - rand_0_4_2.default = true; - }) [ phf_shared_0_7_22_features rand_0_4_2_features ]; - phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ { - dependencies = mapFeatures features ([ siphasher_0_2_2 ] - ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else [])); - features = mkFeatures (features.phf_shared_0_7_22 or {}); - }; - phf_shared_0_7_22_features = f: updateFeatures f (rec { - phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true); - siphasher_0_2_2.default = true; - unicase_1_4_2.default = true; - }) [ siphasher_0_2_2_features unicase_1_4_2_features ]; - pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {}; - pkg_config_0_3_12_features = f: updateFeatures f (rec { - pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true); - }) []; - quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; - quote_0_3_15_features = f: updateFeatures f (rec { - quote_0_3_15.default = (f.quote_0_3_15.default or true); - }) []; - rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ { - dependencies = mapFeatures features ([ libc_0_2_42 rand_0_4_2 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []); - features = mkFeatures (features.rand_0_3_22 or {}); - }; - rand_0_3_22_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_42.default = true; - rand_0_3_22.default = (f.rand_0_3_22.default or true); - rand_0_3_22.i128_support = - (f.rand_0_3_22.i128_support or false) || - (f.rand_0_3_22.nightly or false) || - (rand_0_3_22.nightly or false); - rand_0_4_2.default = true; - }) [ libc_0_2_42_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_42.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_5.default = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.ntsecapi = true; - winapi_0_3_5.profileapi = true; - winapi_0_3_5.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ]; - redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {}; - redox_syscall_0_1_40_features = f: updateFeatures f (rec { - redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_40.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_40_features ]; - regex_0_1_80 = { features?(regex_0_1_80_features {}) }: regex_0_1_80_ { - dependencies = mapFeatures features ([ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]); - features = mkFeatures (features.regex_0_1_80 or {}); - }; - regex_0_1_80_features = f: updateFeatures f (rec { - aho_corasick_0_5_3.default = true; - memchr_0_1_11.default = true; - regex_0_1_80.default = (f.regex_0_1_80.default or true); - regex_0_1_80.simd = - (f.regex_0_1_80.simd or false) || - (f.regex_0_1_80.simd-accel or false) || - (regex_0_1_80.simd-accel or false); - regex_syntax_0_3_9.default = true; - thread_local_0_2_7.default = true; - utf8_ranges_0_1_3.default = true; - }) [ aho_corasick_0_5_3_features memchr_0_1_11_features regex_syntax_0_3_9_features thread_local_0_2_7_features utf8_ranges_0_1_3_features ]; - regex_syntax_0_3_9 = { features?(regex_syntax_0_3_9_features {}) }: regex_syntax_0_3_9_ {}; - regex_syntax_0_3_9_features = f: updateFeatures f (rec { - regex_syntax_0_3_9.default = (f.regex_syntax_0_3_9.default or true); - }) []; - relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - }; - relay_0_1_1_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - relay_0_1_1.default = (f.relay_0_1_1.default or true); - }) [ futures_0_1_23_features ]; - remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - remove_dir_all_0_5_1_features = f: updateFeatures f (rec { - remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.errhandlingapi = true; - winapi_0_3_5.fileapi = true; - winapi_0_3_5.std = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.winerror = true; - }) [ winapi_0_3_5_features ]; - reqwest_0_8_6 = { features?(reqwest_0_8_6_features {}) }: reqwest_0_8_6_ { - dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_3 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]); - features = mkFeatures (features.reqwest_0_8_6 or {}); - }; - reqwest_0_8_6_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - encoding_rs_0_7_2.default = true; - futures_0_1_23.default = true; - hyper_0_11_27.default = true; - hyper_tls_0_1_3.default = true; - libflate_0_1_16.default = true; - log_0_4_3.default = true; - mime_guess_2_0_0_alpha_6.default = true; - native_tls_0_1_5.default = true; - reqwest_0_8_6.default = (f.reqwest_0_8_6.default or true); - serde_1_0_70.default = true; - serde_json_1_0_24.default = true; - serde_urlencoded_0_5_2.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_tls_0_1_4.default = true; - url_1_7_1.default = true; - uuid_0_6_5.default = true; - uuid_0_6_5.v4 = true; - }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_3_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ]; - safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; - safemem_0_2_0_features = f: updateFeatures f (rec { - safemem_0_2_0.default = (f.safemem_0_2_0.default or true); - }) []; - schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]); - }; - schannel_0_1_13_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = true; - schannel_0_1_13.default = (f.schannel_0_1_13.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.lmcons = true; - winapi_0_3_5.minschannel = true; - winapi_0_3_5.schannel = true; - winapi_0_3_5.securitybaseapi = true; - winapi_0_3_5.sysinfoapi = true; - winapi_0_3_5.timezoneapi = true; - winapi_0_3_5.winbase = true; - winapi_0_3_5.wincrypt = true; - winapi_0_3_5.winerror = true; - }) [ lazy_static_1_0_2_features winapi_0_3_5_features ]; - scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ { - features = mkFeatures (features.scoped_tls_0_1_2 or {}); - }; - scoped_tls_0_1_2_features = f: updateFeatures f (rec { - scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true); - }) []; - scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ { - features = mkFeatures (features.scopeguard_0_3_3 or {}); - }; - scopeguard_0_3_3_features = f: updateFeatures f (rec { - scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true); - scopeguard_0_3_3.use_std = - (f.scopeguard_0_3_3.use_std or false) || - (f.scopeguard_0_3_3.default or false) || - (scopeguard_0_3_3.default or false); - }) []; - security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ { - dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]); - features = mkFeatures (features.security_framework_0_1_16 or {}); - }; - security_framework_0_1_16_features = f: updateFeatures f (rec { - core_foundation_0_2_3.default = true; - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - security_framework_0_1_16.OSX_10_10 = - (f.security_framework_0_1_16.OSX_10_10 or false) || - (f.security_framework_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_11 or false); - security_framework_0_1_16.OSX_10_11 = - (f.security_framework_0_1_16.OSX_10_11 or false) || - (f.security_framework_0_1_16.OSX_10_12 or false) || - (security_framework_0_1_16.OSX_10_12 or false); - security_framework_0_1_16.OSX_10_8 = - (f.security_framework_0_1_16.OSX_10_8 or false) || - (f.security_framework_0_1_16.OSX_10_9 or false) || - (security_framework_0_1_16.OSX_10_9 or false); - security_framework_0_1_16.OSX_10_9 = - (f.security_framework_0_1_16.OSX_10_9 or false) || - (f.security_framework_0_1_16.OSX_10_10 or false) || - (security_framework_0_1_16.OSX_10_10 or false); - security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true); - security_framework_sys_0_1_16.OSX_10_10 = - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (security_framework_0_1_16.OSX_10_10 or false) || - (f.security_framework_0_1_16.OSX_10_10 or false); - security_framework_sys_0_1_16.OSX_10_11 = - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_11 or false) || - (f.security_framework_0_1_16.OSX_10_11 or false) || - (security_framework_0_1_16.OSX_10_12 or false) || - (f.security_framework_0_1_16.OSX_10_12 or false); - security_framework_sys_0_1_16.OSX_10_8 = - (f.security_framework_sys_0_1_16.OSX_10_8 or false) || - (security_framework_0_1_16.OSX_10_8 or false) || - (f.security_framework_0_1_16.OSX_10_8 or false); - security_framework_sys_0_1_16.OSX_10_9 = - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (security_framework_0_1_16.OSX_10_9 or false) || - (f.security_framework_0_1_16.OSX_10_9 or false); - security_framework_sys_0_1_16.default = true; - }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ]; - security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ { - dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]); - features = mkFeatures (features.security_framework_sys_0_1_16 or {}); - }; - security_framework_sys_0_1_16_features = f: updateFeatures f (rec { - core_foundation_sys_0_2_3.default = true; - libc_0_2_42.default = true; - security_framework_sys_0_1_16.OSX_10_10 = - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (security_framework_sys_0_1_16.OSX_10_11 or false); - security_framework_sys_0_1_16.OSX_10_11 = - (f.security_framework_sys_0_1_16.OSX_10_11 or false) || - (f.security_framework_sys_0_1_16.OSX_10_12 or false) || - (security_framework_sys_0_1_16.OSX_10_12 or false); - security_framework_sys_0_1_16.OSX_10_8 = - (f.security_framework_sys_0_1_16.OSX_10_8 or false) || - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (security_framework_sys_0_1_16.OSX_10_9 or false); - security_framework_sys_0_1_16.OSX_10_9 = - (f.security_framework_sys_0_1_16.OSX_10_9 or false) || - (f.security_framework_sys_0_1_16.OSX_10_10 or false) || - (security_framework_sys_0_1_16.OSX_10_10 or false); - security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true); - }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ]; - semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { - dependencies = mapFeatures features ([ semver_parser_0_7_0 ]); - features = mkFeatures (features.semver_0_9_0 or {}); - }; - semver_0_9_0_features = f: updateFeatures f (rec { - semver_0_9_0.default = (f.semver_0_9_0.default or true); - semver_0_9_0.serde = - (f.semver_0_9_0.serde or false) || - (f.semver_0_9_0.ci or false) || - (semver_0_9_0.ci or false); - semver_parser_0_7_0.default = true; - }) [ semver_parser_0_7_0_features ]; - semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f (rec { - semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); - }) []; - serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_70 or {}); - }; - serde_1_0_70_features = f: updateFeatures f (rec { - serde_1_0_70.default = (f.serde_1_0_70.default or true); - serde_1_0_70.serde_derive = - (f.serde_1_0_70.serde_derive or false) || - (f.serde_1_0_70.derive or false) || - (serde_1_0_70.derive or false); - serde_1_0_70.std = - (f.serde_1_0_70.std or false) || - (f.serde_1_0_70.default or false) || - (serde_1_0_70.default or false); - serde_1_0_70.unstable = - (f.serde_1_0_70.unstable or false) || - (f.serde_1_0_70.alloc or false) || - (serde_1_0_70.alloc or false); - }) []; - serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ { - dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]); - features = mkFeatures (features.serde_json_1_0_24 or {}); - }; - serde_json_1_0_24_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = true; - itoa_0_4_2.default = true; - serde_1_0_70.default = true; - serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true); - serde_json_1_0_24.indexmap = - (f.serde_json_1_0_24.indexmap or false) || - (f.serde_json_1_0_24.preserve_order or false) || - (serde_json_1_0_24.preserve_order or false); - }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ]; - serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ { - dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]); - }; - serde_urlencoded_0_5_2_features = f: updateFeatures f (rec { - dtoa_0_4_3.default = true; - itoa_0_4_2.default = true; - serde_1_0_70.default = true; - serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true); - url_1_7_1.default = true; - }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ]; - siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { - dependencies = mapFeatures features ([]); - }; - siphasher_0_2_2_features = f: updateFeatures f (rec { - siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); - }) []; - slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {}; - slab_0_3_0_features = f: updateFeatures f (rec { - slab_0_3_0.default = (f.slab_0_3_0.default or true); - }) []; - slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {}; - slab_0_4_0_features = f: updateFeatures f (rec { - slab_0_4_0.default = (f.slab_0_4_0.default or true); - }) []; - slog_1_7_1 = { features?(slog_1_7_1_features {}) }: slog_1_7_1_ { - features = mkFeatures (features.slog_1_7_1 or {}); - }; - slog_1_7_1_features = f: updateFeatures f (rec { - slog_1_7_1.default = (f.slog_1_7_1.default or true); - slog_1_7_1.std = - (f.slog_1_7_1.std or false) || - (f.slog_1_7_1.default or false) || - (slog_1_7_1.default or false); - }) []; - slog_envlogger_0_5_0 = { features?(slog_envlogger_0_5_0_features {}) }: slog_envlogger_0_5_0_ { - dependencies = mapFeatures features ([ log_0_3_9 regex_0_1_80 slog_1_7_1 slog_stdlog_1_1_0 slog_term_1_5_0 ]); - }; - slog_envlogger_0_5_0_features = f: updateFeatures f (rec { - log_0_3_9.default = true; - regex_0_1_80.default = true; - slog_1_7_1.default = true; - slog_envlogger_0_5_0.default = (f.slog_envlogger_0_5_0.default or true); - slog_stdlog_1_1_0.default = true; - slog_term_1_5_0.default = true; - }) [ log_0_3_9_features regex_0_1_80_features slog_1_7_1_features slog_stdlog_1_1_0_features slog_term_1_5_0_features ]; - slog_extra_0_1_2 = { features?(slog_extra_0_1_2_features {}) }: slog_extra_0_1_2_ { - dependencies = mapFeatures features ([ slog_1_7_1 thread_local_0_3_5 ]); - }; - slog_extra_0_1_2_features = f: updateFeatures f (rec { - slog_1_7_1.default = true; - slog_extra_0_1_2.default = (f.slog_extra_0_1_2.default or true); - thread_local_0_3_5.default = true; - }) [ slog_1_7_1_features thread_local_0_3_5_features ]; - slog_stdlog_1_1_0 = { features?(slog_stdlog_1_1_0_features {}) }: slog_stdlog_1_1_0_ { - dependencies = mapFeatures features ([ crossbeam_0_2_12 lazy_static_0_2_11 log_0_3_9 slog_1_7_1 slog_term_1_5_0 ]); - }; - slog_stdlog_1_1_0_features = f: updateFeatures f (rec { - crossbeam_0_2_12.default = true; - lazy_static_0_2_11.default = true; - log_0_3_9.default = true; - slog_1_7_1.default = true; - slog_stdlog_1_1_0.default = (f.slog_stdlog_1_1_0.default or true); - slog_term_1_5_0.default = true; - }) [ crossbeam_0_2_12_features lazy_static_0_2_11_features log_0_3_9_features slog_1_7_1_features slog_term_1_5_0_features ]; - slog_stream_1_2_1 = { features?(slog_stream_1_2_1_features {}) }: slog_stream_1_2_1_ { - dependencies = mapFeatures features ([ slog_1_7_1 slog_extra_0_1_2 thread_local_0_3_5 ]); - }; - slog_stream_1_2_1_features = f: updateFeatures f (rec { - slog_1_7_1.default = true; - slog_extra_0_1_2.default = true; - slog_stream_1_2_1.default = (f.slog_stream_1_2_1.default or true); - thread_local_0_3_5.default = true; - }) [ slog_1_7_1_features slog_extra_0_1_2_features thread_local_0_3_5_features ]; - slog_term_1_5_0 = { features?(slog_term_1_5_0_features {}) }: slog_term_1_5_0_ { - dependencies = mapFeatures features ([ chrono_0_2_25 isatty_0_1_8 slog_1_7_1 slog_stream_1_2_1 thread_local_0_3_5 ]); - }; - slog_term_1_5_0_features = f: updateFeatures f (rec { - chrono_0_2_25.default = true; - isatty_0_1_8.default = true; - slog_1_7_1.default = true; - slog_stream_1_2_1.default = true; - slog_term_1_5_0.default = (f.slog_term_1_5_0.default or true); - thread_local_0_3_5.default = true; - }) [ chrono_0_2_25_features isatty_0_1_8_features slog_1_7_1_features slog_stream_1_2_1_features thread_local_0_3_5_features ]; - smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {}; - smallvec_0_2_1_features = f: updateFeatures f (rec { - smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true); - }) []; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { - dependencies = mapFeatures features ([ ] - ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) - ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) - ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); - features = mkFeatures (features.syn_0_11_11 or {}); - }; - syn_0_11_11_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = (f.syn_0_11_11.default or true); - syn_0_11_11.parsing = - (f.syn_0_11_11.parsing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.printing = - (f.syn_0_11_11.printing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.quote = - (f.syn_0_11_11.quote or false) || - (f.syn_0_11_11.printing or false) || - (syn_0_11_11.printing or false); - syn_0_11_11.synom = - (f.syn_0_11_11.synom or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - syn_0_11_11.unicode-xid = - (f.syn_0_11_11.unicode-xid or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - synom_0_11_3.default = true; - unicode_xid_0_0_4.default = true; - }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { - dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); - }; - synom_0_11_3_features = f: updateFeatures f (rec { - synom_0_11_3.default = (f.synom_0_11_3.default or true); - unicode_xid_0_0_4.default = true; - }) [ unicode_xid_0_0_4_features ]; - take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {}; - take_0_1_0_features = f: updateFeatures f (rec { - take_0_1_0.default = (f.take_0_1_0.default or true); - }) []; - tar_0_4_16 = { features?(tar_0_4_16_features {}) }: tar_0_4_16_ { - dependencies = mapFeatures features ([ filetime_0_2_1 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ] - ++ (if features.tar_0_4_16.xattr or false then [ xattr_0_2_2 ] else [])) else []); - features = mkFeatures (features.tar_0_4_16 or {}); - }; - tar_0_4_16_features = f: updateFeatures f (rec { - filetime_0_2_1.default = true; - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - tar_0_4_16.default = (f.tar_0_4_16.default or true); - tar_0_4_16.xattr = - (f.tar_0_4_16.xattr or false) || - (f.tar_0_4_16.default or false) || - (tar_0_4_16.default or false); - xattr_0_2_2.default = true; - }) [ filetime_0_2_1_features redox_syscall_0_1_40_features libc_0_2_42_features xattr_0_2_2_features ]; - tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { - dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]); - }; - tempdir_0_3_7_features = f: updateFeatures f (rec { - rand_0_4_2.default = true; - remove_dir_all_0_5_1.default = true; - tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); - }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ]; - textwrap_0_10_0 = { features?(textwrap_0_10_0_features {}) }: textwrap_0_10_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_5 ]); - }; - textwrap_0_10_0_features = f: updateFeatures f (rec { - textwrap_0_10_0.default = (f.textwrap_0_10_0.default or true); - unicode_width_0_1_5.default = true; - }) [ unicode_width_0_1_5_features ]; - thread_id_2_0_0 = { features?(thread_id_2_0_0_features {}) }: thread_id_2_0_0_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_42 ]); - }; - thread_id_2_0_0_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - libc_0_2_42.default = true; - thread_id_2_0_0.default = (f.thread_id_2_0_0.default or true); - }) [ kernel32_sys_0_2_2_features libc_0_2_42_features ]; - thread_local_0_2_7 = { features?(thread_local_0_2_7_features {}) }: thread_local_0_2_7_ { - dependencies = mapFeatures features ([ thread_id_2_0_0 ]); - }; - thread_local_0_2_7_features = f: updateFeatures f (rec { - thread_id_2_0_0.default = true; - thread_local_0_2_7.default = (f.thread_local_0_2_7.default or true); - }) [ thread_id_2_0_0_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_2 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f (rec { - lazy_static_1_0_2.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_2_features unreachable_1_0_0_features ]; - time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []); - }; - time_0_1_40_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - redox_syscall_0_1_40.default = true; - time_0_1_40.default = (f.time_0_1_40.default or true); - winapi_0_3_5.default = true; - winapi_0_3_5.minwinbase = true; - winapi_0_3_5.minwindef = true; - winapi_0_3_5.ntdef = true; - winapi_0_3_5.profileapi = true; - winapi_0_3_5.std = true; - winapi_0_3_5.sysinfoapi = true; - winapi_0_3_5.timezoneapi = true; - }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ]; - tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ { - dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]); - }; - tokio_0_1_7_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - mio_0_6_15.default = true; - tokio_0_1_7.default = (f.tokio_0_1_7.default or true); - tokio_executor_0_1_2.default = true; - tokio_fs_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_tcp_0_1_0.default = true; - tokio_threadpool_0_1_5.default = true; - tokio_timer_0_2_4.default = true; - tokio_udp_0_1_1.default = true; - }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ]; - tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]); - }; - tokio_codec_0_1_0_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true); - tokio_io_0_1_7.default = true; - }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ]; - tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]); - }; - tokio_core_0_1_17_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - iovec_0_1_2.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - scoped_tls_0_1_2.default = true; - tokio_0_1_7.default = true; - tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true); - tokio_executor_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_timer_0_2_4.default = true; - }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ]; - tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - features = mkFeatures (features.tokio_executor_0_1_2 or {}); - }; - tokio_executor_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true); - tokio_executor_0_1_2.futures2 = - (f.tokio_executor_0_1_2.futures2 or false) || - (f.tokio_executor_0_1_2.unstable-futures or false) || - (tokio_executor_0_1_2.unstable-futures or false); - }) [ futures_0_1_23_features ]; - tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]); - }; - tokio_fs_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true); - tokio_io_0_1_7.default = true; - tokio_threadpool_0_1_5.default = true; - }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ]; - tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]); - }; - tokio_io_0_1_7_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true); - }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ]; - tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ { - dependencies = mapFeatures features ([ futures_0_1_23 log_0_3_9 net2_0_2_33 rand_0_3_22 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 ]); - }; - tokio_proto_0_1_1_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - log_0_3_9.default = true; - net2_0_2_33.default = true; - rand_0_3_22.default = true; - slab_0_3_0.default = true; - smallvec_0_2_1.default = true; - take_0_1_0.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true); - tokio_service_0_1_0.default = true; - }) [ futures_0_1_23_features log_0_3_9_features net2_0_2_33_features rand_0_3_22_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features ]; - tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ { - dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]); - }; - tokio_reactor_0_1_2_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - slab_0_4_0.default = true; - tokio_executor_0_1_2.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true); - }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ]; - tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { - dependencies = mapFeatures features ([ futures_0_1_23 ]); - }; - tokio_service_0_1_0_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); - }) [ futures_0_1_23_features ]; - tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); - features = mkFeatures (features.tokio_tcp_0_1_0 or {}); - }; - tokio_tcp_0_1_0_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - iovec_0_1_2.default = true; - mio_0_6_15.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true); - tokio_tcp_0_1_0.futures2 = - (f.tokio_tcp_0_1_0.futures2 or false) || - (f.tokio_tcp_0_1_0.unstable-futures or false) || - (tokio_tcp_0_1_0.unstable-futures or false); - }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; - tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ { - dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]); - }; - tokio_threadpool_0_1_5_features = f: updateFeatures f (rec { - crossbeam_deque_0_3_1.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - num_cpus_1_8_0.default = true; - rand_0_4_2.default = true; - tokio_executor_0_1_2.default = true; - tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true); - }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ]; - tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]); - }; - tokio_timer_0_2_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - tokio_executor_0_1_2.default = true; - tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true); - }) [ futures_0_1_23_features tokio_executor_0_1_2_features ]; - tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ]) - ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) - ++ (if kernel == "windows" then mapFeatures features ([]) else []); - }; - tokio_tls_0_1_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - native_tls_0_1_5.default = true; - tokio_core_0_1_17.default = true; - tokio_io_0_1_7.default = true; - tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true); - }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ]; - tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ { - dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]); - }; - tokio_udp_0_1_1_features = f: updateFeatures f (rec { - bytes_0_4_9.default = true; - futures_0_1_23.default = true; - log_0_4_3.default = true; - mio_0_6_15.default = true; - tokio_codec_0_1_0.default = true; - tokio_io_0_1_7.default = true; - tokio_reactor_0_1_2.default = true; - tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true); - }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ]; - try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {}; - try_lock_0_1_0_features = f: updateFeatures f (rec { - try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true); - }) []; - unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ { - dependencies = mapFeatures features ([]); - buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); - features = mkFeatures (features.unicase_1_4_2 or {}); - }; - unicase_1_4_2_features = f: updateFeatures f (rec { - unicase_1_4_2.default = (f.unicase_1_4_2.default or true); - unicase_1_4_2.heapsize = - (f.unicase_1_4_2.heapsize or false) || - (f.unicase_1_4_2.heap_size or false) || - (unicase_1_4_2.heap_size or false); - unicase_1_4_2.heapsize_plugin = - (f.unicase_1_4_2.heapsize_plugin or false) || - (f.unicase_1_4_2.heap_size or false) || - (unicase_1_4_2.heap_size or false); - version_check_0_1_4.default = true; - }) [ version_check_0_1_4_features ]; - unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ { - buildDependencies = mapFeatures features ([ version_check_0_1_4 ]); - features = mkFeatures (features.unicase_2_1_0 or {}); - }; - unicase_2_1_0_features = f: updateFeatures f (rec { - unicase_2_1_0.default = (f.unicase_2_1_0.default or true); - version_check_0_1_4.default = true; - }) [ version_check_0_1_4_features ]; - unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { - dependencies = mapFeatures features ([ matches_0_1_7 ]); - features = mkFeatures (features.unicode_bidi_0_3_4 or {}); - }; - unicode_bidi_0_3_4_features = f: updateFeatures f (rec { - matches_0_1_7.default = true; - unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); - unicode_bidi_0_3_4.flame = - (f.unicode_bidi_0_3_4.flame or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.flamer = - (f.unicode_bidi_0_3_4.flamer or false) || - (f.unicode_bidi_0_3_4.flame_it or false) || - (unicode_bidi_0_3_4.flame_it or false); - unicode_bidi_0_3_4.serde = - (f.unicode_bidi_0_3_4.serde or false) || - (f.unicode_bidi_0_3_4.with_serde or false) || - (unicode_bidi_0_3_4.with_serde or false); - }) [ matches_0_1_7_features ]; - unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f (rec { - unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); - }) []; - unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ { - features = mkFeatures (features.unicode_width_0_1_5 or {}); - }; - unicode_width_0_1_5_features = f: updateFeatures f (rec { - unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true); - }) []; - unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { - features = mkFeatures (features.unicode_xid_0_0_4 or {}); - }; - unicode_xid_0_0_4_features = f: updateFeatures f (rec { - unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ { - dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]); - features = mkFeatures (features.url_1_7_1 or {}); - }; - url_1_7_1_features = f: updateFeatures f (rec { - idna_0_1_5.default = true; - matches_0_1_7.default = true; - percent_encoding_1_0_1.default = true; - url_1_7_1.default = (f.url_1_7_1.default or true); - url_1_7_1.encoding = - (f.url_1_7_1.encoding or false) || - (f.url_1_7_1.query_encoding or false) || - (url_1_7_1.query_encoding or false); - url_1_7_1.heapsize = - (f.url_1_7_1.heapsize or false) || - (f.url_1_7_1.heap_size or false) || - (url_1_7_1.heap_size or false); - }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ]; - utf8_ranges_0_1_3 = { features?(utf8_ranges_0_1_3_features {}) }: utf8_ranges_0_1_3_ {}; - utf8_ranges_0_1_3_features = f: updateFeatures f (rec { - utf8_ranges_0_1_3.default = (f.utf8_ranges_0_1_3.default or true); - }) []; - uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ { - dependencies = mapFeatures features ([ cfg_if_0_1_4 ] - ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else [])); - features = mkFeatures (features.uuid_0_6_5 or {}); - }; - uuid_0_6_5_features = f: updateFeatures f (rec { - cfg_if_0_1_4.default = true; - rand_0_4_2.default = true; - uuid_0_6_5.byteorder = - (f.uuid_0_6_5.byteorder or false) || - (f.uuid_0_6_5.u128 or false) || - (uuid_0_6_5.u128 or false); - uuid_0_6_5.default = (f.uuid_0_6_5.default or true); - uuid_0_6_5.md5 = - (f.uuid_0_6_5.md5 or false) || - (f.uuid_0_6_5.v3 or false) || - (uuid_0_6_5.v3 or false); - uuid_0_6_5.nightly = - (f.uuid_0_6_5.nightly or false) || - (f.uuid_0_6_5.const_fn or false) || - (uuid_0_6_5.const_fn or false); - uuid_0_6_5.rand = - (f.uuid_0_6_5.rand or false) || - (f.uuid_0_6_5.v3 or false) || - (uuid_0_6_5.v3 or false) || - (f.uuid_0_6_5.v4 or false) || - (uuid_0_6_5.v4 or false) || - (f.uuid_0_6_5.v5 or false) || - (uuid_0_6_5.v5 or false); - uuid_0_6_5.sha1 = - (f.uuid_0_6_5.sha1 or false) || - (f.uuid_0_6_5.v5 or false) || - (uuid_0_6_5.v5 or false); - uuid_0_6_5.std = - (f.uuid_0_6_5.std or false) || - (f.uuid_0_6_5.default or false) || - (uuid_0_6_5.default or false) || - (f.uuid_0_6_5.use_std or false) || - (uuid_0_6_5.use_std or false); - }) [ cfg_if_0_1_4_features rand_0_4_2_features ]; - vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {}; - vcpkg_0_2_4_features = f: updateFeatures f (rec { - vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true); - }) []; - vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_1 or {}); - }; - vec_map_0_8_1_features = f: updateFeatures f (rec { - vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true); - vec_map_0_8_1.serde = - (f.vec_map_0_8_1.serde or false) || - (f.vec_map_0_8_1.eders or false) || - (vec_map_0_8_1.eders or false); - }) []; - version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {}; - version_check_0_1_4_features = f: updateFeatures f (rec { - version_check_0_1_4.default = (f.version_check_0_1_4.default or true); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ { - dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]); - }; - want_0_0_4_features = f: updateFeatures f (rec { - futures_0_1_23.default = true; - log_0_4_3.default = true; - try_lock_0_1_0.default = true; - want_0_0_4.default = (f.want_0_0_4.default or true); - }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ]; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_5 or {}); - }; - winapi_0_3_5_features = f: updateFeatures f (rec { - winapi_0_3_5.default = (f.winapi_0_3_5.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - xattr_0_2_2 = { features?(xattr_0_2_2_features {}) }: xattr_0_2_2_ { - dependencies = mapFeatures features ([ libc_0_2_42 ]); - features = mkFeatures (features.xattr_0_2_2 or {}); - }; - xattr_0_2_2_features = f: updateFeatures f (rec { - libc_0_2_42.default = true; - xattr_0_2_2.default = (f.xattr_0_2_2.default or true); - xattr_0_2_2.unsupported = - (f.xattr_0_2_2.unsupported or false) || - (f.xattr_0_2_2.default or false) || - (xattr_0_2_2.default or false); - }) [ libc_0_2_42_features ]; + deps.adler32."1.0.2" = {}; + deps.aho_corasick."0.5.3" = { + memchr = "0.1.11"; + }; + deps.ansi_term."0.9.0" = {}; + deps.arrayvec."0.4.8" = { + nodrop = "0.1.13"; + }; + deps.atty."0.2.3" = { + termion = "1.5.1"; + libc = "0.2.44"; + kernel32_sys = "0.2.2"; + winapi = "0.2.8"; + }; + deps.base64."0.9.3" = { + byteorder = "1.1.0"; + safemem = "0.3.0"; + }; + deps.bitflags."0.7.0" = {}; + deps.bitflags."0.9.1" = {}; + deps.bitflags."1.0.4" = {}; + deps.byteorder."1.1.0" = {}; + deps.bytes."0.4.11" = { + byteorder = "1.1.0"; + iovec = "0.1.1"; + }; + deps.cargo_download."0.1.2" = { + ansi_term = "0.9.0"; + clap = "2.27.1"; + conv = "0.3.3"; + derive_error = "0.0.3"; + exitcode = "1.1.2"; + flate2 = "0.2.20"; + isatty = "0.1.5"; + itertools = "0.6.5"; + lazy_static = "0.2.10"; + log = "0.3.8"; + maplit = "0.1.6"; + reqwest = "0.9.5"; + semver = "0.9.0"; + serde_json = "1.0.6"; + slog = "1.7.1"; + slog_envlogger = "0.5.0"; + slog_stdlog = "1.1.0"; + slog_stream = "1.2.1"; + tar = "0.4.13"; + time = "0.1.38"; + }; + deps.case."0.1.0" = {}; + deps.cc."1.0.3" = {}; + deps.cfg_if."0.1.2" = {}; + deps.chrono."0.2.25" = { + num = "0.1.40"; + time = "0.1.38"; + }; + deps.clap."2.27.1" = { + ansi_term = "0.9.0"; + atty = "0.2.3"; + bitflags = "0.9.1"; + strsim = "0.6.0"; + textwrap = "0.9.0"; + unicode_width = "0.1.4"; + vec_map = "0.8.0"; + }; + deps.cloudabi."0.0.3" = { + bitflags = "1.0.4"; + }; + deps.conv."0.3.3" = { + custom_derive = "0.1.7"; + }; + deps.core_foundation."0.5.1" = { + core_foundation_sys = "0.5.1"; + libc = "0.2.44"; + }; + deps.core_foundation_sys."0.5.1" = { + libc = "0.2.44"; + }; + deps.crc32fast."1.1.1" = {}; + deps.crossbeam."0.2.10" = {}; + deps.crossbeam_deque."0.6.2" = { + crossbeam_epoch = "0.6.1"; + crossbeam_utils = "0.6.1"; + }; + deps.crossbeam_epoch."0.6.1" = { + arrayvec = "0.4.8"; + cfg_if = "0.1.2"; + crossbeam_utils = "0.6.1"; + lazy_static = "1.2.0"; + memoffset = "0.2.1"; + scopeguard = "0.3.3"; + }; + deps.crossbeam_utils."0.6.1" = { + cfg_if = "0.1.2"; + }; + deps.custom_derive."0.1.7" = {}; + deps.derive_error."0.0.3" = { + case = "0.1.0"; + quote = "0.3.15"; + syn = "0.11.11"; + }; + deps.dtoa."0.4.2" = {}; + deps.either."1.4.0" = {}; + deps.encoding_rs."0.8.13" = { + cfg_if = "0.1.2"; + }; + deps.exitcode."1.1.2" = {}; + deps.filetime."0.1.14" = { + cfg_if = "0.1.2"; + redox_syscall = "0.1.31"; + libc = "0.2.44"; + }; + deps.flate2."0.2.20" = { + libc = "0.2.44"; + miniz_sys = "0.1.10"; + }; + deps.fnv."1.0.6" = {}; + deps.foreign_types."0.3.2" = { + foreign_types_shared = "0.1.1"; + }; + deps.foreign_types_shared."0.1.1" = {}; + deps.fuchsia_zircon."0.2.1" = { + fuchsia_zircon_sys = "0.2.0"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.4"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.2.0" = { + bitflags = "0.7.0"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.futures."0.1.25" = {}; + deps.futures_cpupool."0.1.7" = { + futures = "0.1.25"; + num_cpus = "1.8.0"; + }; + deps.h2."0.1.13" = { + byteorder = "1.1.0"; + bytes = "0.4.11"; + fnv = "1.0.6"; + futures = "0.1.25"; + http = "0.1.14"; + indexmap = "1.0.2"; + log = "0.4.6"; + slab = "0.4.0"; + string = "0.1.2"; + tokio_io = "0.1.10"; + }; + deps.http."0.1.14" = { + bytes = "0.4.11"; + fnv = "1.0.6"; + itoa = "0.4.3"; + }; + deps.httparse."1.2.3" = {}; + deps.hyper."0.12.16" = { + bytes = "0.4.11"; + futures = "0.1.25"; + futures_cpupool = "0.1.7"; + h2 = "0.1.13"; + http = "0.1.14"; + httparse = "1.2.3"; + iovec = "0.1.1"; + itoa = "0.4.3"; + log = "0.4.6"; + net2 = "0.2.33"; + time = "0.1.38"; + tokio = "0.1.7"; + tokio_executor = "0.1.5"; + tokio_io = "0.1.10"; + tokio_reactor = "0.1.7"; + tokio_tcp = "0.1.2"; + tokio_threadpool = "0.1.9"; + tokio_timer = "0.2.5"; + want = "0.0.6"; + }; + deps.hyper_tls."0.3.1" = { + bytes = "0.4.11"; + futures = "0.1.25"; + hyper = "0.12.16"; + native_tls = "0.2.2"; + tokio_io = "0.1.10"; + }; + deps.idna."0.1.4" = { + matches = "0.1.6"; + unicode_bidi = "0.3.4"; + unicode_normalization = "0.1.5"; + }; + deps.indexmap."1.0.2" = {}; + deps.iovec."0.1.1" = { + libc = "0.2.44"; + winapi = "0.2.8"; + }; + deps.isatty."0.1.5" = { + libc = "0.2.44"; + kernel32_sys = "0.2.2"; + winapi = "0.2.8"; + }; + deps.itertools."0.6.5" = { + either = "1.4.0"; + }; + deps.itoa."0.3.4" = {}; + deps.itoa."0.4.3" = {}; + deps.kernel32_sys."0.2.2" = { + winapi = "0.2.8"; + winapi_build = "0.1.1"; + }; + deps.lazy_static."0.2.10" = {}; + deps.lazy_static."1.2.0" = {}; + deps.lazycell."1.2.0" = {}; + deps.libc."0.2.44" = {}; + deps.libflate."0.1.19" = { + adler32 = "1.0.2"; + byteorder = "1.1.0"; + crc32fast = "1.1.1"; + }; + deps.lock_api."0.1.5" = { + owning_ref = "0.4.0"; + scopeguard = "0.3.3"; + }; + deps.log."0.3.8" = {}; + deps.log."0.4.6" = { + cfg_if = "0.1.2"; + }; + deps.maplit."0.1.6" = {}; + deps.matches."0.1.6" = {}; + deps.memchr."0.1.11" = { + libc = "0.2.44"; + }; + deps.memoffset."0.2.1" = {}; + deps.mime."0.3.12" = { + unicase = "2.1.0"; + }; + deps.mime_guess."2.0.0-alpha.6" = { + mime = "0.3.12"; + phf = "0.7.21"; + unicase = "1.4.2"; + phf_codegen = "0.7.21"; + }; + deps.miniz_sys."0.1.10" = { + libc = "0.2.44"; + cc = "1.0.3"; + }; + deps.mio."0.6.16" = { + iovec = "0.1.1"; + lazycell = "1.2.0"; + log = "0.4.6"; + net2 = "0.2.33"; + slab = "0.4.0"; + fuchsia_zircon = "0.3.3"; + fuchsia_zircon_sys = "0.3.3"; + libc = "0.2.44"; + kernel32_sys = "0.2.2"; + miow = "0.2.1"; + winapi = "0.2.8"; + }; + deps.miow."0.2.1" = { + kernel32_sys = "0.2.2"; + net2 = "0.2.33"; + winapi = "0.2.8"; + ws2_32_sys = "0.2.1"; + }; + deps.native_tls."0.2.2" = { + lazy_static = "1.2.0"; + libc = "0.2.44"; + security_framework = "0.2.1"; + security_framework_sys = "0.2.1"; + tempfile = "3.0.5"; + openssl = "0.10.15"; + openssl_probe = "0.1.2"; + openssl_sys = "0.9.39"; + log = "0.4.6"; + schannel = "0.1.14"; + }; + deps.net2."0.2.33" = { + cfg_if = "0.1.2"; + libc = "0.2.44"; + winapi = "0.3.6"; + }; + deps.nodrop."0.1.13" = {}; + deps.num."0.1.40" = { + num_integer = "0.1.35"; + num_iter = "0.1.34"; + num_traits = "0.1.40"; + }; + deps.num_integer."0.1.35" = { + num_traits = "0.1.40"; + }; + deps.num_iter."0.1.34" = { + num_integer = "0.1.35"; + num_traits = "0.1.40"; + }; + deps.num_traits."0.1.40" = {}; + deps.num_cpus."1.8.0" = { + libc = "0.2.44"; + }; + deps.openssl."0.10.15" = { + bitflags = "1.0.4"; + cfg_if = "0.1.2"; + foreign_types = "0.3.2"; + lazy_static = "1.2.0"; + libc = "0.2.44"; + openssl_sys = "0.9.39"; + }; + deps.openssl_probe."0.1.2" = {}; + deps.openssl_sys."0.9.39" = { + libc = "0.2.44"; + cc = "1.0.3"; + pkg_config = "0.3.9"; + }; + deps.owning_ref."0.4.0" = { + stable_deref_trait = "1.1.1"; + }; + deps.parking_lot."0.6.4" = { + lock_api = "0.1.5"; + parking_lot_core = "0.3.1"; + }; + deps.parking_lot_core."0.3.1" = { + rand = "0.5.5"; + smallvec = "0.6.7"; + rustc_version = "0.2.3"; + libc = "0.2.44"; + winapi = "0.3.6"; + }; + deps.percent_encoding."1.0.1" = {}; + deps.phf."0.7.21" = { + phf_shared = "0.7.21"; + }; + deps.phf_codegen."0.7.21" = { + phf_generator = "0.7.21"; + phf_shared = "0.7.21"; + }; + deps.phf_generator."0.7.21" = { + phf_shared = "0.7.21"; + rand = "0.3.18"; + }; + deps.phf_shared."0.7.21" = { + siphasher = "0.2.2"; + unicase = "1.4.2"; + }; + deps.pkg_config."0.3.9" = {}; + deps.quote."0.3.15" = {}; + deps.rand."0.3.18" = { + libc = "0.2.44"; + fuchsia_zircon = "0.2.1"; + }; + deps.rand."0.5.5" = { + rand_core = "0.2.2"; + cloudabi = "0.0.3"; + fuchsia_zircon = "0.3.3"; + libc = "0.2.44"; + winapi = "0.3.6"; + }; + deps.rand."0.6.1" = { + rand_chacha = "0.1.0"; + rand_core = "0.3.0"; + rand_hc = "0.1.0"; + rand_isaac = "0.1.1"; + rand_pcg = "0.1.1"; + rand_xorshift = "0.1.0"; + rustc_version = "0.2.3"; + cloudabi = "0.0.3"; + fuchsia_zircon = "0.3.3"; + libc = "0.2.44"; + winapi = "0.3.6"; + }; + deps.rand_chacha."0.1.0" = { + rand_core = "0.3.0"; + rustc_version = "0.2.3"; + }; + deps.rand_core."0.2.2" = { + rand_core = "0.3.0"; + }; + deps.rand_core."0.3.0" = {}; + deps.rand_hc."0.1.0" = { + rand_core = "0.3.0"; + }; + deps.rand_isaac."0.1.1" = { + rand_core = "0.3.0"; + }; + deps.rand_pcg."0.1.1" = { + rand_core = "0.3.0"; + rustc_version = "0.2.3"; + }; + deps.rand_xorshift."0.1.0" = { + rand_core = "0.3.0"; + }; + deps.redox_syscall."0.1.31" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.31"; + }; + deps.regex."0.1.80" = { + aho_corasick = "0.5.3"; + memchr = "0.1.11"; + regex_syntax = "0.3.9"; + thread_local = "0.2.7"; + utf8_ranges = "0.1.3"; + }; + deps.regex_syntax."0.3.9" = {}; + deps.remove_dir_all."0.5.1" = { + winapi = "0.3.6"; + }; + deps.reqwest."0.9.5" = { + base64 = "0.9.3"; + bytes = "0.4.11"; + encoding_rs = "0.8.13"; + futures = "0.1.25"; + http = "0.1.14"; + hyper = "0.12.16"; + hyper_tls = "0.3.1"; + libflate = "0.1.19"; + log = "0.4.6"; + mime = "0.3.12"; + mime_guess = "2.0.0-alpha.6"; + native_tls = "0.2.2"; + serde = "1.0.21"; + serde_json = "1.0.6"; + serde_urlencoded = "0.5.1"; + tokio = "0.1.7"; + tokio_io = "0.1.10"; + url = "1.6.0"; + uuid = "0.7.1"; + }; + deps.rustc_version."0.2.3" = { + semver = "0.9.0"; + }; + deps.safemem."0.3.0" = {}; + deps.schannel."0.1.14" = { + lazy_static = "1.2.0"; + winapi = "0.3.6"; + }; + deps.scopeguard."0.3.3" = {}; + deps.security_framework."0.2.1" = { + core_foundation = "0.5.1"; + core_foundation_sys = "0.5.1"; + libc = "0.2.44"; + security_framework_sys = "0.2.1"; + }; + deps.security_framework_sys."0.2.1" = { + core_foundation_sys = "0.5.1"; + libc = "0.2.44"; + }; + deps.semver."0.9.0" = { + semver_parser = "0.7.0"; + }; + deps.semver_parser."0.7.0" = {}; + deps.serde."1.0.21" = {}; + deps.serde_json."1.0.6" = { + dtoa = "0.4.2"; + itoa = "0.3.4"; + num_traits = "0.1.40"; + serde = "1.0.21"; + }; + deps.serde_urlencoded."0.5.1" = { + dtoa = "0.4.2"; + itoa = "0.3.4"; + serde = "1.0.21"; + url = "1.6.0"; + }; + deps.siphasher."0.2.2" = {}; + deps.slab."0.4.0" = {}; + deps.slog."1.7.1" = {}; + deps.slog_envlogger."0.5.0" = { + log = "0.3.8"; + regex = "0.1.80"; + slog = "1.7.1"; + slog_stdlog = "1.1.0"; + slog_term = "1.5.0"; + }; + deps.slog_extra."0.1.2" = { + slog = "1.7.1"; + thread_local = "0.3.4"; + }; + deps.slog_stdlog."1.1.0" = { + crossbeam = "0.2.10"; + lazy_static = "0.2.10"; + log = "0.3.8"; + slog = "1.7.1"; + slog_term = "1.5.0"; + }; + deps.slog_stream."1.2.1" = { + slog = "1.7.1"; + slog_extra = "0.1.2"; + thread_local = "0.3.4"; + }; + deps.slog_term."1.5.0" = { + chrono = "0.2.25"; + isatty = "0.1.5"; + slog = "1.7.1"; + slog_stream = "1.2.1"; + thread_local = "0.3.4"; + }; + deps.smallvec."0.6.7" = { + unreachable = "1.0.0"; + }; + deps.stable_deref_trait."1.1.1" = {}; + deps.string."0.1.2" = {}; + deps.strsim."0.6.0" = {}; + deps.syn."0.11.11" = { + quote = "0.3.15"; + synom = "0.11.3"; + unicode_xid = "0.0.4"; + }; + deps.synom."0.11.3" = { + unicode_xid = "0.0.4"; + }; + deps.tar."0.4.13" = { + filetime = "0.1.14"; + libc = "0.2.44"; + xattr = "0.1.11"; + }; + deps.tempfile."3.0.5" = { + cfg_if = "0.1.2"; + rand = "0.6.1"; + remove_dir_all = "0.5.1"; + redox_syscall = "0.1.31"; + libc = "0.2.44"; + winapi = "0.3.6"; + }; + deps.termion."1.5.1" = { + libc = "0.2.44"; + redox_syscall = "0.1.31"; + redox_termios = "0.1.1"; + }; + deps.textwrap."0.9.0" = { + unicode_width = "0.1.4"; + }; + deps.thread_id."2.0.0" = { + kernel32_sys = "0.2.2"; + libc = "0.2.44"; + }; + deps.thread_local."0.2.7" = { + thread_id = "2.0.0"; + }; + deps.thread_local."0.3.4" = { + lazy_static = "0.2.10"; + unreachable = "1.0.0"; + }; + deps.time."0.1.38" = { + libc = "0.2.44"; + redox_syscall = "0.1.31"; + kernel32_sys = "0.2.2"; + winapi = "0.2.8"; + }; + deps.tokio."0.1.7" = { + futures = "0.1.25"; + mio = "0.6.16"; + tokio_executor = "0.1.5"; + tokio_fs = "0.1.4"; + tokio_io = "0.1.10"; + tokio_reactor = "0.1.7"; + tokio_tcp = "0.1.2"; + tokio_threadpool = "0.1.9"; + tokio_timer = "0.2.5"; + tokio_udp = "0.1.3"; + }; + deps.tokio_codec."0.1.1" = { + bytes = "0.4.11"; + futures = "0.1.25"; + tokio_io = "0.1.10"; + }; + deps.tokio_executor."0.1.5" = { + futures = "0.1.25"; + }; + deps.tokio_fs."0.1.4" = { + futures = "0.1.25"; + tokio_io = "0.1.10"; + tokio_threadpool = "0.1.9"; + }; + deps.tokio_io."0.1.10" = { + bytes = "0.4.11"; + futures = "0.1.25"; + log = "0.4.6"; + }; + deps.tokio_reactor."0.1.7" = { + crossbeam_utils = "0.6.1"; + futures = "0.1.25"; + lazy_static = "1.2.0"; + log = "0.4.6"; + mio = "0.6.16"; + num_cpus = "1.8.0"; + parking_lot = "0.6.4"; + slab = "0.4.0"; + tokio_executor = "0.1.5"; + tokio_io = "0.1.10"; + }; + deps.tokio_tcp."0.1.2" = { + bytes = "0.4.11"; + futures = "0.1.25"; + iovec = "0.1.1"; + mio = "0.6.16"; + tokio_io = "0.1.10"; + tokio_reactor = "0.1.7"; + }; + deps.tokio_threadpool."0.1.9" = { + crossbeam_deque = "0.6.2"; + crossbeam_utils = "0.6.1"; + futures = "0.1.25"; + log = "0.4.6"; + num_cpus = "1.8.0"; + rand = "0.6.1"; + tokio_executor = "0.1.5"; + }; + deps.tokio_timer."0.2.5" = { + futures = "0.1.25"; + tokio_executor = "0.1.5"; + }; + deps.tokio_udp."0.1.3" = { + bytes = "0.4.11"; + futures = "0.1.25"; + log = "0.4.6"; + mio = "0.6.16"; + tokio_codec = "0.1.1"; + tokio_io = "0.1.10"; + tokio_reactor = "0.1.7"; + }; + deps.try_lock."0.2.2" = {}; + deps.unicase."1.4.2" = { + version_check = "0.1.3"; + }; + deps.unicase."2.1.0" = { + version_check = "0.1.3"; + }; + deps.unicode_bidi."0.3.4" = { + matches = "0.1.6"; + }; + deps.unicode_normalization."0.1.5" = {}; + deps.unicode_width."0.1.4" = {}; + deps.unicode_xid."0.0.4" = {}; + deps.unreachable."1.0.0" = { + void = "1.0.2"; + }; + deps.url."1.6.0" = { + idna = "0.1.4"; + matches = "0.1.6"; + percent_encoding = "1.0.1"; + }; + deps.utf8_ranges."0.1.3" = {}; + deps.uuid."0.7.1" = { + rand = "0.5.5"; + }; + deps.vcpkg."0.2.2" = {}; + deps.vec_map."0.8.0" = {}; + deps.version_check."0.1.3" = {}; + deps.void."1.0.2" = {}; + deps.want."0.0.6" = { + futures = "0.1.25"; + log = "0.4.6"; + try_lock = "0.2.2"; + }; + deps.winapi."0.2.8" = {}; + deps.winapi."0.3.6" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_build."0.1.1" = {}; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; + deps.ws2_32_sys."0.2.1" = { + winapi = "0.2.8"; + winapi_build = "0.1.1"; + }; + deps.xattr."0.1.11" = { + libc = "0.2.44"; + }; } diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix new file mode 100644 index 000000000000..d120a05e00d7 --- /dev/null +++ b/pkgs/tools/package-management/cargo-download/crates-io.nix @@ -0,0 +1,5289 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + +# adler32-1.0.2 + + crates.adler32."1.0.2" = deps: { features?(features_.adler32."1.0.2" deps {}) }: buildRustCrate { + crateName = "adler32"; + version = "1.0.2"; + description = "Minimal Adler32 implementation for Rust."; + authors = [ "Remi Rampin <remirampin@gmail.com>" ]; + sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4"; + }; + features_.adler32."1.0.2" = deps: f: updateFeatures f (rec { + adler32."1.0.2".default = (f.adler32."1.0.2".default or true); + }) []; + + +# end +# aho-corasick-0.5.3 + + crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.5.3"; + description = "Fast multiple substring searching with finite state machines."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec { + aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); + memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.5.3"."memchr"}" deps) + ]; + + +# end +# ansi_term-0.9.0 + + crates.ansi_term."0.9.0" = deps: { features?(features_.ansi_term."0.9.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + description = "Library for ANSI terminal colours and styles (bold, underline)"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + }; + features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec { + ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true); + }) []; + + +# end +# arrayvec-0.4.8 + + crates.arrayvec."0.4.8" = deps: { features?(features_.arrayvec."0.4.8" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.8"; + description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."; + authors = [ "bluss" ]; + sha256 = "0zwpjdxgr0a11h9x7mkrif4wyx3c81b90paxjf326i86s13kib1g"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.8"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.8" or {}); + }; + features_.arrayvec."0.4.8" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.8"."serde" = + (f.arrayvec."0.4.8"."serde" or false) || + (f.arrayvec."0.4.8".serde-1 or false) || + (arrayvec."0.4.8"."serde-1" or false); } + { "0.4.8"."std" = + (f.arrayvec."0.4.8"."std" or false) || + (f.arrayvec."0.4.8".default or false) || + (arrayvec."0.4.8"."default" or false); } + { "0.4.8".default = (f.arrayvec."0.4.8".default or true); } + ]; + nodrop."${deps.arrayvec."0.4.8".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.8".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.8"."nodrop"}" deps) + ]; + + +# end +# atty-0.2.3 + + crates.atty."0.2.3" = deps: { features?(features_.atty."0.2.3" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + description = "A simple interface for querying atty"; + authors = [ "softprops <d.tangren@gmail.com>" ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.3"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.3"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."atty"."0.2.3"."kernel32_sys"}" deps) + (crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.3" = deps: f: updateFeatures f (rec { + atty."0.2.3".default = (f.atty."0.2.3".default or true); + kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true; + libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false); + termion."${deps.atty."0.2.3".termion}".default = true; + winapi."${deps.atty."0.2.3".winapi}".default = true; + }) [ + (features_.termion."${deps."atty"."0.2.3"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.3"."libc"}" deps) + (features_.kernel32_sys."${deps."atty"."0.2.3"."kernel32_sys"}" deps) + (features_.winapi."${deps."atty"."0.2.3"."winapi"}" deps) + ]; + + +# end +# base64-0.9.3 + + crates.base64."0.9.3" = deps: { features?(features_.base64."0.9.3" deps {}) }: buildRustCrate { + crateName = "base64"; + version = "0.9.3"; + description = "encodes and decodes base64 as bytes or utf8"; + authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ]; + sha256 = "11hhz8ln4zbpn2h2gm9fbbb9j254wrd4fpmddlyah2rrnqsmmqkd"; + dependencies = mapFeatures features ([ + (crates."byteorder"."${deps."base64"."0.9.3"."byteorder"}" deps) + (crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps) + ]); + }; + features_.base64."0.9.3" = deps: f: updateFeatures f (rec { + base64."0.9.3".default = (f.base64."0.9.3".default or true); + byteorder."${deps.base64."0.9.3".byteorder}".default = true; + safemem."${deps.base64."0.9.3".safemem}".default = true; + }) [ + (features_.byteorder."${deps."base64"."0.9.3"."byteorder"}" deps) + (features_.safemem."${deps."base64"."0.9.3"."safemem"}" deps) + ]; + + +# end +# bitflags-0.7.0 + + crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + description = "A macro to generate structures which behave like bitflags.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + }; + features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec { + bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); + }) []; + + +# end +# bitflags-0.9.1 + + crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + description = "A macro to generate structures which behave like bitflags.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + features = mkFeatures (features."bitflags"."0.9.1" or {}); + }; + features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec { + bitflags = fold recursiveUpdate {} [ + { "0.9.1"."example_generated" = + (f.bitflags."0.9.1"."example_generated" or false) || + (f.bitflags."0.9.1".default or false) || + (bitflags."0.9.1"."default" or false); } + { "0.9.1".default = (f.bitflags."0.9.1".default or true); } + ]; + }) []; + + +# end +# bitflags-1.0.4 + + crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.4"; + description = "A macro to generate structures which behave like bitflags.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; + features = mkFeatures (features."bitflags"."1.0.4" or {}); + }; + features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); + }) []; + + +# end +# byteorder-1.1.0 + + crates.byteorder."1.1.0" = deps: { features?(features_.byteorder."1.1.0" deps {}) }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + description = "Library for reading/writing numbers in big-endian and little-endian."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + features = mkFeatures (features."byteorder"."1.1.0" or {}); + }; + features_.byteorder."1.1.0" = deps: f: updateFeatures f (rec { + byteorder = fold recursiveUpdate {} [ + { "1.1.0"."std" = + (f.byteorder."1.1.0"."std" or false) || + (f.byteorder."1.1.0".default or false) || + (byteorder."1.1.0"."default" or false); } + { "1.1.0".default = (f.byteorder."1.1.0".default or true); } + ]; + }) []; + + +# end +# bytes-0.4.11 + + crates.bytes."0.4.11" = deps: { features?(features_.bytes."0.4.11" deps {}) }: buildRustCrate { + crateName = "bytes"; + version = "0.4.11"; + description = "Types and traits for working with bytes"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1lk8bnxcd8shiizarf0n6ljmj1542n90jw6lz6i270gxl7rzplmh"; + dependencies = mapFeatures features ([ + (crates."byteorder"."${deps."bytes"."0.4.11"."byteorder"}" deps) + (crates."iovec"."${deps."bytes"."0.4.11"."iovec"}" deps) + ]); + features = mkFeatures (features."bytes"."0.4.11" or {}); + }; + features_.bytes."0.4.11" = deps: f: updateFeatures f (rec { + byteorder = fold recursiveUpdate {} [ + { "${deps.bytes."0.4.11".byteorder}"."i128" = + (f.byteorder."${deps.bytes."0.4.11".byteorder}"."i128" or false) || + (bytes."0.4.11"."i128" or false) || + (f."bytes"."0.4.11"."i128" or false); } + { "${deps.bytes."0.4.11".byteorder}".default = true; } + ]; + bytes."0.4.11".default = (f.bytes."0.4.11".default or true); + iovec."${deps.bytes."0.4.11".iovec}".default = true; + }) [ + (features_.byteorder."${deps."bytes"."0.4.11"."byteorder"}" deps) + (features_.iovec."${deps."bytes"."0.4.11"."iovec"}" deps) + ]; + + +# end +# cargo-download-0.1.2 + + crates.cargo_download."0.1.2" = deps: { features?(features_.cargo_download."0.1.2" deps {}) }: buildRustCrate { + crateName = "cargo-download"; + version = "0.1.2"; + description = "Cargo subcommand for downloading crate sources"; + authors = [ "Karol Kuczmarski <karol.kuczmarski@gmail.com>" ]; + sha256 = "1gfn0iabiriq0n9sqkyp2g73rw12mr9ng61fx198xaffflxk7g36"; + crateBin = + [{ name = "cargo-download"; }]; + dependencies = mapFeatures features ([ + (crates."ansi_term"."${deps."cargo_download"."0.1.2"."ansi_term"}" deps) + (crates."clap"."${deps."cargo_download"."0.1.2"."clap"}" deps) + (crates."conv"."${deps."cargo_download"."0.1.2"."conv"}" deps) + (crates."derive_error"."${deps."cargo_download"."0.1.2"."derive_error"}" deps) + (crates."exitcode"."${deps."cargo_download"."0.1.2"."exitcode"}" deps) + (crates."flate2"."${deps."cargo_download"."0.1.2"."flate2"}" deps) + (crates."isatty"."${deps."cargo_download"."0.1.2"."isatty"}" deps) + (crates."itertools"."${deps."cargo_download"."0.1.2"."itertools"}" deps) + (crates."lazy_static"."${deps."cargo_download"."0.1.2"."lazy_static"}" deps) + (crates."log"."${deps."cargo_download"."0.1.2"."log"}" deps) + (crates."maplit"."${deps."cargo_download"."0.1.2"."maplit"}" deps) + (crates."reqwest"."${deps."cargo_download"."0.1.2"."reqwest"}" deps) + (crates."semver"."${deps."cargo_download"."0.1.2"."semver"}" deps) + (crates."serde_json"."${deps."cargo_download"."0.1.2"."serde_json"}" deps) + (crates."slog"."${deps."cargo_download"."0.1.2"."slog"}" deps) + (crates."slog_envlogger"."${deps."cargo_download"."0.1.2"."slog_envlogger"}" deps) + (crates."slog_stdlog"."${deps."cargo_download"."0.1.2"."slog_stdlog"}" deps) + (crates."slog_stream"."${deps."cargo_download"."0.1.2"."slog_stream"}" deps) + (crates."tar"."${deps."cargo_download"."0.1.2"."tar"}" deps) + (crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps) + ]); + }; + features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec { + ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true; + cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true); + clap."${deps.cargo_download."0.1.2".clap}".default = true; + conv."${deps.cargo_download."0.1.2".conv}".default = true; + derive_error."${deps.cargo_download."0.1.2".derive_error}".default = true; + exitcode."${deps.cargo_download."0.1.2".exitcode}".default = true; + flate2."${deps.cargo_download."0.1.2".flate2}".default = true; + isatty."${deps.cargo_download."0.1.2".isatty}".default = true; + itertools."${deps.cargo_download."0.1.2".itertools}".default = true; + lazy_static."${deps.cargo_download."0.1.2".lazy_static}".default = true; + log."${deps.cargo_download."0.1.2".log}".default = true; + maplit."${deps.cargo_download."0.1.2".maplit}".default = true; + reqwest."${deps.cargo_download."0.1.2".reqwest}".default = true; + semver."${deps.cargo_download."0.1.2".semver}".default = true; + serde_json."${deps.cargo_download."0.1.2".serde_json}".default = true; + slog."${deps.cargo_download."0.1.2".slog}".default = true; + slog_envlogger."${deps.cargo_download."0.1.2".slog_envlogger}".default = true; + slog_stdlog."${deps.cargo_download."0.1.2".slog_stdlog}".default = true; + slog_stream."${deps.cargo_download."0.1.2".slog_stream}".default = true; + tar."${deps.cargo_download."0.1.2".tar}".default = true; + time."${deps.cargo_download."0.1.2".time}".default = true; + }) [ + (features_.ansi_term."${deps."cargo_download"."0.1.2"."ansi_term"}" deps) + (features_.clap."${deps."cargo_download"."0.1.2"."clap"}" deps) + (features_.conv."${deps."cargo_download"."0.1.2"."conv"}" deps) + (features_.derive_error."${deps."cargo_download"."0.1.2"."derive_error"}" deps) + (features_.exitcode."${deps."cargo_download"."0.1.2"."exitcode"}" deps) + (features_.flate2."${deps."cargo_download"."0.1.2"."flate2"}" deps) + (features_.isatty."${deps."cargo_download"."0.1.2"."isatty"}" deps) + (features_.itertools."${deps."cargo_download"."0.1.2"."itertools"}" deps) + (features_.lazy_static."${deps."cargo_download"."0.1.2"."lazy_static"}" deps) + (features_.log."${deps."cargo_download"."0.1.2"."log"}" deps) + (features_.maplit."${deps."cargo_download"."0.1.2"."maplit"}" deps) + (features_.reqwest."${deps."cargo_download"."0.1.2"."reqwest"}" deps) + (features_.semver."${deps."cargo_download"."0.1.2"."semver"}" deps) + (features_.serde_json."${deps."cargo_download"."0.1.2"."serde_json"}" deps) + (features_.slog."${deps."cargo_download"."0.1.2"."slog"}" deps) + (features_.slog_envlogger."${deps."cargo_download"."0.1.2"."slog_envlogger"}" deps) + (features_.slog_stdlog."${deps."cargo_download"."0.1.2"."slog_stdlog"}" deps) + (features_.slog_stream."${deps."cargo_download"."0.1.2"."slog_stream"}" deps) + (features_.tar."${deps."cargo_download"."0.1.2"."tar"}" deps) + (features_.time."${deps."cargo_download"."0.1.2"."time"}" deps) + ]; + + +# end +# case-0.1.0 + + crates.case."0.1.0" = deps: { features?(features_.case."0.1.0" deps {}) }: buildRustCrate { + crateName = "case"; + version = "0.1.0"; + description = "A set of letter case string helpers"; + authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ]; + sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; + }; + features_.case."0.1.0" = deps: f: updateFeatures f (rec { + case."0.1.0".default = (f.case."0.1.0".default or true); + }) []; + + +# end +# cc-1.0.3 + + crates.cc."1.0.3" = deps: { features?(features_.cc."1.0.3" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.3"; + description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.3" or {}); + }; + features_.cc."1.0.3" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.3"."rayon" = + (f.cc."1.0.3"."rayon" or false) || + (f.cc."1.0.3".parallel or false) || + (cc."1.0.3"."parallel" or false); } + { "1.0.3".default = (f.cc."1.0.3".default or true); } + ]; + }) []; + + +# end +# cfg-if-0.1.2 + + crates.cfg_if."0.1.2" = deps: { features?(features_.cfg_if."0.1.2" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + }; + features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec { + cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true); + }) []; + + +# end +# chrono-0.2.25 + + crates.chrono."0.2.25" = deps: { features?(features_.chrono."0.2.25" deps {}) }: buildRustCrate { + crateName = "chrono"; + version = "0.2.25"; + description = "Date and time library for Rust"; + authors = [ "Kang Seonghoon <public+rust@mearie.org>" ]; + sha256 = "0gsvqk8cnmm43qj3xyngqvfqh50cbdbqas7ik0wjgnvknirmmca7"; + dependencies = mapFeatures features ([ + (crates."num"."${deps."chrono"."0.2.25"."num"}" deps) + (crates."time"."${deps."chrono"."0.2.25"."time"}" deps) + ]); + }; + features_.chrono."0.2.25" = deps: f: updateFeatures f (rec { + chrono."0.2.25".default = (f.chrono."0.2.25".default or true); + num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false); + time."${deps.chrono."0.2.25".time}".default = true; + }) [ + (features_.num."${deps."chrono"."0.2.25"."num"}" deps) + (features_.time."${deps."chrono"."0.2.25"."time"}" deps) + ]; + + +# end +# clap-2.27.1 + + crates.clap."2.27.1" = deps: { features?(features_.clap."2.27.1" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.27.1"; + description = "A simple to use, efficient, and full featured Command Line Argument Parser\n"; + authors = [ "Kevin K. <kbknapp@gmail.com>" ]; + sha256 = "0zx8rskqfl3iqn3vlyxzyd99hpifa7bm871akhxpz9wvrm688zaj"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.27.1"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.27.1"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.27.1"."unicode_width"}" deps) + ] + ++ (if features.clap."2.27.1".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.27.1".ansi_term}" deps) ] else []) + ++ (if features.clap."2.27.1".atty or false then [ (crates.atty."${deps."clap"."2.27.1".atty}" deps) ] else []) + ++ (if features.clap."2.27.1".strsim or false then [ (crates.strsim."${deps."clap"."2.27.1".strsim}" deps) ] else []) + ++ (if features.clap."2.27.1".vec_map or false then [ (crates.vec_map."${deps."clap"."2.27.1".vec_map}" deps) ] else [])); + features = mkFeatures (features."clap"."2.27.1" or {}); + }; + features_.clap."2.27.1" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.27.1".ansi_term}".default = true; + atty."${deps.clap."2.27.1".atty}".default = true; + bitflags."${deps.clap."2.27.1".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.27.1"."ansi_term" = + (f.clap."2.27.1"."ansi_term" or false) || + (f.clap."2.27.1".color or false) || + (clap."2.27.1"."color" or false); } + { "2.27.1"."atty" = + (f.clap."2.27.1"."atty" or false) || + (f.clap."2.27.1".color or false) || + (clap."2.27.1"."color" or false); } + { "2.27.1"."clippy" = + (f.clap."2.27.1"."clippy" or false) || + (f.clap."2.27.1".lints or false) || + (clap."2.27.1"."lints" or false); } + { "2.27.1"."color" = + (f.clap."2.27.1"."color" or false) || + (f.clap."2.27.1".default or false) || + (clap."2.27.1"."default" or false); } + { "2.27.1"."strsim" = + (f.clap."2.27.1"."strsim" or false) || + (f.clap."2.27.1".suggestions or false) || + (clap."2.27.1"."suggestions" or false); } + { "2.27.1"."suggestions" = + (f.clap."2.27.1"."suggestions" or false) || + (f.clap."2.27.1".default or false) || + (clap."2.27.1"."default" or false); } + { "2.27.1"."term_size" = + (f.clap."2.27.1"."term_size" or false) || + (f.clap."2.27.1".wrap_help or false) || + (clap."2.27.1"."wrap_help" or false); } + { "2.27.1"."vec_map" = + (f.clap."2.27.1"."vec_map" or false) || + (f.clap."2.27.1".default or false) || + (clap."2.27.1"."default" or false); } + { "2.27.1"."yaml" = + (f.clap."2.27.1"."yaml" or false) || + (f.clap."2.27.1".doc or false) || + (clap."2.27.1"."doc" or false); } + { "2.27.1"."yaml-rust" = + (f.clap."2.27.1"."yaml-rust" or false) || + (f.clap."2.27.1".yaml or false) || + (clap."2.27.1"."yaml" or false); } + { "2.27.1".default = (f.clap."2.27.1".default or true); } + ]; + strsim."${deps.clap."2.27.1".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.27.1".textwrap}"."term_size" = + (f.textwrap."${deps.clap."2.27.1".textwrap}"."term_size" or false) || + (clap."2.27.1"."wrap_help" or false) || + (f."clap"."2.27.1"."wrap_help" or false); } + { "${deps.clap."2.27.1".textwrap}".default = true; } + ]; + unicode_width."${deps.clap."2.27.1".unicode_width}".default = true; + vec_map."${deps.clap."2.27.1".vec_map}".default = true; + }) [ + (features_.ansi_term."${deps."clap"."2.27.1"."ansi_term"}" deps) + (features_.atty."${deps."clap"."2.27.1"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.27.1"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.27.1"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.27.1"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.27.1"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.27.1"."vec_map"}" deps) + ]; + + +# end +# cloudabi-0.0.3 + + crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate { + crateName = "cloudabi"; + version = "0.0.3"; + description = "Low level interface to CloudABI. Contains all syscalls and related types."; + authors = [ "Nuxi (https://nuxi.nl/) and contributors" ]; + sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5"; + libPath = "cloudabi.rs"; + dependencies = mapFeatures features ([ + ] + ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else [])); + features = mkFeatures (features."cloudabi"."0.0.3" or {}); + }; + features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true; + cloudabi = fold recursiveUpdate {} [ + { "0.0.3"."bitflags" = + (f.cloudabi."0.0.3"."bitflags" or false) || + (f.cloudabi."0.0.3".default or false) || + (cloudabi."0.0.3"."default" or false); } + { "0.0.3".default = (f.cloudabi."0.0.3".default or true); } + ]; + }) [ + (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps) + ]; + + +# end +# conv-0.3.3 + + crates.conv."0.3.3" = deps: { features?(features_.conv."0.3.3" deps {}) }: buildRustCrate { + crateName = "conv"; + version = "0.3.3"; + description = "This crate provides a number of conversion traits with more specific semantics than those provided by 'as' or 'From'/'Into'."; + authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; + sha256 = "08rl72k1a48xah0ar5l9v1bw19pp8jdw2pdkd3vvj9ijsyyg9yik"; + dependencies = mapFeatures features ([ + (crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps) + ]); + }; + features_.conv."0.3.3" = deps: f: updateFeatures f (rec { + conv."0.3.3".default = (f.conv."0.3.3".default or true); + custom_derive."${deps.conv."0.3.3".custom_derive}".default = true; + }) [ + (features_.custom_derive."${deps."conv"."0.3.3"."custom_derive"}" deps) + ]; + + +# end +# core-foundation-0.5.1 + + crates.core_foundation."0.5.1" = deps: { features?(features_.core_foundation."0.5.1" deps {}) }: buildRustCrate { + crateName = "core-foundation"; + version = "0.5.1"; + description = "Bindings to Core Foundation for OS X"; + authors = [ "The Servo Project Developers" ]; + sha256 = "03s11z23rb1kk325c34rmsbd7k0l5rkzk4q6id55n174z28zqln1"; + dependencies = mapFeatures features ([ + (crates."core_foundation_sys"."${deps."core_foundation"."0.5.1"."core_foundation_sys"}" deps) + (crates."libc"."${deps."core_foundation"."0.5.1"."libc"}" deps) + ]); + features = mkFeatures (features."core_foundation"."0.5.1" or {}); + }; + features_.core_foundation."0.5.1" = deps: f: updateFeatures f (rec { + core_foundation = fold recursiveUpdate {} [ + { "0.5.1"."chrono" = + (f.core_foundation."0.5.1"."chrono" or false) || + (f.core_foundation."0.5.1".with-chrono or false) || + (core_foundation."0.5.1"."with-chrono" or false); } + { "0.5.1"."uuid" = + (f.core_foundation."0.5.1"."uuid" or false) || + (f.core_foundation."0.5.1".with-uuid or false) || + (core_foundation."0.5.1"."with-uuid" or false); } + { "0.5.1".default = (f.core_foundation."0.5.1".default or true); } + ]; + core_foundation_sys = fold recursiveUpdate {} [ + { "${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_7_support" = + (f.core_foundation_sys."${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_7_support" or false) || + (core_foundation."0.5.1"."mac_os_10_7_support" or false) || + (f."core_foundation"."0.5.1"."mac_os_10_7_support" or false); } + { "${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_8_features" = + (f.core_foundation_sys."${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_8_features" or false) || + (core_foundation."0.5.1"."mac_os_10_8_features" or false) || + (f."core_foundation"."0.5.1"."mac_os_10_8_features" or false); } + { "${deps.core_foundation."0.5.1".core_foundation_sys}".default = true; } + ]; + libc."${deps.core_foundation."0.5.1".libc}".default = true; + }) [ + (features_.core_foundation_sys."${deps."core_foundation"."0.5.1"."core_foundation_sys"}" deps) + (features_.libc."${deps."core_foundation"."0.5.1"."libc"}" deps) + ]; + + +# end +# core-foundation-sys-0.5.1 + + crates.core_foundation_sys."0.5.1" = deps: { features?(features_.core_foundation_sys."0.5.1" deps {}) }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.5.1"; + description = "Bindings to Core Foundation for OS X"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0qbrasll5nw1bgr071i8s8jc975d0y4qfysf868bh9xp0f6vcypa"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."core_foundation_sys"."0.5.1"."libc"}" deps) + ]); + features = mkFeatures (features."core_foundation_sys"."0.5.1" or {}); + }; + features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec { + core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true); + libc."${deps.core_foundation_sys."0.5.1".libc}".default = true; + }) [ + (features_.libc."${deps."core_foundation_sys"."0.5.1"."libc"}" deps) + ]; + + +# end +# crc32fast-1.1.1 + + crates.crc32fast."1.1.1" = deps: { features?(features_.crc32fast."1.1.1" deps {}) }: buildRustCrate { + crateName = "crc32fast"; + version = "1.1.1"; + description = "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation"; + authors = [ "Sam Rijs <srijs@airpost.net>" "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy"; + }; + features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec { + crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true); + }) []; + + +# end +# crossbeam-0.2.10 + + crates.crossbeam."0.2.10" = deps: { features?(features_.crossbeam."0.2.10" deps {}) }: buildRustCrate { + crateName = "crossbeam"; + version = "0.2.10"; + description = "Support for lock-free data structures, synchronizers, and parallel programming"; + authors = [ "Aaron Turon <aturon@mozilla.com>" ]; + sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; + features = mkFeatures (features."crossbeam"."0.2.10" or {}); + }; + features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec { + crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true); + }) []; + + +# end +# crossbeam-deque-0.6.2 + + crates.crossbeam_deque."0.6.2" = deps: { features?(features_.crossbeam_deque."0.6.2" deps {}) }: buildRustCrate { + crateName = "crossbeam-deque"; + version = "0.6.2"; + description = "Concurrent work-stealing deque"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "0qjdpq03snj6xp5gydgy1bdd5zzwpdxa57vhky3mf4djxiq81ara"; + dependencies = mapFeatures features ([ + (crates."crossbeam_epoch"."${deps."crossbeam_deque"."0.6.2"."crossbeam_epoch"}" deps) + (crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) + ]); + }; + features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec { + crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true); + crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true; + crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true; + }) [ + (features_.crossbeam_epoch."${deps."crossbeam_deque"."0.6.2"."crossbeam_epoch"}" deps) + (features_.crossbeam_utils."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) + ]; + + +# end +# crossbeam-epoch-0.6.1 + + crates.crossbeam_epoch."0.6.1" = deps: { features?(features_.crossbeam_epoch."0.6.1" deps {}) }: buildRustCrate { + crateName = "crossbeam-epoch"; + version = "0.6.1"; + description = "Epoch-based garbage collection"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "0qlwzsf2xmdjbh6pv9bxra2qdq72cmywq4fq1q114zw2s06zr039"; + dependencies = mapFeatures features ([ + (crates."arrayvec"."${deps."crossbeam_epoch"."0.6.1"."arrayvec"}" deps) + (crates."cfg_if"."${deps."crossbeam_epoch"."0.6.1"."cfg_if"}" deps) + (crates."crossbeam_utils"."${deps."crossbeam_epoch"."0.6.1"."crossbeam_utils"}" deps) + (crates."memoffset"."${deps."crossbeam_epoch"."0.6.1"."memoffset"}" deps) + (crates."scopeguard"."${deps."crossbeam_epoch"."0.6.1"."scopeguard"}" deps) + ] + ++ (if features.crossbeam_epoch."0.6.1".lazy_static or false then [ (crates.lazy_static."${deps."crossbeam_epoch"."0.6.1".lazy_static}" deps) ] else [])); + features = mkFeatures (features."crossbeam_epoch"."0.6.1" or {}); + }; + features_.crossbeam_epoch."0.6.1" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "${deps.crossbeam_epoch."0.6.1".arrayvec}"."use_union" = + (f.arrayvec."${deps.crossbeam_epoch."0.6.1".arrayvec}"."use_union" or false) || + (crossbeam_epoch."0.6.1"."nightly" or false) || + (f."crossbeam_epoch"."0.6.1"."nightly" or false); } + { "${deps.crossbeam_epoch."0.6.1".arrayvec}".default = (f.arrayvec."${deps.crossbeam_epoch."0.6.1".arrayvec}".default or false); } + ]; + cfg_if."${deps.crossbeam_epoch."0.6.1".cfg_if}".default = true; + crossbeam_epoch = fold recursiveUpdate {} [ + { "0.6.1"."lazy_static" = + (f.crossbeam_epoch."0.6.1"."lazy_static" or false) || + (f.crossbeam_epoch."0.6.1".std or false) || + (crossbeam_epoch."0.6.1"."std" or false); } + { "0.6.1"."std" = + (f.crossbeam_epoch."0.6.1"."std" or false) || + (f.crossbeam_epoch."0.6.1".default or false) || + (crossbeam_epoch."0.6.1"."default" or false); } + { "0.6.1".default = (f.crossbeam_epoch."0.6.1".default or true); } + ]; + crossbeam_utils = fold recursiveUpdate {} [ + { "${deps.crossbeam_epoch."0.6.1".crossbeam_utils}"."std" = + (f.crossbeam_utils."${deps.crossbeam_epoch."0.6.1".crossbeam_utils}"."std" or false) || + (crossbeam_epoch."0.6.1"."std" or false) || + (f."crossbeam_epoch"."0.6.1"."std" or false); } + { "${deps.crossbeam_epoch."0.6.1".crossbeam_utils}".default = (f.crossbeam_utils."${deps.crossbeam_epoch."0.6.1".crossbeam_utils}".default or false); } + ]; + lazy_static."${deps.crossbeam_epoch."0.6.1".lazy_static}".default = true; + memoffset."${deps.crossbeam_epoch."0.6.1".memoffset}".default = true; + scopeguard."${deps.crossbeam_epoch."0.6.1".scopeguard}".default = (f.scopeguard."${deps.crossbeam_epoch."0.6.1".scopeguard}".default or false); + }) [ + (features_.arrayvec."${deps."crossbeam_epoch"."0.6.1"."arrayvec"}" deps) + (features_.cfg_if."${deps."crossbeam_epoch"."0.6.1"."cfg_if"}" deps) + (features_.crossbeam_utils."${deps."crossbeam_epoch"."0.6.1"."crossbeam_utils"}" deps) + (features_.lazy_static."${deps."crossbeam_epoch"."0.6.1"."lazy_static"}" deps) + (features_.memoffset."${deps."crossbeam_epoch"."0.6.1"."memoffset"}" deps) + (features_.scopeguard."${deps."crossbeam_epoch"."0.6.1"."scopeguard"}" deps) + ]; + + +# end +# crossbeam-utils-0.6.1 + + crates.crossbeam_utils."0.6.1" = deps: { features?(features_.crossbeam_utils."0.6.1" deps {}) }: buildRustCrate { + crateName = "crossbeam-utils"; + version = "0.6.1"; + description = "Utilities for concurrent programming"; + authors = [ "The Crossbeam Project Developers" ]; + sha256 = "031lk6ls49yvwkdxhjm4fvg81iww01h108jq1cnlh88yzbcnwn2c"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."crossbeam_utils"."0.6.1"."cfg_if"}" deps) + ]); + features = mkFeatures (features."crossbeam_utils"."0.6.1" or {}); + }; + features_.crossbeam_utils."0.6.1" = deps: f: updateFeatures f (rec { + cfg_if."${deps.crossbeam_utils."0.6.1".cfg_if}".default = true; + crossbeam_utils = fold recursiveUpdate {} [ + { "0.6.1"."std" = + (f.crossbeam_utils."0.6.1"."std" or false) || + (f.crossbeam_utils."0.6.1".default or false) || + (crossbeam_utils."0.6.1"."default" or false); } + { "0.6.1".default = (f.crossbeam_utils."0.6.1".default or true); } + ]; + }) [ + (features_.cfg_if."${deps."crossbeam_utils"."0.6.1"."cfg_if"}" deps) + ]; + + +# end +# custom_derive-0.1.7 + + crates.custom_derive."0.1.7" = deps: { features?(features_.custom_derive."0.1.7" deps {}) }: buildRustCrate { + crateName = "custom_derive"; + version = "0.1.7"; + description = "(Note: superseded by `macro-attr`) This crate provides a macro that enables the use of custom derive attributes."; + authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; + sha256 = "160q3pzri2fgrr6czfdkwy1sbddki2za96r7ivvyii52qp1523zs"; + features = mkFeatures (features."custom_derive"."0.1.7" or {}); + }; + features_.custom_derive."0.1.7" = deps: f: updateFeatures f (rec { + custom_derive = fold recursiveUpdate {} [ + { "0.1.7"."std" = + (f.custom_derive."0.1.7"."std" or false) || + (f.custom_derive."0.1.7".default or false) || + (custom_derive."0.1.7"."default" or false); } + { "0.1.7".default = (f.custom_derive."0.1.7".default or true); } + ]; + }) []; + + +# end +# derive-error-0.0.3 + + crates.derive_error."0.0.3" = deps: { features?(features_.derive_error."0.0.3" deps {}) }: buildRustCrate { + crateName = "derive-error"; + version = "0.0.3"; + description = "Derive macro for Error using macros 1.1"; + authors = [ "rushmorem <rushmore@webenchanter.com>" ]; + sha256 = "0239vzxn5xr9nm3i4d6hmqy7dv8llcjblgh1xixfk5dcgcqan77y"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."case"."${deps."derive_error"."0.0.3"."case"}" deps) + (crates."quote"."${deps."derive_error"."0.0.3"."quote"}" deps) + (crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps) + ]); + }; + features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec { + case."${deps.derive_error."0.0.3".case}".default = true; + derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true); + quote."${deps.derive_error."0.0.3".quote}".default = true; + syn."${deps.derive_error."0.0.3".syn}".default = true; + }) [ + (features_.case."${deps."derive_error"."0.0.3"."case"}" deps) + (features_.quote."${deps."derive_error"."0.0.3"."quote"}" deps) + (features_.syn."${deps."derive_error"."0.0.3"."syn"}" deps) + ]; + + +# end +# dtoa-0.4.2 + + crates.dtoa."0.4.2" = deps: { features?(features_.dtoa."0.4.2" deps {}) }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + description = "Fast functions for printing floating-point primitives to an io::Write"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + }; + features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec { + dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true); + }) []; + + +# end +# either-1.4.0 + + crates.either."1.4.0" = deps: { features?(features_.either."1.4.0" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.4.0"; + description = "The enum [`Either`] with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; + authors = [ "bluss" ]; + sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.4.0" or {}); + }; + features_.either."1.4.0" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.4.0"."use_std" = + (f.either."1.4.0"."use_std" or false) || + (f.either."1.4.0".default or false) || + (either."1.4.0"."default" or false); } + { "1.4.0".default = (f.either."1.4.0".default or true); } + ]; + }) []; + + +# end +# encoding_rs-0.8.13 + + crates.encoding_rs."0.8.13" = deps: { features?(features_.encoding_rs."0.8.13" deps {}) }: buildRustCrate { + crateName = "encoding_rs"; + version = "0.8.13"; + description = "A Gecko-oriented implementation of the Encoding Standard"; + authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ]; + sha256 = "1a91x1cnw1iz3hc32mvdmwhbqcfx36kk04pnil17mcii1ni6xyy5"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."encoding_rs"."0.8.13"."cfg_if"}" deps) + ]); + features = mkFeatures (features."encoding_rs"."0.8.13" or {}); + }; + features_.encoding_rs."0.8.13" = deps: f: updateFeatures f (rec { + cfg_if."${deps.encoding_rs."0.8.13".cfg_if}".default = true; + encoding_rs = fold recursiveUpdate {} [ + { "0.8.13"."fast-big5-hanzi-encode" = + (f.encoding_rs."0.8.13"."fast-big5-hanzi-encode" or false) || + (f.encoding_rs."0.8.13".fast-legacy-encode or false) || + (encoding_rs."0.8.13"."fast-legacy-encode" or false); } + { "0.8.13"."fast-gb-hanzi-encode" = + (f.encoding_rs."0.8.13"."fast-gb-hanzi-encode" or false) || + (f.encoding_rs."0.8.13".fast-legacy-encode or false) || + (encoding_rs."0.8.13"."fast-legacy-encode" or false); } + { "0.8.13"."fast-hangul-encode" = + (f.encoding_rs."0.8.13"."fast-hangul-encode" or false) || + (f.encoding_rs."0.8.13".fast-legacy-encode or false) || + (encoding_rs."0.8.13"."fast-legacy-encode" or false); } + { "0.8.13"."fast-hanja-encode" = + (f.encoding_rs."0.8.13"."fast-hanja-encode" or false) || + (f.encoding_rs."0.8.13".fast-legacy-encode or false) || + (encoding_rs."0.8.13"."fast-legacy-encode" or false); } + { "0.8.13"."fast-kanji-encode" = + (f.encoding_rs."0.8.13"."fast-kanji-encode" or false) || + (f.encoding_rs."0.8.13".fast-legacy-encode or false) || + (encoding_rs."0.8.13"."fast-legacy-encode" or false); } + { "0.8.13"."simd" = + (f.encoding_rs."0.8.13"."simd" or false) || + (f.encoding_rs."0.8.13".simd-accel or false) || + (encoding_rs."0.8.13"."simd-accel" or false); } + { "0.8.13".default = (f.encoding_rs."0.8.13".default or true); } + ]; + }) [ + (features_.cfg_if."${deps."encoding_rs"."0.8.13"."cfg_if"}" deps) + ]; + + +# end +# exitcode-1.1.2 + + crates.exitcode."1.1.2" = deps: { features?(features_.exitcode."1.1.2" deps {}) }: buildRustCrate { + crateName = "exitcode"; + version = "1.1.2"; + description = "Preferred system exit codes as defined by sysexits.h"; + authors = [ "Ben Wilber <benwilber@gmail.com>" ]; + sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; + }; + features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec { + exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true); + }) []; + + +# end +# filetime-0.1.14 + + crates.filetime."0.1.14" = deps: { features?(features_.filetime."0.1.14" deps {}) }: buildRustCrate { + crateName = "filetime"; + version = "0.1.14"; + description = "Platform-agnostic accessors of timestamps in File metadata\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0i6dvc3ba7vl1iccc91k7c9bv9j5md98mbvlmfy0kicikx0ffn08"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."filetime"."0.1.14"."cfg_if"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."filetime"."0.1.14"."redox_syscall"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps) + ]) else []); + }; + features_.filetime."0.1.14" = deps: f: updateFeatures f (rec { + cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true; + filetime."0.1.14".default = (f.filetime."0.1.14".default or true); + libc."${deps.filetime."0.1.14".libc}".default = true; + redox_syscall."${deps.filetime."0.1.14".redox_syscall}".default = true; + }) [ + (features_.cfg_if."${deps."filetime"."0.1.14"."cfg_if"}" deps) + (features_.redox_syscall."${deps."filetime"."0.1.14"."redox_syscall"}" deps) + (features_.libc."${deps."filetime"."0.1.14"."libc"}" deps) + ]; + + +# end +# flate2-0.2.20 + + crates.flate2."0.2.20" = deps: { features?(features_.flate2."0.2.20" deps {}) }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + description = "Bindings to miniz.c for DEFLATE compression and decompression exposed as\nReader/Writer streams. Contains bindings for zlib, deflate, and gzip-based\nstreams.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."flate2"."0.2.20"."libc"}" deps) + ] + ++ (if features.flate2."0.2.20".miniz-sys or false then [ (crates.miniz_sys."${deps."flate2"."0.2.20".miniz_sys}" deps) ] else [])); + features = mkFeatures (features."flate2"."0.2.20" or {}); + }; + features_.flate2."0.2.20" = deps: f: updateFeatures f (rec { + flate2 = fold recursiveUpdate {} [ + { "0.2.20"."futures" = + (f.flate2."0.2.20"."futures" or false) || + (f.flate2."0.2.20".tokio or false) || + (flate2."0.2.20"."tokio" or false); } + { "0.2.20"."libz-sys" = + (f.flate2."0.2.20"."libz-sys" or false) || + (f.flate2."0.2.20".zlib or false) || + (flate2."0.2.20"."zlib" or false); } + { "0.2.20"."miniz-sys" = + (f.flate2."0.2.20"."miniz-sys" or false) || + (f.flate2."0.2.20".default or false) || + (flate2."0.2.20"."default" or false); } + { "0.2.20"."tokio-io" = + (f.flate2."0.2.20"."tokio-io" or false) || + (f.flate2."0.2.20".tokio or false) || + (flate2."0.2.20"."tokio" or false); } + { "0.2.20".default = (f.flate2."0.2.20".default or true); } + ]; + libc."${deps.flate2."0.2.20".libc}".default = true; + miniz_sys."${deps.flate2."0.2.20".miniz_sys}".default = true; + }) [ + (features_.libc."${deps."flate2"."0.2.20"."libc"}" deps) + (features_.miniz_sys."${deps."flate2"."0.2.20"."miniz_sys"}" deps) + ]; + + +# end +# fnv-1.0.6 + + crates.fnv."1.0.6" = deps: { features?(features_.fnv."1.0.6" deps {}) }: buildRustCrate { + crateName = "fnv"; + version = "1.0.6"; + description = "Fowler–Noll–Vo hash function"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; + libPath = "lib.rs"; + }; + features_.fnv."1.0.6" = deps: f: updateFeatures f (rec { + fnv."1.0.6".default = (f.fnv."1.0.6".default or true); + }) []; + + +# end +# foreign-types-0.3.2 + + crates.foreign_types."0.3.2" = deps: { features?(features_.foreign_types."0.3.2" deps {}) }: buildRustCrate { + crateName = "foreign-types"; + version = "0.3.2"; + description = "A framework for Rust wrappers over C APIs"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; + dependencies = mapFeatures features ([ + (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) + ]); + }; + features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec { + foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); + foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; + }) [ + (features_.foreign_types_shared."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) + ]; + + +# end +# foreign-types-shared-0.1.1 + + crates.foreign_types_shared."0.1.1" = deps: { features?(features_.foreign_types_shared."0.1.1" deps {}) }: buildRustCrate { + crateName = "foreign-types-shared"; + version = "0.1.1"; + description = "An internal crate used by foreign-types"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; + }; + features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec { + foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); + }) []; + + +# end +# fuchsia-zircon-0.2.1 + + crates.fuchsia_zircon."0.2.1" = deps: { features?(features_.fuchsia_zircon."0.2.1" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + description = "Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + dependencies = mapFeatures features ([ + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec { + fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true; + }) [ + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) + ]; + + +# end +# fuchsia-zircon-0.3.3 + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + description = "Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + +# end +# fuchsia-zircon-sys-0.2.0 + + crates.fuchsia_zircon_sys."0.2.0" = deps: { features?(features_.fuchsia_zircon_sys."0.2.0" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + description = "Low-level Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) + ]); + }; + features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true; + fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true); + }) [ + (features_.bitflags."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) + ]; + + +# end +# fuchsia-zircon-sys-0.3.3 + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + description = "Low-level Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + +# end +# futures-0.1.25 + + crates.futures."0.1.25" = deps: { features?(features_.futures."0.1.25" deps {}) }: buildRustCrate { + crateName = "futures"; + version = "0.1.25"; + description = "An implementation of futures and streams featuring zero allocations,\ncomposability, and iterator-like interfaces.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1gdn9z3mi3jjzbxgvawqh90895130c3ydks55rshja0ncpn985q3"; + features = mkFeatures (features."futures"."0.1.25" or {}); + }; + features_.futures."0.1.25" = deps: f: updateFeatures f (rec { + futures = fold recursiveUpdate {} [ + { "0.1.25"."use_std" = + (f.futures."0.1.25"."use_std" or false) || + (f.futures."0.1.25".default or false) || + (futures."0.1.25"."default" or false); } + { "0.1.25"."with-deprecated" = + (f.futures."0.1.25"."with-deprecated" or false) || + (f.futures."0.1.25".default or false) || + (futures."0.1.25"."default" or false); } + { "0.1.25".default = (f.futures."0.1.25".default or true); } + ]; + }) []; + + +# end +# futures-cpupool-0.1.7 + + crates.futures_cpupool."0.1.7" = deps: { features?(features_.futures_cpupool."0.1.7" deps {}) }: buildRustCrate { + crateName = "futures-cpupool"; + version = "0.1.7"; + description = "An implementation of thread pools which hand out futures to the results of the\ncomputation on the threads themselves.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1m0z5d54q1zr687acb4fh5fb3x692vr5ais6135lvp7vxap6p0xb"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."futures_cpupool"."0.1.7"."futures"}" deps) + (crates."num_cpus"."${deps."futures_cpupool"."0.1.7"."num_cpus"}" deps) + ]); + features = mkFeatures (features."futures_cpupool"."0.1.7" or {}); + }; + features_.futures_cpupool."0.1.7" = deps: f: updateFeatures f (rec { + futures = fold recursiveUpdate {} [ + { "${deps.futures_cpupool."0.1.7".futures}"."use_std" = true; } + { "${deps.futures_cpupool."0.1.7".futures}"."with-deprecated" = + (f.futures."${deps.futures_cpupool."0.1.7".futures}"."with-deprecated" or false) || + (futures_cpupool."0.1.7"."with-deprecated" or false) || + (f."futures_cpupool"."0.1.7"."with-deprecated" or false); } + { "${deps.futures_cpupool."0.1.7".futures}".default = (f.futures."${deps.futures_cpupool."0.1.7".futures}".default or false); } + ]; + futures_cpupool = fold recursiveUpdate {} [ + { "0.1.7"."with-deprecated" = + (f.futures_cpupool."0.1.7"."with-deprecated" or false) || + (f.futures_cpupool."0.1.7".default or false) || + (futures_cpupool."0.1.7"."default" or false); } + { "0.1.7".default = (f.futures_cpupool."0.1.7".default or true); } + ]; + num_cpus."${deps.futures_cpupool."0.1.7".num_cpus}".default = true; + }) [ + (features_.futures."${deps."futures_cpupool"."0.1.7"."futures"}" deps) + (features_.num_cpus."${deps."futures_cpupool"."0.1.7"."num_cpus"}" deps) + ]; + + +# end +# h2-0.1.13 + + crates.h2."0.1.13" = deps: { features?(features_.h2."0.1.13" deps {}) }: buildRustCrate { + crateName = "h2"; + version = "0.1.13"; + description = "An HTTP/2.0 client and server"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1nmbr5i1ssqbnfwmkgsfzghzr4m8676z38s2dmzs9gchha7n8wv7"; + dependencies = mapFeatures features ([ + (crates."byteorder"."${deps."h2"."0.1.13"."byteorder"}" deps) + (crates."bytes"."${deps."h2"."0.1.13"."bytes"}" deps) + (crates."fnv"."${deps."h2"."0.1.13"."fnv"}" deps) + (crates."futures"."${deps."h2"."0.1.13"."futures"}" deps) + (crates."http"."${deps."h2"."0.1.13"."http"}" deps) + (crates."indexmap"."${deps."h2"."0.1.13"."indexmap"}" deps) + (crates."log"."${deps."h2"."0.1.13"."log"}" deps) + (crates."slab"."${deps."h2"."0.1.13"."slab"}" deps) + (crates."string"."${deps."h2"."0.1.13"."string"}" deps) + (crates."tokio_io"."${deps."h2"."0.1.13"."tokio_io"}" deps) + ]); + features = mkFeatures (features."h2"."0.1.13" or {}); + }; + features_.h2."0.1.13" = deps: f: updateFeatures f (rec { + byteorder."${deps.h2."0.1.13".byteorder}".default = true; + bytes."${deps.h2."0.1.13".bytes}".default = true; + fnv."${deps.h2."0.1.13".fnv}".default = true; + futures."${deps.h2."0.1.13".futures}".default = true; + h2."0.1.13".default = (f.h2."0.1.13".default or true); + http."${deps.h2."0.1.13".http}".default = true; + indexmap."${deps.h2."0.1.13".indexmap}".default = true; + log."${deps.h2."0.1.13".log}".default = true; + slab."${deps.h2."0.1.13".slab}".default = true; + string."${deps.h2."0.1.13".string}".default = true; + tokio_io."${deps.h2."0.1.13".tokio_io}".default = true; + }) [ + (features_.byteorder."${deps."h2"."0.1.13"."byteorder"}" deps) + (features_.bytes."${deps."h2"."0.1.13"."bytes"}" deps) + (features_.fnv."${deps."h2"."0.1.13"."fnv"}" deps) + (features_.futures."${deps."h2"."0.1.13"."futures"}" deps) + (features_.http."${deps."h2"."0.1.13"."http"}" deps) + (features_.indexmap."${deps."h2"."0.1.13"."indexmap"}" deps) + (features_.log."${deps."h2"."0.1.13"."log"}" deps) + (features_.slab."${deps."h2"."0.1.13"."slab"}" deps) + (features_.string."${deps."h2"."0.1.13"."string"}" deps) + (features_.tokio_io."${deps."h2"."0.1.13"."tokio_io"}" deps) + ]; + + +# end +# http-0.1.14 + + crates.http."0.1.14" = deps: { features?(features_.http."0.1.14" deps {}) }: buildRustCrate { + crateName = "http"; + version = "0.1.14"; + description = "A set of types for representing HTTP requests and responses.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Carl Lerche <me@carllerche.com>" "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1828cz2fh25nmp9rca0yzr548phsvkmzsqhspjnscqg1l9yc1557"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."http"."0.1.14"."bytes"}" deps) + (crates."fnv"."${deps."http"."0.1.14"."fnv"}" deps) + (crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps) + ]); + }; + features_.http."0.1.14" = deps: f: updateFeatures f (rec { + bytes."${deps.http."0.1.14".bytes}".default = true; + fnv."${deps.http."0.1.14".fnv}".default = true; + http."0.1.14".default = (f.http."0.1.14".default or true); + itoa."${deps.http."0.1.14".itoa}".default = true; + }) [ + (features_.bytes."${deps."http"."0.1.14"."bytes"}" deps) + (features_.fnv."${deps."http"."0.1.14"."fnv"}" deps) + (features_.itoa."${deps."http"."0.1.14"."itoa"}" deps) + ]; + + +# end +# httparse-1.2.3 + + crates.httparse."1.2.3" = deps: { features?(features_.httparse."1.2.3" deps {}) }: buildRustCrate { + crateName = "httparse"; + version = "1.2.3"; + description = "A tiny, safe, speedy, zero-copy HTTP/1.x parser."; + authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; + sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93"; + features = mkFeatures (features."httparse"."1.2.3" or {}); + }; + features_.httparse."1.2.3" = deps: f: updateFeatures f (rec { + httparse = fold recursiveUpdate {} [ + { "1.2.3"."std" = + (f.httparse."1.2.3"."std" or false) || + (f.httparse."1.2.3".default or false) || + (httparse."1.2.3"."default" or false); } + { "1.2.3".default = (f.httparse."1.2.3".default or true); } + ]; + }) []; + + +# end +# hyper-0.12.16 + + crates.hyper."0.12.16" = deps: { features?(features_.hyper."0.12.16" deps {}) }: buildRustCrate { + crateName = "hyper"; + version = "0.12.16"; + description = "A fast and correct HTTP library."; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1h5h9swxh02jcg1m4cvwb5nmkb8z9g4b0p4wfbhfvsd7wf14qr0y"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."hyper"."0.12.16"."bytes"}" deps) + (crates."futures"."${deps."hyper"."0.12.16"."futures"}" deps) + (crates."h2"."${deps."hyper"."0.12.16"."h2"}" deps) + (crates."http"."${deps."hyper"."0.12.16"."http"}" deps) + (crates."httparse"."${deps."hyper"."0.12.16"."httparse"}" deps) + (crates."iovec"."${deps."hyper"."0.12.16"."iovec"}" deps) + (crates."itoa"."${deps."hyper"."0.12.16"."itoa"}" deps) + (crates."log"."${deps."hyper"."0.12.16"."log"}" deps) + (crates."time"."${deps."hyper"."0.12.16"."time"}" deps) + (crates."tokio_io"."${deps."hyper"."0.12.16"."tokio_io"}" deps) + (crates."want"."${deps."hyper"."0.12.16"."want"}" deps) + ] + ++ (if features.hyper."0.12.16".futures-cpupool or false then [ (crates.futures_cpupool."${deps."hyper"."0.12.16".futures_cpupool}" deps) ] else []) + ++ (if features.hyper."0.12.16".net2 or false then [ (crates.net2."${deps."hyper"."0.12.16".net2}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio or false then [ (crates.tokio."${deps."hyper"."0.12.16".tokio}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio-executor or false then [ (crates.tokio_executor."${deps."hyper"."0.12.16".tokio_executor}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio-reactor or false then [ (crates.tokio_reactor."${deps."hyper"."0.12.16".tokio_reactor}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio-tcp or false then [ (crates.tokio_tcp."${deps."hyper"."0.12.16".tokio_tcp}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio-threadpool or false then [ (crates.tokio_threadpool."${deps."hyper"."0.12.16".tokio_threadpool}" deps) ] else []) + ++ (if features.hyper."0.12.16".tokio-timer or false then [ (crates.tokio_timer."${deps."hyper"."0.12.16".tokio_timer}" deps) ] else [])); + features = mkFeatures (features."hyper"."0.12.16" or {}); + }; + features_.hyper."0.12.16" = deps: f: updateFeatures f (rec { + bytes."${deps.hyper."0.12.16".bytes}".default = true; + futures."${deps.hyper."0.12.16".futures}".default = true; + futures_cpupool."${deps.hyper."0.12.16".futures_cpupool}".default = true; + h2."${deps.hyper."0.12.16".h2}".default = true; + http."${deps.hyper."0.12.16".http}".default = true; + httparse."${deps.hyper."0.12.16".httparse}".default = true; + hyper = fold recursiveUpdate {} [ + { "0.12.16"."__internal_flaky_tests" = + (f.hyper."0.12.16"."__internal_flaky_tests" or false) || + (f.hyper."0.12.16".default or false) || + (hyper."0.12.16"."default" or false); } + { "0.12.16"."futures-cpupool" = + (f.hyper."0.12.16"."futures-cpupool" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."net2" = + (f.hyper."0.12.16"."net2" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."runtime" = + (f.hyper."0.12.16"."runtime" or false) || + (f.hyper."0.12.16".default or false) || + (hyper."0.12.16"."default" or false); } + { "0.12.16"."tokio" = + (f.hyper."0.12.16"."tokio" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."tokio-executor" = + (f.hyper."0.12.16"."tokio-executor" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."tokio-reactor" = + (f.hyper."0.12.16"."tokio-reactor" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."tokio-tcp" = + (f.hyper."0.12.16"."tokio-tcp" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."tokio-threadpool" = + (f.hyper."0.12.16"."tokio-threadpool" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16"."tokio-timer" = + (f.hyper."0.12.16"."tokio-timer" or false) || + (f.hyper."0.12.16".runtime or false) || + (hyper."0.12.16"."runtime" or false); } + { "0.12.16".default = (f.hyper."0.12.16".default or true); } + ]; + iovec."${deps.hyper."0.12.16".iovec}".default = true; + itoa."${deps.hyper."0.12.16".itoa}".default = true; + log."${deps.hyper."0.12.16".log}".default = true; + net2."${deps.hyper."0.12.16".net2}".default = true; + time."${deps.hyper."0.12.16".time}".default = true; + tokio."${deps.hyper."0.12.16".tokio}".default = true; + tokio_executor."${deps.hyper."0.12.16".tokio_executor}".default = true; + tokio_io."${deps.hyper."0.12.16".tokio_io}".default = true; + tokio_reactor."${deps.hyper."0.12.16".tokio_reactor}".default = true; + tokio_tcp."${deps.hyper."0.12.16".tokio_tcp}".default = true; + tokio_threadpool."${deps.hyper."0.12.16".tokio_threadpool}".default = true; + tokio_timer."${deps.hyper."0.12.16".tokio_timer}".default = true; + want."${deps.hyper."0.12.16".want}".default = true; + }) [ + (features_.bytes."${deps."hyper"."0.12.16"."bytes"}" deps) + (features_.futures."${deps."hyper"."0.12.16"."futures"}" deps) + (features_.futures_cpupool."${deps."hyper"."0.12.16"."futures_cpupool"}" deps) + (features_.h2."${deps."hyper"."0.12.16"."h2"}" deps) + (features_.http."${deps."hyper"."0.12.16"."http"}" deps) + (features_.httparse."${deps."hyper"."0.12.16"."httparse"}" deps) + (features_.iovec."${deps."hyper"."0.12.16"."iovec"}" deps) + (features_.itoa."${deps."hyper"."0.12.16"."itoa"}" deps) + (features_.log."${deps."hyper"."0.12.16"."log"}" deps) + (features_.net2."${deps."hyper"."0.12.16"."net2"}" deps) + (features_.time."${deps."hyper"."0.12.16"."time"}" deps) + (features_.tokio."${deps."hyper"."0.12.16"."tokio"}" deps) + (features_.tokio_executor."${deps."hyper"."0.12.16"."tokio_executor"}" deps) + (features_.tokio_io."${deps."hyper"."0.12.16"."tokio_io"}" deps) + (features_.tokio_reactor."${deps."hyper"."0.12.16"."tokio_reactor"}" deps) + (features_.tokio_tcp."${deps."hyper"."0.12.16"."tokio_tcp"}" deps) + (features_.tokio_threadpool."${deps."hyper"."0.12.16"."tokio_threadpool"}" deps) + (features_.tokio_timer."${deps."hyper"."0.12.16"."tokio_timer"}" deps) + (features_.want."${deps."hyper"."0.12.16"."want"}" deps) + ]; + + +# end +# hyper-tls-0.3.1 + + crates.hyper_tls."0.3.1" = deps: { features?(features_.hyper_tls."0.3.1" deps {}) }: buildRustCrate { + crateName = "hyper-tls"; + version = "0.3.1"; + description = "Default TLS implementation for use with hyper"; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "0sk46mmnccxgxwn62rl5m58c2ivwgxgd590cjwg60pjkhx9qn5r7"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."hyper_tls"."0.3.1"."bytes"}" deps) + (crates."futures"."${deps."hyper_tls"."0.3.1"."futures"}" deps) + (crates."hyper"."${deps."hyper_tls"."0.3.1"."hyper"}" deps) + (crates."native_tls"."${deps."hyper_tls"."0.3.1"."native_tls"}" deps) + (crates."tokio_io"."${deps."hyper_tls"."0.3.1"."tokio_io"}" deps) + ]); + features = mkFeatures (features."hyper_tls"."0.3.1" or {}); + }; + features_.hyper_tls."0.3.1" = deps: f: updateFeatures f (rec { + bytes."${deps.hyper_tls."0.3.1".bytes}".default = true; + futures."${deps.hyper_tls."0.3.1".futures}".default = true; + hyper."${deps.hyper_tls."0.3.1".hyper}".default = true; + hyper_tls."0.3.1".default = (f.hyper_tls."0.3.1".default or true); + native_tls = fold recursiveUpdate {} [ + { "${deps.hyper_tls."0.3.1".native_tls}"."vendored" = + (f.native_tls."${deps.hyper_tls."0.3.1".native_tls}"."vendored" or false) || + (hyper_tls."0.3.1"."vendored" or false) || + (f."hyper_tls"."0.3.1"."vendored" or false); } + { "${deps.hyper_tls."0.3.1".native_tls}".default = true; } + ]; + tokio_io."${deps.hyper_tls."0.3.1".tokio_io}".default = true; + }) [ + (features_.bytes."${deps."hyper_tls"."0.3.1"."bytes"}" deps) + (features_.futures."${deps."hyper_tls"."0.3.1"."futures"}" deps) + (features_.hyper."${deps."hyper_tls"."0.3.1"."hyper"}" deps) + (features_.native_tls."${deps."hyper_tls"."0.3.1"."native_tls"}" deps) + (features_.tokio_io."${deps."hyper_tls"."0.3.1"."tokio_io"}" deps) + ]; + + +# end +# idna-0.1.4 + + crates.idna."0.1.4" = deps: { features?(features_.idna."0.1.4" deps {}) }: buildRustCrate { + crateName = "idna"; + version = "0.1.4"; + description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."; + authors = [ "The rust-url developers" ]; + sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."idna"."0.1.4"."matches"}" deps) + (crates."unicode_bidi"."${deps."idna"."0.1.4"."unicode_bidi"}" deps) + (crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps) + ]); + }; + features_.idna."0.1.4" = deps: f: updateFeatures f (rec { + idna."0.1.4".default = (f.idna."0.1.4".default or true); + matches."${deps.idna."0.1.4".matches}".default = true; + unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true; + unicode_normalization."${deps.idna."0.1.4".unicode_normalization}".default = true; + }) [ + (features_.matches."${deps."idna"."0.1.4"."matches"}" deps) + (features_.unicode_bidi."${deps."idna"."0.1.4"."unicode_bidi"}" deps) + (features_.unicode_normalization."${deps."idna"."0.1.4"."unicode_normalization"}" deps) + ]; + + +# end +# indexmap-1.0.2 + + crates.indexmap."1.0.2" = deps: { features?(features_.indexmap."1.0.2" deps {}) }: buildRustCrate { + crateName = "indexmap"; + version = "1.0.2"; + description = "A hash table with consistent order and fast iteration.\n\nThe indexmap is a hash table where the iteration order of the key-value\npairs is independent of the hash values of the keys. It has the usual\nhash table functionality, it preserves insertion order except after\nremovals, and it allows lookup of its elements by either hash table key\nor numerical index. A corresponding hash set type is also provided.\n\nThis crate was initially published under the name ordermap, but it was renamed to\nindexmap.\n"; + authors = [ "bluss" "Josh Stone <cuviper@gmail.com>" ]; + sha256 = "18a0cn5xy3a7wswxg5lwfg3j4sh5blk28ykw0ysgr486djd353gf"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."indexmap"."1.0.2" or {}); + }; + features_.indexmap."1.0.2" = deps: f: updateFeatures f (rec { + indexmap = fold recursiveUpdate {} [ + { "1.0.2"."serde" = + (f.indexmap."1.0.2"."serde" or false) || + (f.indexmap."1.0.2".serde-1 or false) || + (indexmap."1.0.2"."serde-1" or false); } + { "1.0.2".default = (f.indexmap."1.0.2".default or true); } + ]; + }) []; + + +# end +# iovec-0.1.1 + + crates.iovec."0.1.1" = deps: { features?(features_.iovec."0.1.1" deps {}) }: buildRustCrate { + crateName = "iovec"; + version = "0.1.1"; + description = "Portable buffer type for scatter/gather I/O operations\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "14fns3g3arbql6lkczf2gbbzaqh22mfv7y1wq5rr2y8jhh5m8jmm"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."iovec"."0.1.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps) + ]) else []); + }; + features_.iovec."0.1.1" = deps: f: updateFeatures f (rec { + iovec."0.1.1".default = (f.iovec."0.1.1".default or true); + libc."${deps.iovec."0.1.1".libc}".default = true; + winapi."${deps.iovec."0.1.1".winapi}".default = true; + }) [ + (features_.libc."${deps."iovec"."0.1.1"."libc"}" deps) + (features_.winapi."${deps."iovec"."0.1.1"."winapi"}" deps) + ]; + + +# end +# isatty-0.1.5 + + crates.isatty."0.1.5" = deps: { features?(features_.isatty."0.1.5" deps {}) }: buildRustCrate { + crateName = "isatty"; + version = "0.1.5"; + description = "libc::isatty that also works on Windows"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0gp781mgqmvsp6a3iyhwk2sqis2ys8jfg3grq40m135zgb4d2cvj"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."isatty"."0.1.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."isatty"."0.1.5"."kernel32_sys"}" deps) + (crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps) + ]) else []); + }; + features_.isatty."0.1.5" = deps: f: updateFeatures f (rec { + isatty."0.1.5".default = (f.isatty."0.1.5".default or true); + kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true; + libc."${deps.isatty."0.1.5".libc}".default = true; + winapi."${deps.isatty."0.1.5".winapi}".default = true; + }) [ + (features_.libc."${deps."isatty"."0.1.5"."libc"}" deps) + (features_.kernel32_sys."${deps."isatty"."0.1.5"."kernel32_sys"}" deps) + (features_.winapi."${deps."isatty"."0.1.5"."winapi"}" deps) + ]; + + +# end +# itertools-0.6.5 + + crates.itertools."0.6.5" = deps: { features?(features_.itertools."0.6.5" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.6.5"; + description = "Extra iterator adaptors, iterator methods, free functions, and macros."; + authors = [ "bluss" ]; + sha256 = "0gbhgn7s8qkxxw10i514fzpqnc3aissn4kcgylm2cvnv9zmg8mw1"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.6.5"."either"}" deps) + ]); + }; + features_.itertools."0.6.5" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false); + itertools."0.6.5".default = (f.itertools."0.6.5".default or true); + }) [ + (features_.either."${deps."itertools"."0.6.5"."either"}" deps) + ]; + + +# end +# itoa-0.3.4 + + crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + description = "Fast functions for printing integer primitives to an io::Write"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + features = mkFeatures (features."itoa"."0.3.4" or {}); + }; + features_.itoa."0.3.4" = deps: f: updateFeatures f (rec { + itoa."0.3.4".default = (f.itoa."0.3.4".default or true); + }) []; + + +# end +# itoa-0.4.3 + + crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { + crateName = "itoa"; + version = "0.4.3"; + description = "Fast functions for printing integer primitives to an io::Write"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; + features = mkFeatures (features."itoa"."0.4.3" or {}); + }; + features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { + itoa = fold recursiveUpdate {} [ + { "0.4.3"."std" = + (f.itoa."0.4.3"."std" or false) || + (f.itoa."0.4.3".default or false) || + (itoa."0.4.3"."default" or false); } + { "0.4.3".default = (f.itoa."0.4.3".default or true); } + ]; + }) []; + + +# end +# kernel32-sys-0.2.2 + + crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]); + }; + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); + winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; + winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; + }) [ + (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]; + + +# end +# lazy_static-0.2.10 + + crates.lazy_static."0.2.10" = deps: { features?(features_.lazy_static."0.2.10" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.10"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "0ylwjvppsm56fpv32l4br7zw0pwn81wbfb1abalyyr1d9c94vg8r"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."0.2.10" or {}); + }; + features_.lazy_static."0.2.10" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "0.2.10"."compiletest_rs" = + (f.lazy_static."0.2.10"."compiletest_rs" or false) || + (f.lazy_static."0.2.10".compiletest or false) || + (lazy_static."0.2.10"."compiletest" or false); } + { "0.2.10"."nightly" = + (f.lazy_static."0.2.10"."nightly" or false) || + (f.lazy_static."0.2.10".spin_no_std or false) || + (lazy_static."0.2.10"."spin_no_std" or false); } + { "0.2.10"."spin" = + (f.lazy_static."0.2.10"."spin" or false) || + (f.lazy_static."0.2.10".spin_no_std or false) || + (lazy_static."0.2.10"."spin_no_std" or false); } + { "0.2.10".default = (f.lazy_static."0.2.10".default or true); } + ]; + }) []; + + +# end +# lazy_static-1.2.0 + + crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.2.0"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."1.2.0" or {}); + }; + features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.2.0"."spin" = + (f.lazy_static."1.2.0"."spin" or false) || + (f.lazy_static."1.2.0".spin_no_std or false) || + (lazy_static."1.2.0"."spin_no_std" or false); } + { "1.2.0".default = (f.lazy_static."1.2.0".default or true); } + ]; + }) []; + + +# end +# lazycell-1.2.0 + + crates.lazycell."1.2.0" = deps: { features?(features_.lazycell."1.2.0" deps {}) }: buildRustCrate { + crateName = "lazycell"; + version = "1.2.0"; + description = "A library providing a lazily filled Cell struct"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ]; + sha256 = "1lzdb3q17yjihw9hksynxgyg8wbph1h791wff8rrf1c2aqjwhmax"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazycell"."1.2.0" or {}); + }; + features_.lazycell."1.2.0" = deps: f: updateFeatures f (rec { + lazycell = fold recursiveUpdate {} [ + { "1.2.0"."clippy" = + (f.lazycell."1.2.0"."clippy" or false) || + (f.lazycell."1.2.0".nightly-testing or false) || + (lazycell."1.2.0"."nightly-testing" or false); } + { "1.2.0"."nightly" = + (f.lazycell."1.2.0"."nightly" or false) || + (f.lazycell."1.2.0".nightly-testing or false) || + (lazycell."1.2.0"."nightly-testing" or false); } + { "1.2.0".default = (f.lazycell."1.2.0".default or true); } + ]; + }) []; + + +# end +# libc-0.2.44 + + crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.44"; + description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."libc"."0.2.44" or {}); + }; + features_.libc."0.2.44" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.44"."align" = + (f.libc."0.2.44"."align" or false) || + (f.libc."0.2.44".rustc-dep-of-std or false) || + (libc."0.2.44"."rustc-dep-of-std" or false); } + { "0.2.44"."rustc-std-workspace-core" = + (f.libc."0.2.44"."rustc-std-workspace-core" or false) || + (f.libc."0.2.44".rustc-dep-of-std or false) || + (libc."0.2.44"."rustc-dep-of-std" or false); } + { "0.2.44"."use_std" = + (f.libc."0.2.44"."use_std" or false) || + (f.libc."0.2.44".default or false) || + (libc."0.2.44"."default" or false); } + { "0.2.44".default = (f.libc."0.2.44".default or true); } + ]; + }) []; + + +# end +# libflate-0.1.19 + + crates.libflate."0.1.19" = deps: { features?(features_.libflate."0.1.19" deps {}) }: buildRustCrate { + crateName = "libflate"; + version = "0.1.19"; + description = "A Rust implementation of DEFLATE algorithm and related formats (ZLIB, GZIP)"; + authors = [ "Takeru Ohta <phjgt308@gmail.com>" ]; + sha256 = "1klhvys9541xrwspyyv41qbr37xnwx4bdaspk6gbiprhrsqqkjp0"; + dependencies = mapFeatures features ([ + (crates."adler32"."${deps."libflate"."0.1.19"."adler32"}" deps) + (crates."byteorder"."${deps."libflate"."0.1.19"."byteorder"}" deps) + (crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps) + ]); + }; + features_.libflate."0.1.19" = deps: f: updateFeatures f (rec { + adler32."${deps.libflate."0.1.19".adler32}".default = true; + byteorder."${deps.libflate."0.1.19".byteorder}".default = true; + crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true; + libflate."0.1.19".default = (f.libflate."0.1.19".default or true); + }) [ + (features_.adler32."${deps."libflate"."0.1.19"."adler32"}" deps) + (features_.byteorder."${deps."libflate"."0.1.19"."byteorder"}" deps) + (features_.crc32fast."${deps."libflate"."0.1.19"."crc32fast"}" deps) + ]; + + +# end +# lock_api-0.1.5 + + crates.lock_api."0.1.5" = deps: { features?(features_.lock_api."0.1.5" deps {}) }: buildRustCrate { + crateName = "lock_api"; + version = "0.1.5"; + description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "132sidr5hvjfkaqm3l95zpcpi8yk5ddd0g79zf1ad4v65sxirqqm"; + dependencies = mapFeatures features ([ + (crates."scopeguard"."${deps."lock_api"."0.1.5"."scopeguard"}" deps) + ] + ++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else [])); + features = mkFeatures (features."lock_api"."0.1.5" or {}); + }; + features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec { + lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); + owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true; + scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); + }) [ + (features_.owning_ref."${deps."lock_api"."0.1.5"."owning_ref"}" deps) + (features_.scopeguard."${deps."lock_api"."0.1.5"."scopeguard"}" deps) + ]; + + +# end +# log-0.3.8 + + crates.log."0.3.8" = deps: { features?(features_.log."0.3.8" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + description = "A lightweight logging facade for Rust\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + features = mkFeatures (features."log"."0.3.8" or {}); + }; + features_.log."0.3.8" = deps: f: updateFeatures f (rec { + log = fold recursiveUpdate {} [ + { "0.3.8"."use_std" = + (f.log."0.3.8"."use_std" or false) || + (f.log."0.3.8".default or false) || + (log."0.3.8"."default" or false); } + { "0.3.8".default = (f.log."0.3.8".default or true); } + ]; + }) []; + + +# end +# log-0.4.6 + + crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.6"; + description = "A lightweight logging facade for Rust\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.6" or {}); + }; + features_.log."0.4.6" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.6".cfg_if}".default = true; + log."0.4.6".default = (f.log."0.4.6".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps) + ]; + + +# end +# maplit-0.1.6 + + crates.maplit."0.1.6" = deps: { features?(features_.maplit."0.1.6" deps {}) }: buildRustCrate { + crateName = "maplit"; + version = "0.1.6"; + description = "Container / collection literal macros for HashMap, HashSet, BTreeMap, BTreeSet."; + authors = [ "bluss" ]; + sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; + }; + features_.maplit."0.1.6" = deps: f: updateFeatures f (rec { + maplit."0.1.6".default = (f.maplit."0.1.6".default or true); + }) []; + + +# end +# matches-0.1.6 + + crates.matches."0.1.6" = deps: { features?(features_.matches."0.1.6" deps {}) }: buildRustCrate { + crateName = "matches"; + version = "0.1.6"; + description = "A macro to evaluate, as a boolean, whether an expression matches a pattern."; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; + libPath = "lib.rs"; + }; + features_.matches."0.1.6" = deps: f: updateFeatures f (rec { + matches."0.1.6".default = (f.matches."0.1.6".default or true); + }) []; + + +# end +# memchr-0.1.11 + + crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "0.1.11"; + description = "Safe interface to memchr."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) + ]); + }; + features_.memchr."0.1.11" = deps: f: updateFeatures f (rec { + libc."${deps.memchr."0.1.11".libc}".default = true; + memchr."0.1.11".default = (f.memchr."0.1.11".default or true); + }) [ + (features_.libc."${deps."memchr"."0.1.11"."libc"}" deps) + ]; + + +# end +# memoffset-0.2.1 + + crates.memoffset."0.2.1" = deps: { features?(features_.memoffset."0.2.1" deps {}) }: buildRustCrate { + crateName = "memoffset"; + version = "0.2.1"; + description = "offset_of functionality for Rust structs."; + authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ]; + sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; + }; + features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec { + memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true); + }) []; + + +# end +# mime-0.3.12 + + crates.mime."0.3.12" = deps: { features?(features_.mime."0.3.12" deps {}) }: buildRustCrate { + crateName = "mime"; + version = "0.3.12"; + description = "Strongly Typed Mimes"; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "0lmcwkmxwbla9457w9ak13cfgqxfyn5wa1syjy1kll2ras5xifvh"; + dependencies = mapFeatures features ([ + (crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps) + ]); + }; + features_.mime."0.3.12" = deps: f: updateFeatures f (rec { + mime."0.3.12".default = (f.mime."0.3.12".default or true); + unicase."${deps.mime."0.3.12".unicase}".default = true; + }) [ + (features_.unicase."${deps."mime"."0.3.12"."unicase"}" deps) + ]; + + +# end +# mime_guess-2.0.0-alpha.6 + + crates.mime_guess."2.0.0-alpha.6" = deps: { features?(features_.mime_guess."2.0.0-alpha.6" deps {}) }: buildRustCrate { + crateName = "mime_guess"; + version = "2.0.0-alpha.6"; + description = "A simple crate for detection of a file's MIME type by its extension."; + authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; + sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; + dependencies = mapFeatures features ([ + (crates."mime"."${deps."mime_guess"."2.0.0-alpha.6"."mime"}" deps) + (crates."phf"."${deps."mime_guess"."2.0.0-alpha.6"."phf"}" deps) + (crates."unicase"."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."phf_codegen"."${deps."mime_guess"."2.0.0-alpha.6"."phf_codegen"}" deps) + (crates."unicase"."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) + ]); + features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {}); + }; + features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec { + mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true; + mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true); + phf = fold recursiveUpdate {} [ + { "${deps.mime_guess."2.0.0-alpha.6".phf}"."unicase" = true; } + { "${deps.mime_guess."2.0.0-alpha.6".phf}".default = true; } + ]; + phf_codegen."${deps.mime_guess."2.0.0-alpha.6".phf_codegen}".default = true; + unicase."${deps.mime_guess."2.0.0-alpha.6".unicase}".default = true; + }) [ + (features_.mime."${deps."mime_guess"."2.0.0-alpha.6"."mime"}" deps) + (features_.phf."${deps."mime_guess"."2.0.0-alpha.6"."phf"}" deps) + (features_.unicase."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) + (features_.phf_codegen."${deps."mime_guess"."2.0.0-alpha.6"."phf_codegen"}" deps) + (features_.unicase."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) + ]; + + +# end +# miniz-sys-0.1.10 + + crates.miniz_sys."0.1.10" = deps: { features?(features_.miniz_sys."0.1.10" deps {}) }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + description = "Bindings to the miniz.c library.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."miniz_sys"."0.1.10"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps) + ]); + }; + features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec { + cc."${deps.miniz_sys."0.1.10".cc}".default = true; + libc."${deps.miniz_sys."0.1.10".libc}".default = true; + miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true); + }) [ + (features_.libc."${deps."miniz_sys"."0.1.10"."libc"}" deps) + (features_.cc."${deps."miniz_sys"."0.1.10"."cc"}" deps) + ]; + + +# end +# mio-0.6.16 + + crates.mio."0.6.16" = deps: { features?(features_.mio."0.6.16" deps {}) }: buildRustCrate { + crateName = "mio"; + version = "0.6.16"; + description = "Lightweight non-blocking IO"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "14vyrlmf0w984pi7ad9qvmlfj6vrb0wn6i8ik9j87w5za2r3rban"; + dependencies = mapFeatures features ([ + (crates."iovec"."${deps."mio"."0.6.16"."iovec"}" deps) + (crates."lazycell"."${deps."mio"."0.6.16"."lazycell"}" deps) + (crates."log"."${deps."mio"."0.6.16"."log"}" deps) + (crates."net2"."${deps."mio"."0.6.16"."net2"}" deps) + (crates."slab"."${deps."mio"."0.6.16"."slab"}" deps) + ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."mio"."0.6.16"."fuchsia_zircon"}" deps) + (crates."fuchsia_zircon_sys"."${deps."mio"."0.6.16"."fuchsia_zircon_sys"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."mio"."0.6.16"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."mio"."0.6.16"."kernel32_sys"}" deps) + (crates."miow"."${deps."mio"."0.6.16"."miow"}" deps) + (crates."winapi"."${deps."mio"."0.6.16"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."mio"."0.6.16" or {}); + }; + features_.mio."0.6.16" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.mio."0.6.16".fuchsia_zircon}".default = true; + fuchsia_zircon_sys."${deps.mio."0.6.16".fuchsia_zircon_sys}".default = true; + iovec."${deps.mio."0.6.16".iovec}".default = true; + kernel32_sys."${deps.mio."0.6.16".kernel32_sys}".default = true; + lazycell."${deps.mio."0.6.16".lazycell}".default = true; + libc."${deps.mio."0.6.16".libc}".default = true; + log."${deps.mio."0.6.16".log}".default = true; + mio = fold recursiveUpdate {} [ + { "0.6.16"."with-deprecated" = + (f.mio."0.6.16"."with-deprecated" or false) || + (f.mio."0.6.16".default or false) || + (mio."0.6.16"."default" or false); } + { "0.6.16".default = (f.mio."0.6.16".default or true); } + ]; + miow."${deps.mio."0.6.16".miow}".default = true; + net2."${deps.mio."0.6.16".net2}".default = true; + slab."${deps.mio."0.6.16".slab}".default = true; + winapi."${deps.mio."0.6.16".winapi}".default = true; + }) [ + (features_.iovec."${deps."mio"."0.6.16"."iovec"}" deps) + (features_.lazycell."${deps."mio"."0.6.16"."lazycell"}" deps) + (features_.log."${deps."mio"."0.6.16"."log"}" deps) + (features_.net2."${deps."mio"."0.6.16"."net2"}" deps) + (features_.slab."${deps."mio"."0.6.16"."slab"}" deps) + (features_.fuchsia_zircon."${deps."mio"."0.6.16"."fuchsia_zircon"}" deps) + (features_.fuchsia_zircon_sys."${deps."mio"."0.6.16"."fuchsia_zircon_sys"}" deps) + (features_.libc."${deps."mio"."0.6.16"."libc"}" deps) + (features_.kernel32_sys."${deps."mio"."0.6.16"."kernel32_sys"}" deps) + (features_.miow."${deps."mio"."0.6.16"."miow"}" deps) + (features_.winapi."${deps."mio"."0.6.16"."winapi"}" deps) + ]; + + +# end +# miow-0.2.1 + + crates.miow."0.2.1" = deps: { features?(features_.miow."0.2.1" deps {}) }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + description = "A zero overhead I/O library for Windows, focusing on IOCP and Async I/O\nabstractions.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + dependencies = mapFeatures features ([ + (crates."kernel32_sys"."${deps."miow"."0.2.1"."kernel32_sys"}" deps) + (crates."net2"."${deps."miow"."0.2.1"."net2"}" deps) + (crates."winapi"."${deps."miow"."0.2.1"."winapi"}" deps) + (crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) + ]); + }; + features_.miow."0.2.1" = deps: f: updateFeatures f (rec { + kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true; + miow."0.2.1".default = (f.miow."0.2.1".default or true); + net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false); + winapi."${deps.miow."0.2.1".winapi}".default = true; + ws2_32_sys."${deps.miow."0.2.1".ws2_32_sys}".default = true; + }) [ + (features_.kernel32_sys."${deps."miow"."0.2.1"."kernel32_sys"}" deps) + (features_.net2."${deps."miow"."0.2.1"."net2"}" deps) + (features_.winapi."${deps."miow"."0.2.1"."winapi"}" deps) + (features_.ws2_32_sys."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) + ]; + + +# end +# native-tls-0.2.2 + + crates.native_tls."0.2.2" = deps: { features?(features_.native_tls."0.2.2" deps {}) }: buildRustCrate { + crateName = "native-tls"; + version = "0.2.2"; + description = "A wrapper over a platform's native TLS implementation"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0vl2hmmnrcjfylzjfsbnav20ri2n1qjgxn7bklb4mk3fyxfqm1m9"; + dependencies = (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ + (crates."lazy_static"."${deps."native_tls"."0.2.2"."lazy_static"}" deps) + (crates."libc"."${deps."native_tls"."0.2.2"."libc"}" deps) + (crates."security_framework"."${deps."native_tls"."0.2.2"."security_framework"}" deps) + (crates."security_framework_sys"."${deps."native_tls"."0.2.2"."security_framework_sys"}" deps) + (crates."tempfile"."${deps."native_tls"."0.2.2"."tempfile"}" deps) + ]) else []) + ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ + (crates."openssl"."${deps."native_tls"."0.2.2"."openssl"}" deps) + (crates."openssl_probe"."${deps."native_tls"."0.2.2"."openssl_probe"}" deps) + (crates."openssl_sys"."${deps."native_tls"."0.2.2"."openssl_sys"}" deps) + ]) else []) + ++ (if kernel == "android" then mapFeatures features ([ + (crates."log"."${deps."native_tls"."0.2.2"."log"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."schannel"."${deps."native_tls"."0.2.2"."schannel"}" deps) + ]) else []); + features = mkFeatures (features."native_tls"."0.2.2" or {}); + }; + features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec { + lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true; + libc."${deps.native_tls."0.2.2".libc}".default = true; + log."${deps.native_tls."0.2.2".log}".default = true; + native_tls."0.2.2".default = (f.native_tls."0.2.2".default or true); + openssl."${deps.native_tls."0.2.2".openssl}".default = true; + openssl_probe."${deps.native_tls."0.2.2".openssl_probe}".default = true; + openssl_sys."${deps.native_tls."0.2.2".openssl_sys}".default = true; + schannel."${deps.native_tls."0.2.2".schannel}".default = true; + security_framework."${deps.native_tls."0.2.2".security_framework}".default = true; + security_framework_sys."${deps.native_tls."0.2.2".security_framework_sys}".default = true; + tempfile."${deps.native_tls."0.2.2".tempfile}".default = true; + }) [ + (features_.lazy_static."${deps."native_tls"."0.2.2"."lazy_static"}" deps) + (features_.libc."${deps."native_tls"."0.2.2"."libc"}" deps) + (features_.security_framework."${deps."native_tls"."0.2.2"."security_framework"}" deps) + (features_.security_framework_sys."${deps."native_tls"."0.2.2"."security_framework_sys"}" deps) + (features_.tempfile."${deps."native_tls"."0.2.2"."tempfile"}" deps) + (features_.openssl."${deps."native_tls"."0.2.2"."openssl"}" deps) + (features_.openssl_probe."${deps."native_tls"."0.2.2"."openssl_probe"}" deps) + (features_.openssl_sys."${deps."native_tls"."0.2.2"."openssl_sys"}" deps) + (features_.log."${deps."native_tls"."0.2.2"."log"}" deps) + (features_.schannel."${deps."native_tls"."0.2.2"."schannel"}" deps) + ]; + + +# end +# net2-0.2.33 + + crates.net2."0.2.33" = deps: { features?(features_.net2."0.2.33" deps {}) }: buildRustCrate { + crateName = "net2"; + version = "0.2.33"; + description = "Extensions to the standard library's networking types as proposed in RFC 1158.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."net2"."0.2.33"."cfg_if"}" deps) + ]) + ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."net2"."0.2.33"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."net2"."0.2.33"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."net2"."0.2.33" or {}); + }; + features_.net2."0.2.33" = deps: f: updateFeatures f (rec { + cfg_if."${deps.net2."0.2.33".cfg_if}".default = true; + libc."${deps.net2."0.2.33".libc}".default = true; + net2 = fold recursiveUpdate {} [ + { "0.2.33"."duration" = + (f.net2."0.2.33"."duration" or false) || + (f.net2."0.2.33".default or false) || + (net2."0.2.33"."default" or false); } + { "0.2.33".default = (f.net2."0.2.33".default or true); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.net2."0.2.33".winapi}"."handleapi" = true; } + { "${deps.net2."0.2.33".winapi}"."winsock2" = true; } + { "${deps.net2."0.2.33".winapi}"."ws2def" = true; } + { "${deps.net2."0.2.33".winapi}"."ws2ipdef" = true; } + { "${deps.net2."0.2.33".winapi}"."ws2tcpip" = true; } + { "${deps.net2."0.2.33".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."net2"."0.2.33"."cfg_if"}" deps) + (features_.libc."${deps."net2"."0.2.33"."libc"}" deps) + (features_.winapi."${deps."net2"."0.2.33"."winapi"}" deps) + ]; + + +# end +# nodrop-0.1.13 + + crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.13"; + description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"; + authors = [ "bluss" ]; + sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.13" or {}); + }; + features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.13"."nodrop-union" = + (f.nodrop."0.1.13"."nodrop-union" or false) || + (f.nodrop."0.1.13".use_union or false) || + (nodrop."0.1.13"."use_union" or false); } + { "0.1.13"."std" = + (f.nodrop."0.1.13"."std" or false) || + (f.nodrop."0.1.13".default or false) || + (nodrop."0.1.13"."default" or false); } + { "0.1.13".default = (f.nodrop."0.1.13".default or true); } + ]; + }) []; + + +# end +# num-0.1.40 + + crates.num."0.1.40" = deps: { features?(features_.num."0.1.40" deps {}) }: buildRustCrate { + crateName = "num"; + version = "0.1.40"; + description = "A collection of numeric types and traits for Rust, including bigint,\ncomplex, rational, range iterators, generic integers, and more!\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg"; + dependencies = mapFeatures features ([ + (crates."num_integer"."${deps."num"."0.1.40"."num_integer"}" deps) + (crates."num_iter"."${deps."num"."0.1.40"."num_iter"}" deps) + (crates."num_traits"."${deps."num"."0.1.40"."num_traits"}" deps) + ]); + features = mkFeatures (features."num"."0.1.40" or {}); + }; + features_.num."0.1.40" = deps: f: updateFeatures f (rec { + num = fold recursiveUpdate {} [ + { "0.1.40"."bigint" = + (f.num."0.1.40"."bigint" or false) || + (f.num."0.1.40".default or false) || + (num."0.1.40"."default" or false); } + { "0.1.40"."complex" = + (f.num."0.1.40"."complex" or false) || + (f.num."0.1.40".default or false) || + (num."0.1.40"."default" or false); } + { "0.1.40"."num-bigint" = + (f.num."0.1.40"."num-bigint" or false) || + (f.num."0.1.40".bigint or false) || + (num."0.1.40"."bigint" or false); } + { "0.1.40"."num-complex" = + (f.num."0.1.40"."num-complex" or false) || + (f.num."0.1.40".complex or false) || + (num."0.1.40"."complex" or false); } + { "0.1.40"."num-rational" = + (f.num."0.1.40"."num-rational" or false) || + (f.num."0.1.40".rational or false) || + (num."0.1.40"."rational" or false); } + { "0.1.40"."rational" = + (f.num."0.1.40"."rational" or false) || + (f.num."0.1.40".default or false) || + (num."0.1.40"."default" or false); } + { "0.1.40"."rustc-serialize" = + (f.num."0.1.40"."rustc-serialize" or false) || + (f.num."0.1.40".default or false) || + (num."0.1.40"."default" or false); } + { "0.1.40".default = (f.num."0.1.40".default or true); } + ]; + num_integer."${deps.num."0.1.40".num_integer}".default = true; + num_iter."${deps.num."0.1.40".num_iter}".default = true; + num_traits."${deps.num."0.1.40".num_traits}".default = true; + }) [ + (features_.num_integer."${deps."num"."0.1.40"."num_integer"}" deps) + (features_.num_iter."${deps."num"."0.1.40"."num_iter"}" deps) + (features_.num_traits."${deps."num"."0.1.40"."num_traits"}" deps) + ]; + + +# end +# num-integer-0.1.35 + + crates.num_integer."0.1.35" = deps: { features?(features_.num_integer."0.1.35" deps {}) }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + description = "Integer traits and functions"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + dependencies = mapFeatures features ([ + (crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps) + ]); + }; + features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec { + num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true); + num_traits."${deps.num_integer."0.1.35".num_traits}".default = true; + }) [ + (features_.num_traits."${deps."num_integer"."0.1.35"."num_traits"}" deps) + ]; + + +# end +# num-iter-0.1.34 + + crates.num_iter."0.1.34" = deps: { features?(features_.num_iter."0.1.34" deps {}) }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + description = "External iterators for generic mathematics"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + dependencies = mapFeatures features ([ + (crates."num_integer"."${deps."num_iter"."0.1.34"."num_integer"}" deps) + (crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps) + ]); + }; + features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec { + num_integer."${deps.num_iter."0.1.34".num_integer}".default = true; + num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true); + num_traits."${deps.num_iter."0.1.34".num_traits}".default = true; + }) [ + (features_.num_integer."${deps."num_iter"."0.1.34"."num_integer"}" deps) + (features_.num_traits."${deps."num_iter"."0.1.34"."num_traits"}" deps) + ]; + + +# end +# num-traits-0.1.40 + + crates.num_traits."0.1.40" = deps: { features?(features_.num_traits."0.1.40" deps {}) }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + description = "Numeric traits for generic mathematics"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + }; + features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec { + num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true); + }) []; + + +# end +# num_cpus-1.8.0 + + crates.num_cpus."1.8.0" = deps: { features?(features_.num_cpus."1.8.0" deps {}) }: buildRustCrate { + crateName = "num_cpus"; + version = "1.8.0"; + description = "Get the number of CPUs on a machine."; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps) + ]); + }; + features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec { + libc."${deps.num_cpus."1.8.0".libc}".default = true; + num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true); + }) [ + (features_.libc."${deps."num_cpus"."1.8.0"."libc"}" deps) + ]; + + +# end +# openssl-0.10.15 + + crates.openssl."0.10.15" = deps: { features?(features_.openssl."0.10.15" deps {}) }: buildRustCrate { + crateName = "openssl"; + version = "0.10.15"; + description = "OpenSSL bindings"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0fj5g66ibkyb6vfdfjgaypfn45vpj2cdv7d7qpq653sv57glcqri"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."openssl"."0.10.15"."bitflags"}" deps) + (crates."cfg_if"."${deps."openssl"."0.10.15"."cfg_if"}" deps) + (crates."foreign_types"."${deps."openssl"."0.10.15"."foreign_types"}" deps) + (crates."lazy_static"."${deps."openssl"."0.10.15"."lazy_static"}" deps) + (crates."libc"."${deps."openssl"."0.10.15"."libc"}" deps) + (crates."openssl_sys"."${deps."openssl"."0.10.15"."openssl_sys"}" deps) + ]); + features = mkFeatures (features."openssl"."0.10.15" or {}); + }; + features_.openssl."0.10.15" = deps: f: updateFeatures f (rec { + bitflags."${deps.openssl."0.10.15".bitflags}".default = true; + cfg_if."${deps.openssl."0.10.15".cfg_if}".default = true; + foreign_types."${deps.openssl."0.10.15".foreign_types}".default = true; + lazy_static."${deps.openssl."0.10.15".lazy_static}".default = true; + libc."${deps.openssl."0.10.15".libc}".default = true; + openssl."0.10.15".default = (f.openssl."0.10.15".default or true); + openssl_sys = fold recursiveUpdate {} [ + { "${deps.openssl."0.10.15".openssl_sys}"."vendored" = + (f.openssl_sys."${deps.openssl."0.10.15".openssl_sys}"."vendored" or false) || + (openssl."0.10.15"."vendored" or false) || + (f."openssl"."0.10.15"."vendored" or false); } + { "${deps.openssl."0.10.15".openssl_sys}".default = true; } + ]; + }) [ + (features_.bitflags."${deps."openssl"."0.10.15"."bitflags"}" deps) + (features_.cfg_if."${deps."openssl"."0.10.15"."cfg_if"}" deps) + (features_.foreign_types."${deps."openssl"."0.10.15"."foreign_types"}" deps) + (features_.lazy_static."${deps."openssl"."0.10.15"."lazy_static"}" deps) + (features_.libc."${deps."openssl"."0.10.15"."libc"}" deps) + (features_.openssl_sys."${deps."openssl"."0.10.15"."openssl_sys"}" deps) + ]; + + +# end +# openssl-probe-0.1.2 + + crates.openssl_probe."0.1.2" = deps: { features?(features_.openssl_probe."0.1.2" deps {}) }: buildRustCrate { + crateName = "openssl-probe"; + version = "0.1.2"; + description = "Tool for helping to find SSL certificate locations on the system for OpenSSL\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; + }; + features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec { + openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); + }) []; + + +# end +# openssl-sys-0.9.39 + + crates.openssl_sys."0.9.39" = deps: { features?(features_.openssl_sys."0.9.39" deps {}) }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.39"; + description = "FFI bindings to OpenSSL"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "1lraqg3xz4jxrc99na17kn6srfhsgnj1yjk29mgsh803w40s2056"; + build = "build/main.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."openssl_sys"."0.9.39"."libc"}" deps) + ]) + ++ (if abi == "msvc" then mapFeatures features ([ +]) else []); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."openssl_sys"."0.9.39"."cc"}" deps) + (crates."pkg_config"."${deps."openssl_sys"."0.9.39"."pkg_config"}" deps) + ]); + features = mkFeatures (features."openssl_sys"."0.9.39" or {}); + }; + features_.openssl_sys."0.9.39" = deps: f: updateFeatures f (rec { + cc."${deps.openssl_sys."0.9.39".cc}".default = true; + libc."${deps.openssl_sys."0.9.39".libc}".default = true; + openssl_sys = fold recursiveUpdate {} [ + { "0.9.39"."openssl-src" = + (f.openssl_sys."0.9.39"."openssl-src" or false) || + (f.openssl_sys."0.9.39".vendored or false) || + (openssl_sys."0.9.39"."vendored" or false); } + { "0.9.39".default = (f.openssl_sys."0.9.39".default or true); } + ]; + pkg_config."${deps.openssl_sys."0.9.39".pkg_config}".default = true; + }) [ + (features_.libc."${deps."openssl_sys"."0.9.39"."libc"}" deps) + (features_.cc."${deps."openssl_sys"."0.9.39"."cc"}" deps) + (features_.pkg_config."${deps."openssl_sys"."0.9.39"."pkg_config"}" deps) + ]; + + +# end +# owning_ref-0.4.0 + + crates.owning_ref."0.4.0" = deps: { features?(features_.owning_ref."0.4.0" deps {}) }: buildRustCrate { + crateName = "owning_ref"; + version = "0.4.0"; + description = "A library for creating references that carry their owner with them."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1m95qpc3hamkw9wlbfzqkzk7h6skyj40zr6sa3ps151slcfnnchm"; + dependencies = mapFeatures features ([ + (crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) + ]); + }; + features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec { + owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true); + stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true; + }) [ + (features_.stable_deref_trait."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) + ]; + + +# end +# parking_lot-0.6.4 + + crates.parking_lot."0.6.4" = deps: { features?(features_.parking_lot."0.6.4" deps {}) }: buildRustCrate { + crateName = "parking_lot"; + version = "0.6.4"; + description = "More compact and efficient implementations of the standard synchronization primitives."; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "0qwfysx8zfkj72sfcrqvd6pp7lgjmklyixsi3y0g6xjspw876rax"; + dependencies = mapFeatures features ([ + (crates."lock_api"."${deps."parking_lot"."0.6.4"."lock_api"}" deps) + (crates."parking_lot_core"."${deps."parking_lot"."0.6.4"."parking_lot_core"}" deps) + ]); + features = mkFeatures (features."parking_lot"."0.6.4" or {}); + }; + features_.parking_lot."0.6.4" = deps: f: updateFeatures f (rec { + lock_api = fold recursiveUpdate {} [ + { "${deps.parking_lot."0.6.4".lock_api}"."nightly" = + (f.lock_api."${deps.parking_lot."0.6.4".lock_api}"."nightly" or false) || + (parking_lot."0.6.4"."nightly" or false) || + (f."parking_lot"."0.6.4"."nightly" or false); } + { "${deps.parking_lot."0.6.4".lock_api}"."owning_ref" = + (f.lock_api."${deps.parking_lot."0.6.4".lock_api}"."owning_ref" or false) || + (parking_lot."0.6.4"."owning_ref" or false) || + (f."parking_lot"."0.6.4"."owning_ref" or false); } + { "${deps.parking_lot."0.6.4".lock_api}".default = true; } + ]; + parking_lot = fold recursiveUpdate {} [ + { "0.6.4"."owning_ref" = + (f.parking_lot."0.6.4"."owning_ref" or false) || + (f.parking_lot."0.6.4".default or false) || + (parking_lot."0.6.4"."default" or false); } + { "0.6.4".default = (f.parking_lot."0.6.4".default or true); } + ]; + parking_lot_core = fold recursiveUpdate {} [ + { "${deps.parking_lot."0.6.4".parking_lot_core}"."deadlock_detection" = + (f.parking_lot_core."${deps.parking_lot."0.6.4".parking_lot_core}"."deadlock_detection" or false) || + (parking_lot."0.6.4"."deadlock_detection" or false) || + (f."parking_lot"."0.6.4"."deadlock_detection" or false); } + { "${deps.parking_lot."0.6.4".parking_lot_core}"."nightly" = + (f.parking_lot_core."${deps.parking_lot."0.6.4".parking_lot_core}"."nightly" or false) || + (parking_lot."0.6.4"."nightly" or false) || + (f."parking_lot"."0.6.4"."nightly" or false); } + { "${deps.parking_lot."0.6.4".parking_lot_core}".default = true; } + ]; + }) [ + (features_.lock_api."${deps."parking_lot"."0.6.4"."lock_api"}" deps) + (features_.parking_lot_core."${deps."parking_lot"."0.6.4"."parking_lot_core"}" deps) + ]; + + +# end +# parking_lot_core-0.3.1 + + crates.parking_lot_core."0.3.1" = deps: { features?(features_.parking_lot_core."0.3.1" deps {}) }: buildRustCrate { + crateName = "parking_lot_core"; + version = "0.3.1"; + description = "An advanced API for creating custom synchronization primitives."; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "0h5p7dys8cx9y6ii4i57ampf7qdr8zmkpn543kd3h7nkhml8bw72"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."parking_lot_core"."0.3.1"."rand"}" deps) + (crates."smallvec"."${deps."parking_lot_core"."0.3.1"."smallvec"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."parking_lot_core"."0.3.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."parking_lot_core"."0.3.1"."winapi"}" deps) + ]) else []); + + buildDependencies = mapFeatures features ([ + (crates."rustc_version"."${deps."parking_lot_core"."0.3.1"."rustc_version"}" deps) + ]); + features = mkFeatures (features."parking_lot_core"."0.3.1" or {}); + }; + features_.parking_lot_core."0.3.1" = deps: f: updateFeatures f (rec { + libc."${deps.parking_lot_core."0.3.1".libc}".default = true; + parking_lot_core = fold recursiveUpdate {} [ + { "0.3.1"."backtrace" = + (f.parking_lot_core."0.3.1"."backtrace" or false) || + (f.parking_lot_core."0.3.1".deadlock_detection or false) || + (parking_lot_core."0.3.1"."deadlock_detection" or false); } + { "0.3.1"."petgraph" = + (f.parking_lot_core."0.3.1"."petgraph" or false) || + (f.parking_lot_core."0.3.1".deadlock_detection or false) || + (parking_lot_core."0.3.1"."deadlock_detection" or false); } + { "0.3.1"."thread-id" = + (f.parking_lot_core."0.3.1"."thread-id" or false) || + (f.parking_lot_core."0.3.1".deadlock_detection or false) || + (parking_lot_core."0.3.1"."deadlock_detection" or false); } + { "0.3.1".default = (f.parking_lot_core."0.3.1".default or true); } + ]; + rand."${deps.parking_lot_core."0.3.1".rand}".default = true; + rustc_version."${deps.parking_lot_core."0.3.1".rustc_version}".default = true; + smallvec."${deps.parking_lot_core."0.3.1".smallvec}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.parking_lot_core."0.3.1".winapi}"."errhandlingapi" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."handleapi" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."minwindef" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."ntstatus" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."winbase" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."winerror" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}"."winnt" = true; } + { "${deps.parking_lot_core."0.3.1".winapi}".default = true; } + ]; + }) [ + (features_.rand."${deps."parking_lot_core"."0.3.1"."rand"}" deps) + (features_.smallvec."${deps."parking_lot_core"."0.3.1"."smallvec"}" deps) + (features_.rustc_version."${deps."parking_lot_core"."0.3.1"."rustc_version"}" deps) + (features_.libc."${deps."parking_lot_core"."0.3.1"."libc"}" deps) + (features_.winapi."${deps."parking_lot_core"."0.3.1"."winapi"}" deps) + ]; + + +# end +# percent-encoding-1.0.1 + + crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + description = "Percent encoding and decoding"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + }; + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); + }) []; + + +# end +# phf-0.7.21 + + crates.phf."0.7.21" = deps: { features?(features_.phf."0.7.21" deps {}) }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + description = "Runtime support for perfect hash function data structures"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."phf_shared"."${deps."phf"."0.7.21"."phf_shared"}" deps) + ]); + features = mkFeatures (features."phf"."0.7.21" or {}); + }; + features_.phf."0.7.21" = deps: f: updateFeatures f (rec { + phf."0.7.21".default = (f.phf."0.7.21".default or true); + phf_shared = fold recursiveUpdate {} [ + { "${deps.phf."0.7.21".phf_shared}"."core" = + (f.phf_shared."${deps.phf."0.7.21".phf_shared}"."core" or false) || + (phf."0.7.21"."core" or false) || + (f."phf"."0.7.21"."core" or false); } + { "${deps.phf."0.7.21".phf_shared}"."unicase" = + (f.phf_shared."${deps.phf."0.7.21".phf_shared}"."unicase" or false) || + (phf."0.7.21"."unicase" or false) || + (f."phf"."0.7.21"."unicase" or false); } + { "${deps.phf."0.7.21".phf_shared}".default = true; } + ]; + }) [ + (features_.phf_shared."${deps."phf"."0.7.21"."phf_shared"}" deps) + ]; + + +# end +# phf_codegen-0.7.21 + + crates.phf_codegen."0.7.21" = deps: { features?(features_.phf_codegen."0.7.21" deps {}) }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + description = "Codegen library for PHF types"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + dependencies = mapFeatures features ([ + (crates."phf_generator"."${deps."phf_codegen"."0.7.21"."phf_generator"}" deps) + (crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) + ]); + }; + features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec { + phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true); + phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true; + phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true; + }) [ + (features_.phf_generator."${deps."phf_codegen"."0.7.21"."phf_generator"}" deps) + (features_.phf_shared."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) + ]; + + +# end +# phf_generator-0.7.21 + + crates.phf_generator."0.7.21" = deps: { features?(features_.phf_generator."0.7.21" deps {}) }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + description = "PHF generation logic"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + dependencies = mapFeatures features ([ + (crates."phf_shared"."${deps."phf_generator"."0.7.21"."phf_shared"}" deps) + (crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps) + ]); + }; + features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec { + phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true); + phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true; + rand."${deps.phf_generator."0.7.21".rand}".default = true; + }) [ + (features_.phf_shared."${deps."phf_generator"."0.7.21"."phf_shared"}" deps) + (features_.rand."${deps."phf_generator"."0.7.21"."rand"}" deps) + ]; + + +# end +# phf_shared-0.7.21 + + crates.phf_shared."0.7.21" = deps: { features?(features_.phf_shared."0.7.21" deps {}) }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + description = "Support code shared by PHF libraries"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."siphasher"."${deps."phf_shared"."0.7.21"."siphasher"}" deps) + ] + ++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else [])); + features = mkFeatures (features."phf_shared"."0.7.21" or {}); + }; + features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec { + phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true); + siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true; + unicase."${deps.phf_shared."0.7.21".unicase}".default = true; + }) [ + (features_.siphasher."${deps."phf_shared"."0.7.21"."siphasher"}" deps) + (features_.unicase."${deps."phf_shared"."0.7.21"."unicase"}" deps) + ]; + + +# end +# pkg-config-0.3.9 + + crates.pkg_config."0.3.9" = deps: { features?(features_.pkg_config."0.3.9" deps {}) }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + }; + features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec { + pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true); + }) []; + + +# end +# quote-0.3.15 + + crates.quote."0.3.15" = deps: { features?(features_.quote."0.3.15" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + description = "Quasi-quoting macro quote!(...)"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + }; + features_.quote."0.3.15" = deps: f: updateFeatures f (rec { + quote."0.3.15".default = (f.quote."0.3.15".default or true); + }) []; + + +# end +# rand-0.3.18 + + crates.rand."0.3.18" = deps: { features?(features_.rand."0.3.18" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.3.18"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."rand"."0.3.18"."libc"}" deps) + ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.3.18"."fuchsia_zircon"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.3.18" or {}); + }; + features_.rand."0.3.18" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.3.18".fuchsia_zircon}".default = true; + libc."${deps.rand."0.3.18".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.3.18"."i128_support" = + (f.rand."0.3.18"."i128_support" or false) || + (f.rand."0.3.18".nightly or false) || + (rand."0.3.18"."nightly" or false); } + { "0.3.18".default = (f.rand."0.3.18".default or true); } + ]; + }) [ + (features_.libc."${deps."rand"."0.3.18"."libc"}" deps) + (features_.fuchsia_zircon."${deps."rand"."0.3.18"."fuchsia_zircon"}" deps) + ]; + + +# end +# rand-0.5.5 + + crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.5.5"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand"."0.5.5"."rand_core"}" deps) + ]) + ++ (if kernel == "cloudabi" then mapFeatures features ([ + ] + ++ (if features.rand."0.5.5".cloudabi or false then [ (crates.cloudabi."${deps."rand"."0.5.5".cloudabi}" deps) ] else [])) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + ] + ++ (if features.rand."0.5.5".fuchsia-zircon or false then [ (crates.fuchsia_zircon."${deps."rand"."0.5.5".fuchsia_zircon}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.5.5".libc or false then [ (crates.libc."${deps."rand"."0.5.5".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.rand."0.5.5".winapi or false then [ (crates.winapi."${deps."rand"."0.5.5".winapi}" deps) ] else [])) else []) + ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ +]) else []); + features = mkFeatures (features."rand"."0.5.5" or {}); + }; + features_.rand."0.5.5" = deps: f: updateFeatures f (rec { + cloudabi."${deps.rand."0.5.5".cloudabi}".default = true; + fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true; + libc."${deps.rand."0.5.5".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.5.5"."alloc" = + (f.rand."0.5.5"."alloc" or false) || + (f.rand."0.5.5".std or false) || + (rand."0.5.5"."std" or false); } + { "0.5.5"."cloudabi" = + (f.rand."0.5.5"."cloudabi" or false) || + (f.rand."0.5.5".std or false) || + (rand."0.5.5"."std" or false); } + { "0.5.5"."fuchsia-zircon" = + (f.rand."0.5.5"."fuchsia-zircon" or false) || + (f.rand."0.5.5".std or false) || + (rand."0.5.5"."std" or false); } + { "0.5.5"."i128_support" = + (f.rand."0.5.5"."i128_support" or false) || + (f.rand."0.5.5".nightly or false) || + (rand."0.5.5"."nightly" or false); } + { "0.5.5"."libc" = + (f.rand."0.5.5"."libc" or false) || + (f.rand."0.5.5".std or false) || + (rand."0.5.5"."std" or false); } + { "0.5.5"."serde" = + (f.rand."0.5.5"."serde" or false) || + (f.rand."0.5.5".serde1 or false) || + (rand."0.5.5"."serde1" or false); } + { "0.5.5"."serde_derive" = + (f.rand."0.5.5"."serde_derive" or false) || + (f.rand."0.5.5".serde1 or false) || + (rand."0.5.5"."serde1" or false); } + { "0.5.5"."std" = + (f.rand."0.5.5"."std" or false) || + (f.rand."0.5.5".default or false) || + (rand."0.5.5"."default" or false); } + { "0.5.5"."winapi" = + (f.rand."0.5.5"."winapi" or false) || + (f.rand."0.5.5".std or false) || + (rand."0.5.5"."std" or false); } + { "0.5.5".default = (f.rand."0.5.5".default or true); } + ]; + rand_core = fold recursiveUpdate {} [ + { "${deps.rand."0.5.5".rand_core}"."alloc" = + (f.rand_core."${deps.rand."0.5.5".rand_core}"."alloc" or false) || + (rand."0.5.5"."alloc" or false) || + (f."rand"."0.5.5"."alloc" or false); } + { "${deps.rand."0.5.5".rand_core}"."serde1" = + (f.rand_core."${deps.rand."0.5.5".rand_core}"."serde1" or false) || + (rand."0.5.5"."serde1" or false) || + (f."rand"."0.5.5"."serde1" or false); } + { "${deps.rand."0.5.5".rand_core}"."std" = + (f.rand_core."${deps.rand."0.5.5".rand_core}"."std" or false) || + (rand."0.5.5"."std" or false) || + (f."rand"."0.5.5"."std" or false); } + { "${deps.rand."0.5.5".rand_core}".default = (f.rand_core."${deps.rand."0.5.5".rand_core}".default or false); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.5.5".winapi}"."minwindef" = true; } + { "${deps.rand."0.5.5".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.5.5".winapi}"."profileapi" = true; } + { "${deps.rand."0.5.5".winapi}"."winnt" = true; } + { "${deps.rand."0.5.5".winapi}".default = true; } + ]; + }) [ + (features_.rand_core."${deps."rand"."0.5.5"."rand_core"}" deps) + (features_.cloudabi."${deps."rand"."0.5.5"."cloudabi"}" deps) + (features_.fuchsia_zircon."${deps."rand"."0.5.5"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.5.5"."libc"}" deps) + (features_.winapi."${deps."rand"."0.5.5"."winapi"}" deps) + ]; + + +# end +# rand-0.6.1 + + crates.rand."0.6.1" = deps: { features?(features_.rand."0.6.1" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.6.1"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "123s3w165iiifmf475lisqkd0kbr7nwnn3k4b1zg2cwap5v9m9bz"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."rand_chacha"."${deps."rand"."0.6.1"."rand_chacha"}" deps) + (crates."rand_core"."${deps."rand"."0.6.1"."rand_core"}" deps) + (crates."rand_hc"."${deps."rand"."0.6.1"."rand_hc"}" deps) + (crates."rand_isaac"."${deps."rand"."0.6.1"."rand_isaac"}" deps) + (crates."rand_pcg"."${deps."rand"."0.6.1"."rand_pcg"}" deps) + (crates."rand_xorshift"."${deps."rand"."0.6.1"."rand_xorshift"}" deps) + ]) + ++ (if kernel == "cloudabi" then mapFeatures features ([ + ] + ++ (if features.rand."0.6.1".cloudabi or false then [ (crates.cloudabi."${deps."rand"."0.6.1".cloudabi}" deps) ] else [])) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + ] + ++ (if features.rand."0.6.1".fuchsia-zircon or false then [ (crates.fuchsia_zircon."${deps."rand"."0.6.1".fuchsia_zircon}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.6.1".libc or false then [ (crates.libc."${deps."rand"."0.6.1".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.rand."0.6.1".winapi or false then [ (crates.winapi."${deps."rand"."0.6.1".winapi}" deps) ] else [])) else []) + ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ +]) else []); + + buildDependencies = mapFeatures features ([ + (crates."rustc_version"."${deps."rand"."0.6.1"."rustc_version"}" deps) + ]); + features = mkFeatures (features."rand"."0.6.1" or {}); + }; + features_.rand."0.6.1" = deps: f: updateFeatures f (rec { + cloudabi."${deps.rand."0.6.1".cloudabi}".default = true; + fuchsia_zircon."${deps.rand."0.6.1".fuchsia_zircon}".default = true; + libc."${deps.rand."0.6.1".libc}".default = (f.libc."${deps.rand."0.6.1".libc}".default or false); + rand = fold recursiveUpdate {} [ + { "0.6.1"."alloc" = + (f.rand."0.6.1"."alloc" or false) || + (f.rand."0.6.1".std or false) || + (rand."0.6.1"."std" or false); } + { "0.6.1"."cloudabi" = + (f.rand."0.6.1"."cloudabi" or false) || + (f.rand."0.6.1".std or false) || + (rand."0.6.1"."std" or false); } + { "0.6.1"."fuchsia-zircon" = + (f.rand."0.6.1"."fuchsia-zircon" or false) || + (f.rand."0.6.1".std or false) || + (rand."0.6.1"."std" or false); } + { "0.6.1"."libc" = + (f.rand."0.6.1"."libc" or false) || + (f.rand."0.6.1".std or false) || + (rand."0.6.1"."std" or false); } + { "0.6.1"."packed_simd" = + (f.rand."0.6.1"."packed_simd" or false) || + (f.rand."0.6.1".simd_support or false) || + (rand."0.6.1"."simd_support" or false); } + { "0.6.1"."simd_support" = + (f.rand."0.6.1"."simd_support" or false) || + (f.rand."0.6.1".nightly or false) || + (rand."0.6.1"."nightly" or false); } + { "0.6.1"."std" = + (f.rand."0.6.1"."std" or false) || + (f.rand."0.6.1".default or false) || + (rand."0.6.1"."default" or false); } + { "0.6.1"."winapi" = + (f.rand."0.6.1"."winapi" or false) || + (f.rand."0.6.1".std or false) || + (rand."0.6.1"."std" or false); } + { "0.6.1".default = (f.rand."0.6.1".default or true); } + ]; + rand_chacha."${deps.rand."0.6.1".rand_chacha}".default = true; + rand_core = fold recursiveUpdate {} [ + { "${deps.rand."0.6.1".rand_core}"."alloc" = + (f.rand_core."${deps.rand."0.6.1".rand_core}"."alloc" or false) || + (rand."0.6.1"."alloc" or false) || + (f."rand"."0.6.1"."alloc" or false); } + { "${deps.rand."0.6.1".rand_core}"."serde1" = + (f.rand_core."${deps.rand."0.6.1".rand_core}"."serde1" or false) || + (rand."0.6.1"."serde1" or false) || + (f."rand"."0.6.1"."serde1" or false); } + { "${deps.rand."0.6.1".rand_core}"."std" = + (f.rand_core."${deps.rand."0.6.1".rand_core}"."std" or false) || + (rand."0.6.1"."std" or false) || + (f."rand"."0.6.1"."std" or false); } + { "${deps.rand."0.6.1".rand_core}".default = (f.rand_core."${deps.rand."0.6.1".rand_core}".default or false); } + ]; + rand_hc."${deps.rand."0.6.1".rand_hc}".default = true; + rand_isaac = fold recursiveUpdate {} [ + { "${deps.rand."0.6.1".rand_isaac}"."serde1" = + (f.rand_isaac."${deps.rand."0.6.1".rand_isaac}"."serde1" or false) || + (rand."0.6.1"."serde1" or false) || + (f."rand"."0.6.1"."serde1" or false); } + { "${deps.rand."0.6.1".rand_isaac}".default = true; } + ]; + rand_pcg."${deps.rand."0.6.1".rand_pcg}".default = true; + rand_xorshift = fold recursiveUpdate {} [ + { "${deps.rand."0.6.1".rand_xorshift}"."serde1" = + (f.rand_xorshift."${deps.rand."0.6.1".rand_xorshift}"."serde1" or false) || + (rand."0.6.1"."serde1" or false) || + (f."rand"."0.6.1"."serde1" or false); } + { "${deps.rand."0.6.1".rand_xorshift}".default = true; } + ]; + rustc_version."${deps.rand."0.6.1".rustc_version}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.6.1".winapi}"."minwindef" = true; } + { "${deps.rand."0.6.1".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.6.1".winapi}"."profileapi" = true; } + { "${deps.rand."0.6.1".winapi}"."winnt" = true; } + { "${deps.rand."0.6.1".winapi}".default = true; } + ]; + }) [ + (features_.rand_chacha."${deps."rand"."0.6.1"."rand_chacha"}" deps) + (features_.rand_core."${deps."rand"."0.6.1"."rand_core"}" deps) + (features_.rand_hc."${deps."rand"."0.6.1"."rand_hc"}" deps) + (features_.rand_isaac."${deps."rand"."0.6.1"."rand_isaac"}" deps) + (features_.rand_pcg."${deps."rand"."0.6.1"."rand_pcg"}" deps) + (features_.rand_xorshift."${deps."rand"."0.6.1"."rand_xorshift"}" deps) + (features_.rustc_version."${deps."rand"."0.6.1"."rustc_version"}" deps) + (features_.cloudabi."${deps."rand"."0.6.1"."cloudabi"}" deps) + (features_.fuchsia_zircon."${deps."rand"."0.6.1"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.6.1"."libc"}" deps) + (features_.winapi."${deps."rand"."0.6.1"."winapi"}" deps) + ]; + + +# end +# rand_chacha-0.1.0 + + crates.rand_chacha."0.1.0" = deps: { features?(features_.rand_chacha."0.1.0" deps {}) }: buildRustCrate { + crateName = "rand_chacha"; + version = "0.1.0"; + description = "ChaCha random number generator\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "0q5pq34cqv1mnibgzd1cmx9q49vkr2lvalkkvizmlld217jmlqc6"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_chacha"."0.1.0"."rand_core"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) + ]); + }; + features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec { + rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true); + rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false); + rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true; + }) [ + (features_.rand_core."${deps."rand_chacha"."0.1.0"."rand_core"}" deps) + (features_.rustc_version."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) + ]; + + +# end +# rand_core-0.2.2 + + crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.2.2"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_core"."0.2.2"."rand_core"}" deps) + ]); + features = mkFeatures (features."rand_core"."0.2.2" or {}); + }; + features_.rand_core."0.2.2" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_core."0.2.2".rand_core}"."alloc" = + (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."alloc" or false) || + (rand_core."0.2.2"."alloc" or false) || + (f."rand_core"."0.2.2"."alloc" or false); } + { "${deps.rand_core."0.2.2".rand_core}"."serde1" = + (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."serde1" or false) || + (rand_core."0.2.2"."serde1" or false) || + (f."rand_core"."0.2.2"."serde1" or false); } + { "${deps.rand_core."0.2.2".rand_core}"."std" = + (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."std" or false) || + (rand_core."0.2.2"."std" or false) || + (f."rand_core"."0.2.2"."std" or false); } + { "${deps.rand_core."0.2.2".rand_core}".default = (f.rand_core."${deps.rand_core."0.2.2".rand_core}".default or false); } + { "0.2.2".default = (f.rand_core."0.2.2".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rand_core"."0.2.2"."rand_core"}" deps) + ]; + + +# end +# rand_core-0.3.0 + + crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.3.0"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."rand_core"."0.3.0" or {}); + }; + features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "0.3.0"."alloc" = + (f.rand_core."0.3.0"."alloc" or false) || + (f.rand_core."0.3.0".std or false) || + (rand_core."0.3.0"."std" or false); } + { "0.3.0"."serde" = + (f.rand_core."0.3.0"."serde" or false) || + (f.rand_core."0.3.0".serde1 or false) || + (rand_core."0.3.0"."serde1" or false); } + { "0.3.0"."serde_derive" = + (f.rand_core."0.3.0"."serde_derive" or false) || + (f.rand_core."0.3.0".serde1 or false) || + (rand_core."0.3.0"."serde1" or false); } + { "0.3.0"."std" = + (f.rand_core."0.3.0"."std" or false) || + (f.rand_core."0.3.0".default or false) || + (rand_core."0.3.0"."default" or false); } + { "0.3.0".default = (f.rand_core."0.3.0".default or true); } + ]; + }) []; + + +# end +# rand_hc-0.1.0 + + crates.rand_hc."0.1.0" = deps: { features?(features_.rand_hc."0.1.0" deps {}) }: buildRustCrate { + crateName = "rand_hc"; + version = "0.1.0"; + description = "HC128 random number generator\n"; + authors = [ "The Rand Project Developers" ]; + sha256 = "05agb75j87yp7y1zk8yf7bpm66hc0673r3dlypn0kazynr6fdgkz"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) + ]); + }; + features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec { + rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); + rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); + }) [ + (features_.rand_core."${deps."rand_hc"."0.1.0"."rand_core"}" deps) + ]; + + +# end +# rand_isaac-0.1.1 + + crates.rand_isaac."0.1.1" = deps: { features?(features_.rand_isaac."0.1.1" deps {}) }: buildRustCrate { + crateName = "rand_isaac"; + version = "0.1.1"; + description = "ISAAC random number generator\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "10hhdh5b5sa03s6b63y9bafm956jwilx41s71jbrzl63ccx8lxdq"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) + ]); + features = mkFeatures (features."rand_isaac"."0.1.1" or {}); + }; + features_.rand_isaac."0.1.1" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_isaac."0.1.1".rand_core}"."serde1" = + (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}"."serde1" or false) || + (rand_isaac."0.1.1"."serde1" or false) || + (f."rand_isaac"."0.1.1"."serde1" or false); } + { "${deps.rand_isaac."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}".default or false); } + ]; + rand_isaac = fold recursiveUpdate {} [ + { "0.1.1"."serde" = + (f.rand_isaac."0.1.1"."serde" or false) || + (f.rand_isaac."0.1.1".serde1 or false) || + (rand_isaac."0.1.1"."serde1" or false); } + { "0.1.1"."serde_derive" = + (f.rand_isaac."0.1.1"."serde_derive" or false) || + (f.rand_isaac."0.1.1".serde1 or false) || + (rand_isaac."0.1.1"."serde1" or false); } + { "0.1.1".default = (f.rand_isaac."0.1.1".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) + ]; + + +# end +# rand_pcg-0.1.1 + + crates.rand_pcg."0.1.1" = deps: { features?(features_.rand_pcg."0.1.1" deps {}) }: buildRustCrate { + crateName = "rand_pcg"; + version = "0.1.1"; + description = "Selected PCG random number generators\n"; + authors = [ "The Rand Project Developers" ]; + sha256 = "0x6pzldj0c8c7gmr67ni5i7w2f7n7idvs3ckx0fc3wkhwl7wrbza"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_pcg"."0.1.1"."rand_core"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."rustc_version"."${deps."rand_pcg"."0.1.1"."rustc_version"}" deps) + ]); + features = mkFeatures (features."rand_pcg"."0.1.1" or {}); + }; + features_.rand_pcg."0.1.1" = deps: f: updateFeatures f (rec { + rand_core."${deps.rand_pcg."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_pcg."0.1.1".rand_core}".default or false); + rand_pcg = fold recursiveUpdate {} [ + { "0.1.1"."serde" = + (f.rand_pcg."0.1.1"."serde" or false) || + (f.rand_pcg."0.1.1".serde1 or false) || + (rand_pcg."0.1.1"."serde1" or false); } + { "0.1.1"."serde_derive" = + (f.rand_pcg."0.1.1"."serde_derive" or false) || + (f.rand_pcg."0.1.1".serde1 or false) || + (rand_pcg."0.1.1"."serde1" or false); } + { "0.1.1".default = (f.rand_pcg."0.1.1".default or true); } + ]; + rustc_version."${deps.rand_pcg."0.1.1".rustc_version}".default = true; + }) [ + (features_.rand_core."${deps."rand_pcg"."0.1.1"."rand_core"}" deps) + (features_.rustc_version."${deps."rand_pcg"."0.1.1"."rustc_version"}" deps) + ]; + + +# end +# rand_xorshift-0.1.0 + + crates.rand_xorshift."0.1.0" = deps: { features?(features_.rand_xorshift."0.1.0" deps {}) }: buildRustCrate { + crateName = "rand_xorshift"; + version = "0.1.0"; + description = "Xorshift random number generator\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "063vxb678ki8gq4rx9w7yg5f9i29ig1zwykl67mfsxn0kxlkv2ih"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_xorshift"."0.1.0"."rand_core"}" deps) + ]); + features = mkFeatures (features."rand_xorshift"."0.1.0" or {}); + }; + features_.rand_xorshift."0.1.0" = deps: f: updateFeatures f (rec { + rand_core."${deps.rand_xorshift."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_xorshift."0.1.0".rand_core}".default or false); + rand_xorshift = fold recursiveUpdate {} [ + { "0.1.0"."serde" = + (f.rand_xorshift."0.1.0"."serde" or false) || + (f.rand_xorshift."0.1.0".serde1 or false) || + (rand_xorshift."0.1.0"."serde1" or false); } + { "0.1.0"."serde_derive" = + (f.rand_xorshift."0.1.0"."serde_derive" or false) || + (f.rand_xorshift."0.1.0".serde1 or false) || + (rand_xorshift."0.1.0"."serde1" or false); } + { "0.1.0".default = (f.rand_xorshift."0.1.0".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rand_xorshift"."0.1.0"."rand_core"}" deps) + ]; + + +# end +# redox_syscall-0.1.31 + + crates.redox_syscall."0.1.31" = deps: { features?(features_.redox_syscall."0.1.31" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.31"; + description = "A Rust library to access raw Redox system calls"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true); + }) []; + + +# end +# redox_termios-0.1.1 + + crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + description = "A Rust library to access Redox termios functions"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + +# end +# regex-0.1.80 + + crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "0.1.80"; + description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."0.1.80"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."0.1.80"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."0.1.80"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."0.1.80"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."0.1.80"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."0.1.80" or {}); + }; + features_.regex."0.1.80" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true; + memchr."${deps.regex."0.1.80".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "0.1.80"."simd" = + (f.regex."0.1.80"."simd" or false) || + (f.regex."0.1.80".simd-accel or false) || + (regex."0.1.80"."simd-accel" or false); } + { "0.1.80".default = (f.regex."0.1.80".default or true); } + ]; + regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true; + thread_local."${deps.regex."0.1.80".thread_local}".default = true; + utf8_ranges."${deps.regex."0.1.80".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."0.1.80"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."0.1.80"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."0.1.80"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."0.1.80"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."0.1.80"."utf8_ranges"}" deps) + ]; + + +# end +# regex-syntax-0.3.9 + + crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.3.9"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; + }; + features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec { + regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); + }) []; + + +# end +# remove_dir_all-0.5.1 + + crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + description = "A safe, reliable implementation of remove_dir_all for Windows"; + authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]) else []); + }; + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]; + + +# end +# reqwest-0.9.5 + + crates.reqwest."0.9.5" = deps: { features?(features_.reqwest."0.9.5" deps {}) }: buildRustCrate { + crateName = "reqwest"; + version = "0.9.5"; + description = "higher level HTTP client library"; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1y0fq8ifhbgn6bfvjq831svirqszszj7f73ykbd28inwc0xiv2ix"; + dependencies = mapFeatures features ([ + (crates."base64"."${deps."reqwest"."0.9.5"."base64"}" deps) + (crates."bytes"."${deps."reqwest"."0.9.5"."bytes"}" deps) + (crates."encoding_rs"."${deps."reqwest"."0.9.5"."encoding_rs"}" deps) + (crates."futures"."${deps."reqwest"."0.9.5"."futures"}" deps) + (crates."http"."${deps."reqwest"."0.9.5"."http"}" deps) + (crates."hyper"."${deps."reqwest"."0.9.5"."hyper"}" deps) + (crates."libflate"."${deps."reqwest"."0.9.5"."libflate"}" deps) + (crates."log"."${deps."reqwest"."0.9.5"."log"}" deps) + (crates."mime"."${deps."reqwest"."0.9.5"."mime"}" deps) + (crates."mime_guess"."${deps."reqwest"."0.9.5"."mime_guess"}" deps) + (crates."serde"."${deps."reqwest"."0.9.5"."serde"}" deps) + (crates."serde_json"."${deps."reqwest"."0.9.5"."serde_json"}" deps) + (crates."serde_urlencoded"."${deps."reqwest"."0.9.5"."serde_urlencoded"}" deps) + (crates."tokio"."${deps."reqwest"."0.9.5"."tokio"}" deps) + (crates."tokio_io"."${deps."reqwest"."0.9.5"."tokio_io"}" deps) + (crates."url"."${deps."reqwest"."0.9.5"."url"}" deps) + (crates."uuid"."${deps."reqwest"."0.9.5"."uuid"}" deps) + ] + ++ (if features.reqwest."0.9.5".hyper-tls or false then [ (crates.hyper_tls."${deps."reqwest"."0.9.5".hyper_tls}" deps) ] else []) + ++ (if features.reqwest."0.9.5".native-tls or false then [ (crates.native_tls."${deps."reqwest"."0.9.5".native_tls}" deps) ] else [])); + features = mkFeatures (features."reqwest"."0.9.5" or {}); + }; + features_.reqwest."0.9.5" = deps: f: updateFeatures f (rec { + base64."${deps.reqwest."0.9.5".base64}".default = true; + bytes."${deps.reqwest."0.9.5".bytes}".default = true; + encoding_rs."${deps.reqwest."0.9.5".encoding_rs}".default = true; + futures."${deps.reqwest."0.9.5".futures}".default = true; + http."${deps.reqwest."0.9.5".http}".default = true; + hyper."${deps.reqwest."0.9.5".hyper}".default = true; + hyper_tls."${deps.reqwest."0.9.5".hyper_tls}".default = true; + libflate."${deps.reqwest."0.9.5".libflate}".default = true; + log."${deps.reqwest."0.9.5".log}".default = true; + mime."${deps.reqwest."0.9.5".mime}".default = true; + mime_guess."${deps.reqwest."0.9.5".mime_guess}".default = true; + native_tls."${deps.reqwest."0.9.5".native_tls}".default = true; + reqwest = fold recursiveUpdate {} [ + { "0.9.5"."default-tls" = + (f.reqwest."0.9.5"."default-tls" or false) || + (f.reqwest."0.9.5".default or false) || + (reqwest."0.9.5"."default" or false); } + { "0.9.5"."hyper-old-types" = + (f.reqwest."0.9.5"."hyper-old-types" or false) || + (f.reqwest."0.9.5".hyper-011 or false) || + (reqwest."0.9.5"."hyper-011" or false); } + { "0.9.5"."hyper-tls" = + (f.reqwest."0.9.5"."hyper-tls" or false) || + (f.reqwest."0.9.5".default-tls or false) || + (reqwest."0.9.5"."default-tls" or false); } + { "0.9.5"."native-tls" = + (f.reqwest."0.9.5"."native-tls" or false) || + (f.reqwest."0.9.5".default-tls or false) || + (reqwest."0.9.5"."default-tls" or false); } + { "0.9.5".default = (f.reqwest."0.9.5".default or true); } + ]; + serde."${deps.reqwest."0.9.5".serde}".default = true; + serde_json."${deps.reqwest."0.9.5".serde_json}".default = true; + serde_urlencoded."${deps.reqwest."0.9.5".serde_urlencoded}".default = true; + tokio."${deps.reqwest."0.9.5".tokio}".default = true; + tokio_io."${deps.reqwest."0.9.5".tokio_io}".default = true; + url."${deps.reqwest."0.9.5".url}".default = true; + uuid = fold recursiveUpdate {} [ + { "${deps.reqwest."0.9.5".uuid}"."v4" = true; } + { "${deps.reqwest."0.9.5".uuid}".default = true; } + ]; + }) [ + (features_.base64."${deps."reqwest"."0.9.5"."base64"}" deps) + (features_.bytes."${deps."reqwest"."0.9.5"."bytes"}" deps) + (features_.encoding_rs."${deps."reqwest"."0.9.5"."encoding_rs"}" deps) + (features_.futures."${deps."reqwest"."0.9.5"."futures"}" deps) + (features_.http."${deps."reqwest"."0.9.5"."http"}" deps) + (features_.hyper."${deps."reqwest"."0.9.5"."hyper"}" deps) + (features_.hyper_tls."${deps."reqwest"."0.9.5"."hyper_tls"}" deps) + (features_.libflate."${deps."reqwest"."0.9.5"."libflate"}" deps) + (features_.log."${deps."reqwest"."0.9.5"."log"}" deps) + (features_.mime."${deps."reqwest"."0.9.5"."mime"}" deps) + (features_.mime_guess."${deps."reqwest"."0.9.5"."mime_guess"}" deps) + (features_.native_tls."${deps."reqwest"."0.9.5"."native_tls"}" deps) + (features_.serde."${deps."reqwest"."0.9.5"."serde"}" deps) + (features_.serde_json."${deps."reqwest"."0.9.5"."serde_json"}" deps) + (features_.serde_urlencoded."${deps."reqwest"."0.9.5"."serde_urlencoded"}" deps) + (features_.tokio."${deps."reqwest"."0.9.5"."tokio"}" deps) + (features_.tokio_io."${deps."reqwest"."0.9.5"."tokio_io"}" deps) + (features_.url."${deps."reqwest"."0.9.5"."url"}" deps) + (features_.uuid."${deps."reqwest"."0.9.5"."uuid"}" deps) + ]; + + +# end +# rustc_version-0.2.3 + + crates.rustc_version."0.2.3" = deps: { features?(features_.rustc_version."0.2.3" deps {}) }: buildRustCrate { + crateName = "rustc_version"; + version = "0.2.3"; + description = "A library for querying the version of a installed rustc compiler"; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "0rgwzbgs3i9fqjm1p4ra3n7frafmpwl29c8lw85kv1rxn7n2zaa7"; + dependencies = mapFeatures features ([ + (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) + ]); + }; + features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec { + rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); + semver."${deps.rustc_version."0.2.3".semver}".default = true; + }) [ + (features_.semver."${deps."rustc_version"."0.2.3"."semver"}" deps) + ]; + + +# end +# safemem-0.3.0 + + crates.safemem."0.3.0" = deps: { features?(features_.safemem."0.3.0" deps {}) }: buildRustCrate { + crateName = "safemem"; + version = "0.3.0"; + description = "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`."; + authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; + sha256 = "0pr39b468d05f6m7m4alsngmj5p7an8df21apsxbi57k0lmwrr18"; + features = mkFeatures (features."safemem"."0.3.0" or {}); + }; + features_.safemem."0.3.0" = deps: f: updateFeatures f (rec { + safemem = fold recursiveUpdate {} [ + { "0.3.0"."std" = + (f.safemem."0.3.0"."std" or false) || + (f.safemem."0.3.0".default or false) || + (safemem."0.3.0"."default" or false); } + { "0.3.0".default = (f.safemem."0.3.0".default or true); } + ]; + }) []; + + +# end +# schannel-0.1.14 + + crates.schannel."0.1.14" = deps: { features?(features_.schannel."0.1.14" deps {}) }: buildRustCrate { + crateName = "schannel"; + version = "0.1.14"; + description = "Schannel bindings for rust, allowing SSL/TLS (e.g. https) without openssl"; + authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ]; + sha256 = "1g0a88jknns1kwn3x1k3ci5y5zvg58pwdg1xrxkrw3cwd2hynm9k"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."schannel"."0.1.14"."lazy_static"}" deps) + (crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps) + ]); + }; + features_.schannel."0.1.14" = deps: f: updateFeatures f (rec { + lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true; + schannel."0.1.14".default = (f.schannel."0.1.14".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.schannel."0.1.14".winapi}"."lmcons" = true; } + { "${deps.schannel."0.1.14".winapi}"."minschannel" = true; } + { "${deps.schannel."0.1.14".winapi}"."schannel" = true; } + { "${deps.schannel."0.1.14".winapi}"."securitybaseapi" = true; } + { "${deps.schannel."0.1.14".winapi}"."sspi" = true; } + { "${deps.schannel."0.1.14".winapi}"."sysinfoapi" = true; } + { "${deps.schannel."0.1.14".winapi}"."timezoneapi" = true; } + { "${deps.schannel."0.1.14".winapi}"."winbase" = true; } + { "${deps.schannel."0.1.14".winapi}"."wincrypt" = true; } + { "${deps.schannel."0.1.14".winapi}"."winerror" = true; } + { "${deps.schannel."0.1.14".winapi}".default = true; } + ]; + }) [ + (features_.lazy_static."${deps."schannel"."0.1.14"."lazy_static"}" deps) + (features_.winapi."${deps."schannel"."0.1.14"."winapi"}" deps) + ]; + + +# end +# scopeguard-0.3.3 + + crates.scopeguard."0.3.3" = deps: { features?(features_.scopeguard."0.3.3" deps {}) }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.3"; + description = "A RAII scope guard that will run a given closure when it goes out of scope,\neven if the code between panics (assuming unwinding panic).\n\nDefines the macros `defer!` and `defer_on_unwind!`; the latter only runs\nif the scope is extited through unwinding on panic.\n"; + authors = [ "bluss" ]; + sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; + features = mkFeatures (features."scopeguard"."0.3.3" or {}); + }; + features_.scopeguard."0.3.3" = deps: f: updateFeatures f (rec { + scopeguard = fold recursiveUpdate {} [ + { "0.3.3"."use_std" = + (f.scopeguard."0.3.3"."use_std" or false) || + (f.scopeguard."0.3.3".default or false) || + (scopeguard."0.3.3"."default" or false); } + { "0.3.3".default = (f.scopeguard."0.3.3".default or true); } + ]; + }) []; + + +# end +# security-framework-0.2.1 + + crates.security_framework."0.2.1" = deps: { features?(features_.security_framework."0.2.1" deps {}) }: buildRustCrate { + crateName = "security-framework"; + version = "0.2.1"; + description = "Security Framework bindings"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0qia5g66zmjn57m9swhrkz3cll3bs4061qim6w72v08c2w0pkvsw"; + dependencies = mapFeatures features ([ + (crates."core_foundation"."${deps."security_framework"."0.2.1"."core_foundation"}" deps) + (crates."core_foundation_sys"."${deps."security_framework"."0.2.1"."core_foundation_sys"}" deps) + (crates."libc"."${deps."security_framework"."0.2.1"."libc"}" deps) + (crates."security_framework_sys"."${deps."security_framework"."0.2.1"."security_framework_sys"}" deps) + ]); + features = mkFeatures (features."security_framework"."0.2.1" or {}); + }; + features_.security_framework."0.2.1" = deps: f: updateFeatures f (rec { + core_foundation."${deps.security_framework."0.2.1".core_foundation}".default = true; + core_foundation_sys."${deps.security_framework."0.2.1".core_foundation_sys}".default = true; + libc."${deps.security_framework."0.2.1".libc}".default = true; + security_framework = fold recursiveUpdate {} [ + { "0.2.1"."OSX_10_10" = + (f.security_framework."0.2.1"."OSX_10_10" or false) || + (f.security_framework."0.2.1".OSX_10_11 or false) || + (security_framework."0.2.1"."OSX_10_11" or false); } + { "0.2.1"."OSX_10_11" = + (f.security_framework."0.2.1"."OSX_10_11" or false) || + (f.security_framework."0.2.1".OSX_10_12 or false) || + (security_framework."0.2.1"."OSX_10_12" or false); } + { "0.2.1"."OSX_10_9" = + (f.security_framework."0.2.1"."OSX_10_9" or false) || + (f.security_framework."0.2.1".OSX_10_10 or false) || + (security_framework."0.2.1"."OSX_10_10" or false); } + { "0.2.1".default = (f.security_framework."0.2.1".default or true); } + ]; + security_framework_sys = fold recursiveUpdate {} [ + { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_10" = + (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_10" or false) || + (security_framework."0.2.1"."OSX_10_10" or false) || + (f."security_framework"."0.2.1"."OSX_10_10" or false); } + { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_11" = + (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_11" or false) || + (security_framework."0.2.1"."OSX_10_11" or false) || + (f."security_framework"."0.2.1"."OSX_10_11" or false) || + (security_framework."0.2.1"."OSX_10_12" or false) || + (f."security_framework"."0.2.1"."OSX_10_12" or false); } + { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_9" = + (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_9" or false) || + (security_framework."0.2.1"."OSX_10_9" or false) || + (f."security_framework"."0.2.1"."OSX_10_9" or false); } + { "${deps.security_framework."0.2.1".security_framework_sys}".default = true; } + ]; + }) [ + (features_.core_foundation."${deps."security_framework"."0.2.1"."core_foundation"}" deps) + (features_.core_foundation_sys."${deps."security_framework"."0.2.1"."core_foundation_sys"}" deps) + (features_.libc."${deps."security_framework"."0.2.1"."libc"}" deps) + (features_.security_framework_sys."${deps."security_framework"."0.2.1"."security_framework_sys"}" deps) + ]; + + +# end +# security-framework-sys-0.2.1 + + crates.security_framework_sys."0.2.1" = deps: { features?(features_.security_framework_sys."0.2.1" deps {}) }: buildRustCrate { + crateName = "security-framework-sys"; + version = "0.2.1"; + description = "Security Framework bindings"; + authors = [ "Steven Fackler <sfackler@gmail.com>" ]; + sha256 = "0ijxy7bdi4am092hrhm645hcv36xprdx1gjcjmnyw6n78x8sv2iz"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."core_foundation_sys"."${deps."security_framework_sys"."0.2.1"."core_foundation_sys"}" deps) + (crates."libc"."${deps."security_framework_sys"."0.2.1"."libc"}" deps) + ]); + features = mkFeatures (features."security_framework_sys"."0.2.1" or {}); + }; + features_.security_framework_sys."0.2.1" = deps: f: updateFeatures f (rec { + core_foundation_sys."${deps.security_framework_sys."0.2.1".core_foundation_sys}".default = true; + libc."${deps.security_framework_sys."0.2.1".libc}".default = true; + security_framework_sys = fold recursiveUpdate {} [ + { "0.2.1"."OSX_10_10" = + (f.security_framework_sys."0.2.1"."OSX_10_10" or false) || + (f.security_framework_sys."0.2.1".OSX_10_11 or false) || + (security_framework_sys."0.2.1"."OSX_10_11" or false); } + { "0.2.1"."OSX_10_11" = + (f.security_framework_sys."0.2.1"."OSX_10_11" or false) || + (f.security_framework_sys."0.2.1".OSX_10_12 or false) || + (security_framework_sys."0.2.1"."OSX_10_12" or false); } + { "0.2.1"."OSX_10_9" = + (f.security_framework_sys."0.2.1"."OSX_10_9" or false) || + (f.security_framework_sys."0.2.1".OSX_10_10 or false) || + (security_framework_sys."0.2.1"."OSX_10_10" or false); } + { "0.2.1".default = (f.security_framework_sys."0.2.1".default or true); } + ]; + }) [ + (features_.core_foundation_sys."${deps."security_framework_sys"."0.2.1"."core_foundation_sys"}" deps) + (features_.libc."${deps."security_framework_sys"."0.2.1"."libc"}" deps) + ]; + + +# end +# semver-0.9.0 + + crates.semver."0.9.0" = deps: { features?(features_.semver."0.9.0" deps {}) }: buildRustCrate { + crateName = "semver"; + version = "0.9.0"; + description = "Semantic version parsing and comparison.\n"; + authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ]; + sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; + dependencies = mapFeatures features ([ + (crates."semver_parser"."${deps."semver"."0.9.0"."semver_parser"}" deps) + ]); + features = mkFeatures (features."semver"."0.9.0" or {}); + }; + features_.semver."0.9.0" = deps: f: updateFeatures f (rec { + semver = fold recursiveUpdate {} [ + { "0.9.0"."serde" = + (f.semver."0.9.0"."serde" or false) || + (f.semver."0.9.0".ci or false) || + (semver."0.9.0"."ci" or false); } + { "0.9.0".default = (f.semver."0.9.0".default or true); } + ]; + semver_parser."${deps.semver."0.9.0".semver_parser}".default = true; + }) [ + (features_.semver_parser."${deps."semver"."0.9.0"."semver_parser"}" deps) + ]; + + +# end +# semver-parser-0.7.0 + + crates.semver_parser."0.7.0" = deps: { features?(features_.semver_parser."0.7.0" deps {}) }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + description = "Parsing of the semver spec.\n"; + authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + }; + features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec { + semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); + }) []; + + +# end +# serde-1.0.21 + + crates.serde."1.0.21" = deps: { features?(features_.serde."1.0.21" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.21"; + description = "A generic serialization/deserialization framework"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.21" or {}); + }; + features_.serde."1.0.21" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.21"."serde_derive" = + (f.serde."1.0.21"."serde_derive" or false) || + (f.serde."1.0.21".derive or false) || + (serde."1.0.21"."derive" or false) || + (f.serde."1.0.21".playground or false) || + (serde."1.0.21"."playground" or false); } + { "1.0.21"."std" = + (f.serde."1.0.21"."std" or false) || + (f.serde."1.0.21".default or false) || + (serde."1.0.21"."default" or false); } + { "1.0.21"."unstable" = + (f.serde."1.0.21"."unstable" or false) || + (f.serde."1.0.21".alloc or false) || + (serde."1.0.21"."alloc" or false); } + { "1.0.21".default = (f.serde."1.0.21".default or true); } + ]; + }) []; + + +# end +# serde_json-1.0.6 + + crates.serde_json."1.0.6" = deps: { features?(features_.serde_json."1.0.6" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.6"; + description = "A JSON serialization file format"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + dependencies = mapFeatures features ([ + (crates."dtoa"."${deps."serde_json"."1.0.6"."dtoa"}" deps) + (crates."itoa"."${deps."serde_json"."1.0.6"."itoa"}" deps) + (crates."num_traits"."${deps."serde_json"."1.0.6"."num_traits"}" deps) + (crates."serde"."${deps."serde_json"."1.0.6"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.6" or {}); + }; + features_.serde_json."1.0.6" = deps: f: updateFeatures f (rec { + dtoa."${deps.serde_json."1.0.6".dtoa}".default = true; + itoa."${deps.serde_json."1.0.6".itoa}".default = true; + num_traits."${deps.serde_json."1.0.6".num_traits}".default = true; + serde."${deps.serde_json."1.0.6".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.6"."linked-hash-map" = + (f.serde_json."1.0.6"."linked-hash-map" or false) || + (f.serde_json."1.0.6".preserve_order or false) || + (serde_json."1.0.6"."preserve_order" or false); } + { "1.0.6".default = (f.serde_json."1.0.6".default or true); } + ]; + }) [ + (features_.dtoa."${deps."serde_json"."1.0.6"."dtoa"}" deps) + (features_.itoa."${deps."serde_json"."1.0.6"."itoa"}" deps) + (features_.num_traits."${deps."serde_json"."1.0.6"."num_traits"}" deps) + (features_.serde."${deps."serde_json"."1.0.6"."serde"}" deps) + ]; + + +# end +# serde_urlencoded-0.5.1 + + crates.serde_urlencoded."0.5.1" = deps: { features?(features_.serde_urlencoded."0.5.1" deps {}) }: buildRustCrate { + crateName = "serde_urlencoded"; + version = "0.5.1"; + description = "`x-www-form-urlencoded` meets Serde"; + authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ]; + sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl"; + dependencies = mapFeatures features ([ + (crates."dtoa"."${deps."serde_urlencoded"."0.5.1"."dtoa"}" deps) + (crates."itoa"."${deps."serde_urlencoded"."0.5.1"."itoa"}" deps) + (crates."serde"."${deps."serde_urlencoded"."0.5.1"."serde"}" deps) + (crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps) + ]); + }; + features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec { + dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true; + itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true; + serde."${deps.serde_urlencoded."0.5.1".serde}".default = true; + serde_urlencoded."0.5.1".default = (f.serde_urlencoded."0.5.1".default or true); + url."${deps.serde_urlencoded."0.5.1".url}".default = true; + }) [ + (features_.dtoa."${deps."serde_urlencoded"."0.5.1"."dtoa"}" deps) + (features_.itoa."${deps."serde_urlencoded"."0.5.1"."itoa"}" deps) + (features_.serde."${deps."serde_urlencoded"."0.5.1"."serde"}" deps) + (features_.url."${deps."serde_urlencoded"."0.5.1"."url"}" deps) + ]; + + +# end +# siphasher-0.2.2 + + crates.siphasher."0.2.2" = deps: { features?(features_.siphasher."0.2.2" deps {}) }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + description = "SipHash functions from rust-core < 1.13"; + authors = [ "Frank Denis <github@pureftpd.org>" ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + dependencies = mapFeatures features ([ +]); + }; + features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec { + siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true); + }) []; + + +# end +# slab-0.4.0 + + crates.slab."0.4.0" = deps: { features?(features_.slab."0.4.0" deps {}) }: buildRustCrate { + crateName = "slab"; + version = "0.4.0"; + description = "Pre-allocated storage for a uniform data type"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; + }; + features_.slab."0.4.0" = deps: f: updateFeatures f (rec { + slab."0.4.0".default = (f.slab."0.4.0".default or true); + }) []; + + +# end +# slog-1.7.1 + + crates.slog."1.7.1" = deps: { features?(features_.slog."1.7.1" deps {}) }: buildRustCrate { + crateName = "slog"; + version = "1.7.1"; + description = "Structured, composable logging for Rust"; + authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "1qhnwv2gbxmnwasaa0vlhddq6cdhq6n3l8d6h3ql73367h7aav65"; + features = mkFeatures (features."slog"."1.7.1" or {}); + }; + features_.slog."1.7.1" = deps: f: updateFeatures f (rec { + slog = fold recursiveUpdate {} [ + { "1.7.1"."std" = + (f.slog."1.7.1"."std" or false) || + (f.slog."1.7.1".default or false) || + (slog."1.7.1"."default" or false); } + { "1.7.1".default = (f.slog."1.7.1".default or true); } + ]; + }) []; + + +# end +# slog-envlogger-0.5.0 + + crates.slog_envlogger."0.5.0" = deps: { features?(features_.slog_envlogger."0.5.0" deps {}) }: buildRustCrate { + crateName = "slog-envlogger"; + version = "0.5.0"; + description = "Port of de facto standard logger implementation for Rust, to `slog-rs` framework.\n"; + authors = [ "The Rust Project Developers" "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "0ry9k2ppj7z6prdz2kf924w7l9y2kbysrigca6shni1kz2j163qb"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."log"."${deps."slog_envlogger"."0.5.0"."log"}" deps) + (crates."regex"."${deps."slog_envlogger"."0.5.0"."regex"}" deps) + (crates."slog"."${deps."slog_envlogger"."0.5.0"."slog"}" deps) + (crates."slog_stdlog"."${deps."slog_envlogger"."0.5.0"."slog_stdlog"}" deps) + (crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) + ]); + }; + features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec { + log."${deps.slog_envlogger."0.5.0".log}".default = true; + regex."${deps.slog_envlogger."0.5.0".regex}".default = true; + slog."${deps.slog_envlogger."0.5.0".slog}".default = true; + slog_envlogger."0.5.0".default = (f.slog_envlogger."0.5.0".default or true); + slog_stdlog."${deps.slog_envlogger."0.5.0".slog_stdlog}".default = true; + slog_term."${deps.slog_envlogger."0.5.0".slog_term}".default = true; + }) [ + (features_.log."${deps."slog_envlogger"."0.5.0"."log"}" deps) + (features_.regex."${deps."slog_envlogger"."0.5.0"."regex"}" deps) + (features_.slog."${deps."slog_envlogger"."0.5.0"."slog"}" deps) + (features_.slog_stdlog."${deps."slog_envlogger"."0.5.0"."slog_stdlog"}" deps) + (features_.slog_term."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) + ]; + + +# end +# slog-extra-0.1.2 + + crates.slog_extra."0.1.2" = deps: { features?(features_.slog_extra."0.1.2" deps {}) }: buildRustCrate { + crateName = "slog-extra"; + version = "0.1.2"; + description = "Standard slog-rs extensions"; + authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "0jrw0xcc81wwcl59xx9qglfcv5l3ad5kbpcyp6ygk94p9kxfrhyj"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ + (crates."slog"."${deps."slog_extra"."0.1.2"."slog"}" deps) + (crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps) + ]); + }; + features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec { + slog."${deps.slog_extra."0.1.2".slog}".default = true; + slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true); + thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true; + }) [ + (features_.slog."${deps."slog_extra"."0.1.2"."slog"}" deps) + (features_.thread_local."${deps."slog_extra"."0.1.2"."thread_local"}" deps) + ]; + + +# end +# slog-stdlog-1.1.0 + + crates.slog_stdlog."1.1.0" = deps: { features?(features_.slog_stdlog."1.1.0" deps {}) }: buildRustCrate { + crateName = "slog-stdlog"; + version = "1.1.0"; + description = "Standard Rust log crate adapter to slog-rs"; + authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "0ig4mjixr4y3dn3s53rlnrpplwkqb8b0z2zkaiiiwyv7nhjxdg46"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ + (crates."crossbeam"."${deps."slog_stdlog"."1.1.0"."crossbeam"}" deps) + (crates."lazy_static"."${deps."slog_stdlog"."1.1.0"."lazy_static"}" deps) + (crates."log"."${deps."slog_stdlog"."1.1.0"."log"}" deps) + (crates."slog"."${deps."slog_stdlog"."1.1.0"."slog"}" deps) + (crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) + ]); + }; + features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec { + crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true; + lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true; + log."${deps.slog_stdlog."1.1.0".log}".default = true; + slog."${deps.slog_stdlog."1.1.0".slog}".default = true; + slog_stdlog."1.1.0".default = (f.slog_stdlog."1.1.0".default or true); + slog_term."${deps.slog_stdlog."1.1.0".slog_term}".default = true; + }) [ + (features_.crossbeam."${deps."slog_stdlog"."1.1.0"."crossbeam"}" deps) + (features_.lazy_static."${deps."slog_stdlog"."1.1.0"."lazy_static"}" deps) + (features_.log."${deps."slog_stdlog"."1.1.0"."log"}" deps) + (features_.slog."${deps."slog_stdlog"."1.1.0"."slog"}" deps) + (features_.slog_term."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) + ]; + + +# end +# slog-stream-1.2.1 + + crates.slog_stream."1.2.1" = deps: { features?(features_.slog_stream."1.2.1" deps {}) }: buildRustCrate { + crateName = "slog-stream"; + version = "1.2.1"; + description = "`io::Write` streamer for slog-rs"; + authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "03dwzbydaamfzjpr16gm065i696lk86gqcpspv5qaqyv938fm2yj"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ + (crates."slog"."${deps."slog_stream"."1.2.1"."slog"}" deps) + (crates."slog_extra"."${deps."slog_stream"."1.2.1"."slog_extra"}" deps) + (crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps) + ]); + }; + features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec { + slog."${deps.slog_stream."1.2.1".slog}".default = true; + slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true; + slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true); + thread_local."${deps.slog_stream."1.2.1".thread_local}".default = true; + }) [ + (features_.slog."${deps."slog_stream"."1.2.1"."slog"}" deps) + (features_.slog_extra."${deps."slog_stream"."1.2.1"."slog_extra"}" deps) + (features_.thread_local."${deps."slog_stream"."1.2.1"."thread_local"}" deps) + ]; + + +# end +# slog-term-1.5.0 + + crates.slog_term."1.5.0" = deps: { features?(features_.slog_term."1.5.0" deps {}) }: buildRustCrate { + crateName = "slog-term"; + version = "1.5.0"; + description = "Unix terminal drain and formatter for slog-rs"; + authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; + sha256 = "0zq2kyvm7jhqj6sc09w540wqfrrpa46yxf9sgzq7jqpkr66wsiar"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ + (crates."chrono"."${deps."slog_term"."1.5.0"."chrono"}" deps) + (crates."isatty"."${deps."slog_term"."1.5.0"."isatty"}" deps) + (crates."slog"."${deps."slog_term"."1.5.0"."slog"}" deps) + (crates."slog_stream"."${deps."slog_term"."1.5.0"."slog_stream"}" deps) + (crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps) + ]); + }; + features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec { + chrono."${deps.slog_term."1.5.0".chrono}".default = true; + isatty."${deps.slog_term."1.5.0".isatty}".default = true; + slog."${deps.slog_term."1.5.0".slog}".default = true; + slog_stream."${deps.slog_term."1.5.0".slog_stream}".default = true; + slog_term."1.5.0".default = (f.slog_term."1.5.0".default or true); + thread_local."${deps.slog_term."1.5.0".thread_local}".default = true; + }) [ + (features_.chrono."${deps."slog_term"."1.5.0"."chrono"}" deps) + (features_.isatty."${deps."slog_term"."1.5.0"."isatty"}" deps) + (features_.slog."${deps."slog_term"."1.5.0"."slog"}" deps) + (features_.slog_stream."${deps."slog_term"."1.5.0"."slog_stream"}" deps) + (features_.thread_local."${deps."slog_term"."1.5.0"."thread_local"}" deps) + ]; + + +# end +# smallvec-0.6.7 + + crates.smallvec."0.6.7" = deps: { features?(features_.smallvec."0.6.7" deps {}) }: buildRustCrate { + crateName = "smallvec"; + version = "0.6.7"; + description = "'Small vector' optimization: store up to a small number of items on the stack"; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "08ql2yi7ry08cqjl9n6vpb6x6zgqzwllzzk9pxj1143xwg503qcx"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ + (crates."unreachable"."${deps."smallvec"."0.6.7"."unreachable"}" deps) + ]); + features = mkFeatures (features."smallvec"."0.6.7" or {}); + }; + features_.smallvec."0.6.7" = deps: f: updateFeatures f (rec { + smallvec = fold recursiveUpdate {} [ + { "0.6.7"."std" = + (f.smallvec."0.6.7"."std" or false) || + (f.smallvec."0.6.7".default or false) || + (smallvec."0.6.7"."default" or false); } + { "0.6.7".default = (f.smallvec."0.6.7".default or true); } + ]; + unreachable."${deps.smallvec."0.6.7".unreachable}".default = true; + }) [ + (features_.unreachable."${deps."smallvec"."0.6.7"."unreachable"}" deps) + ]; + + +# end +# stable_deref_trait-1.1.1 + + crates.stable_deref_trait."1.1.1" = deps: { features?(features_.stable_deref_trait."1.1.1" deps {}) }: buildRustCrate { + crateName = "stable_deref_trait"; + version = "1.1.1"; + description = "An unsafe marker trait for types like Box and Rc that dereference to a stable address even when moved, and hence can be used with libraries such as owning_ref and rental.\n"; + authors = [ "Robert Grosse <n210241048576@gmail.com>" ]; + sha256 = "1xy9slzslrzr31nlnw52sl1d820b09y61b7f13lqgsn8n7y0l4g8"; + features = mkFeatures (features."stable_deref_trait"."1.1.1" or {}); + }; + features_.stable_deref_trait."1.1.1" = deps: f: updateFeatures f (rec { + stable_deref_trait = fold recursiveUpdate {} [ + { "1.1.1"."std" = + (f.stable_deref_trait."1.1.1"."std" or false) || + (f.stable_deref_trait."1.1.1".default or false) || + (stable_deref_trait."1.1.1"."default" or false); } + { "1.1.1".default = (f.stable_deref_trait."1.1.1".default or true); } + ]; + }) []; + + +# end +# string-0.1.2 + + crates.string."0.1.2" = deps: { features?(features_.string."0.1.2" deps {}) }: buildRustCrate { + crateName = "string"; + version = "0.1.2"; + description = "A UTF-8 encoded string with configurable byte storage."; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6"; + }; + features_.string."0.1.2" = deps: f: updateFeatures f (rec { + string."0.1.2".default = (f.string."0.1.2".default or true); + }) []; + + +# end +# strsim-0.6.0 + + crates.strsim."0.6.0" = deps: { features?(features_.strsim."0.6.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; + authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + }; + features_.strsim."0.6.0" = deps: f: updateFeatures f (rec { + strsim."0.6.0".default = (f.strsim."0.6.0".default or true); + }) []; + + +# end +# syn-0.11.11 + + crates.syn."0.11.11" = deps: { features?(features_.syn."0.11.11" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + description = "Nom parser for Rust source code"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + dependencies = mapFeatures features ([ + ] + ++ (if features.syn."0.11.11".quote or false then [ (crates.quote."${deps."syn"."0.11.11".quote}" deps) ] else []) + ++ (if features.syn."0.11.11".synom or false then [ (crates.synom."${deps."syn"."0.11.11".synom}" deps) ] else []) + ++ (if features.syn."0.11.11".unicode-xid or false then [ (crates.unicode_xid."${deps."syn"."0.11.11".unicode_xid}" deps) ] else [])); + features = mkFeatures (features."syn"."0.11.11" or {}); + }; + features_.syn."0.11.11" = deps: f: updateFeatures f (rec { + quote."${deps.syn."0.11.11".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "0.11.11"."parsing" = + (f.syn."0.11.11"."parsing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."printing" = + (f.syn."0.11.11"."printing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."quote" = + (f.syn."0.11.11"."quote" or false) || + (f.syn."0.11.11".printing or false) || + (syn."0.11.11"."printing" or false); } + { "0.11.11"."synom" = + (f.syn."0.11.11"."synom" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11"."unicode-xid" = + (f.syn."0.11.11"."unicode-xid" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11".default = (f.syn."0.11.11".default or true); } + ]; + synom."${deps.syn."0.11.11".synom}".default = true; + unicode_xid."${deps.syn."0.11.11".unicode_xid}".default = true; + }) [ + (features_.quote."${deps."syn"."0.11.11"."quote"}" deps) + (features_.synom."${deps."syn"."0.11.11"."synom"}" deps) + (features_.unicode_xid."${deps."syn"."0.11.11"."unicode_xid"}" deps) + ]; + + +# end +# synom-0.11.3 + + crates.synom."0.11.3" = deps: { features?(features_.synom."0.11.3" deps {}) }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + description = "Stripped-down Nom parser used by Syn"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]); + }; + features_.synom."0.11.3" = deps: f: updateFeatures f (rec { + synom."0.11.3".default = (f.synom."0.11.3".default or true); + unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]; + + +# end +# tar-0.4.13 + + crates.tar."0.4.13" = deps: { features?(features_.tar."0.4.13" deps {}) }: buildRustCrate { + crateName = "tar"; + version = "0.4.13"; + description = "A Rust implementation of a TAR file reader and writer. This library does not\ncurrently handle compression, but it is abstract over all I/O readers and\nwriters. Additionally, great lengths are taken to ensure that the entire\ncontents are never required to be entirely resident in memory all at once.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1m425d07h0i6h2vbpxnh067zmc16l9yr9bii17zxw4z2inkfyfc4"; + dependencies = mapFeatures features ([ + (crates."filetime"."${deps."tar"."0.4.13"."filetime"}" deps) + (crates."libc"."${deps."tar"."0.4.13"."libc"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.tar."0.4.13".xattr or false then [ (crates.xattr."${deps."tar"."0.4.13".xattr}" deps) ] else [])) else []); + features = mkFeatures (features."tar"."0.4.13" or {}); + }; + features_.tar."0.4.13" = deps: f: updateFeatures f (rec { + filetime."${deps.tar."0.4.13".filetime}".default = true; + libc."${deps.tar."0.4.13".libc}".default = true; + tar = fold recursiveUpdate {} [ + { "0.4.13"."xattr" = + (f.tar."0.4.13"."xattr" or false) || + (f.tar."0.4.13".default or false) || + (tar."0.4.13"."default" or false); } + { "0.4.13".default = (f.tar."0.4.13".default or true); } + ]; + xattr."${deps.tar."0.4.13".xattr}".default = true; + }) [ + (features_.filetime."${deps."tar"."0.4.13"."filetime"}" deps) + (features_.libc."${deps."tar"."0.4.13"."libc"}" deps) + (features_.xattr."${deps."tar"."0.4.13"."xattr"}" deps) + ]; + + +# end +# tempfile-3.0.5 + + crates.tempfile."3.0.5" = deps: { features?(features_.tempfile."3.0.5" deps {}) }: buildRustCrate { + crateName = "tempfile"; + version = "3.0.5"; + description = "A library for managing temporary files and directories.\n"; + authors = [ "Steven Allen <steven@stebalien.com>" "The Rust Project Developers" "Ashley Mannix <ashleymannix@live.com.au>" "Jason White <jasonaw0@gmail.com>" ]; + sha256 = "11xc89br78ypk4g27v51lm2baz57gp6v555i3sxhrj9qlas2iqfl"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."tempfile"."3.0.5"."cfg_if"}" deps) + (crates."rand"."${deps."tempfile"."3.0.5"."rand"}" deps) + (crates."remove_dir_all"."${deps."tempfile"."3.0.5"."remove_dir_all"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."tempfile"."3.0.5"."redox_syscall"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."tempfile"."3.0.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps) + ]) else []); + }; + features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true; + libc."${deps.tempfile."3.0.5".libc}".default = true; + rand."${deps.tempfile."3.0.5".rand}".default = true; + redox_syscall."${deps.tempfile."3.0.5".redox_syscall}".default = true; + remove_dir_all."${deps.tempfile."3.0.5".remove_dir_all}".default = true; + tempfile."3.0.5".default = (f.tempfile."3.0.5".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.tempfile."3.0.5".winapi}"."fileapi" = true; } + { "${deps.tempfile."3.0.5".winapi}"."handleapi" = true; } + { "${deps.tempfile."3.0.5".winapi}"."winbase" = true; } + { "${deps.tempfile."3.0.5".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."tempfile"."3.0.5"."cfg_if"}" deps) + (features_.rand."${deps."tempfile"."3.0.5"."rand"}" deps) + (features_.remove_dir_all."${deps."tempfile"."3.0.5"."remove_dir_all"}" deps) + (features_.redox_syscall."${deps."tempfile"."3.0.5"."redox_syscall"}" deps) + (features_.libc."${deps."tempfile"."3.0.5"."libc"}" deps) + (features_.winapi."${deps."tempfile"."3.0.5"."winapi"}" deps) + ]; + + +# end +# termion-1.5.1 + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + description = "A bindless library for manipulating terminals."; + authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + +# end +# textwrap-0.9.0 + + crates.textwrap."0.9.0" = deps: { features?(features_.textwrap."0.9.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + description = "Textwrap is a small library for word wrapping, indenting, and\ndedenting strings.\n\nYou can use it to format strings (such as help and error messages) for\ndisplay in commandline applications. It is designed to be efficient\nand handle Unicode characters correctly.\n"; + authors = [ "Martin Geisler <martin@geisler.net>" ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec { + textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); + unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]; + + +# end +# thread-id-2.0.0 + + crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate { + crateName = "thread-id"; + version = "2.0.0"; + description = "Get a unique thread ID"; + authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ]; + sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; + dependencies = mapFeatures features ([ + (crates."kernel32_sys"."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps) + (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) + ]); + }; + features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec { + kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; + libc."${deps.thread_id."2.0.0".libc}".default = true; + thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); + }) [ + (features_.kernel32_sys."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps) + (features_.libc."${deps."thread_id"."2.0.0"."libc"}" deps) + ]; + + +# end +# thread_local-0.2.7 + + crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.2.7"; + description = "Per-object thread-local storage"; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; + dependencies = mapFeatures features ([ + (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) + ]); + }; + features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec { + thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; + thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); + }) [ + (features_.thread_id."${deps."thread_local"."0.2.7"."thread_id"}" deps) + ]; + + +# end +# thread_local-0.3.4 + + crates.thread_local."0.3.4" = deps: { features?(features_.thread_local."0.3.4" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + description = "Per-object thread-local storage"; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.4"."lazy_static"}" deps) + (crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps) + ]); + }; + features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true; + thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true); + unreachable."${deps.thread_local."0.3.4".unreachable}".default = true; + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.4"."lazy_static"}" deps) + (features_.unreachable."${deps."thread_local"."0.3.4"."unreachable"}" deps) + ]; + + +# end +# time-0.1.38 + + crates.time."0.1.38" = deps: { features?(features_.time."0.1.38" deps {}) }: buildRustCrate { + crateName = "time"; + version = "0.1.38"; + description = "Utilities for working with time-related functions in Rust.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."time"."0.1.38"."libc"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."time"."0.1.38"."redox_syscall"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."time"."0.1.38"."kernel32_sys"}" deps) + (crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps) + ]) else []); + }; + features_.time."0.1.38" = deps: f: updateFeatures f (rec { + kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true; + libc."${deps.time."0.1.38".libc}".default = true; + redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true; + time."0.1.38".default = (f.time."0.1.38".default or true); + winapi."${deps.time."0.1.38".winapi}".default = true; + }) [ + (features_.libc."${deps."time"."0.1.38"."libc"}" deps) + (features_.redox_syscall."${deps."time"."0.1.38"."redox_syscall"}" deps) + (features_.kernel32_sys."${deps."time"."0.1.38"."kernel32_sys"}" deps) + (features_.winapi."${deps."time"."0.1.38"."winapi"}" deps) + ]; + + +# end +# tokio-0.1.7 + + crates.tokio."0.1.7" = deps: { features?(features_.tokio."0.1.7" deps {}) }: buildRustCrate { + crateName = "tokio"; + version = "0.1.7"; + description = "An event-driven, non-blocking I/O platform for writing asynchronous I/O\nbacked applications.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."tokio"."0.1.7"."futures"}" deps) + (crates."mio"."${deps."tokio"."0.1.7"."mio"}" deps) + (crates."tokio_executor"."${deps."tokio"."0.1.7"."tokio_executor"}" deps) + (crates."tokio_fs"."${deps."tokio"."0.1.7"."tokio_fs"}" deps) + (crates."tokio_io"."${deps."tokio"."0.1.7"."tokio_io"}" deps) + (crates."tokio_reactor"."${deps."tokio"."0.1.7"."tokio_reactor"}" deps) + (crates."tokio_tcp"."${deps."tokio"."0.1.7"."tokio_tcp"}" deps) + (crates."tokio_threadpool"."${deps."tokio"."0.1.7"."tokio_threadpool"}" deps) + (crates."tokio_timer"."${deps."tokio"."0.1.7"."tokio_timer"}" deps) + (crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps) + ]); + }; + features_.tokio."0.1.7" = deps: f: updateFeatures f (rec { + futures."${deps.tokio."0.1.7".futures}".default = true; + mio."${deps.tokio."0.1.7".mio}".default = true; + tokio."0.1.7".default = (f.tokio."0.1.7".default or true); + tokio_executor."${deps.tokio."0.1.7".tokio_executor}".default = true; + tokio_fs."${deps.tokio."0.1.7".tokio_fs}".default = true; + tokio_io."${deps.tokio."0.1.7".tokio_io}".default = true; + tokio_reactor."${deps.tokio."0.1.7".tokio_reactor}".default = true; + tokio_tcp."${deps.tokio."0.1.7".tokio_tcp}".default = true; + tokio_threadpool."${deps.tokio."0.1.7".tokio_threadpool}".default = true; + tokio_timer."${deps.tokio."0.1.7".tokio_timer}".default = true; + tokio_udp."${deps.tokio."0.1.7".tokio_udp}".default = true; + }) [ + (features_.futures."${deps."tokio"."0.1.7"."futures"}" deps) + (features_.mio."${deps."tokio"."0.1.7"."mio"}" deps) + (features_.tokio_executor."${deps."tokio"."0.1.7"."tokio_executor"}" deps) + (features_.tokio_fs."${deps."tokio"."0.1.7"."tokio_fs"}" deps) + (features_.tokio_io."${deps."tokio"."0.1.7"."tokio_io"}" deps) + (features_.tokio_reactor."${deps."tokio"."0.1.7"."tokio_reactor"}" deps) + (features_.tokio_tcp."${deps."tokio"."0.1.7"."tokio_tcp"}" deps) + (features_.tokio_threadpool."${deps."tokio"."0.1.7"."tokio_threadpool"}" deps) + (features_.tokio_timer."${deps."tokio"."0.1.7"."tokio_timer"}" deps) + (features_.tokio_udp."${deps."tokio"."0.1.7"."tokio_udp"}" deps) + ]; + + +# end +# tokio-codec-0.1.1 + + crates.tokio_codec."0.1.1" = deps: { features?(features_.tokio_codec."0.1.1" deps {}) }: buildRustCrate { + crateName = "tokio-codec"; + version = "0.1.1"; + description = "Utilities for encoding and decoding frames.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ]; + sha256 = "0jc9lik540zyj4chbygg1rjh37m3zax8pd4bwcrwjmi1v56qwi4h"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."tokio_codec"."0.1.1"."bytes"}" deps) + (crates."futures"."${deps."tokio_codec"."0.1.1"."futures"}" deps) + (crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) + ]); + }; + features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec { + bytes."${deps.tokio_codec."0.1.1".bytes}".default = true; + futures."${deps.tokio_codec."0.1.1".futures}".default = true; + tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true); + tokio_io."${deps.tokio_codec."0.1.1".tokio_io}".default = true; + }) [ + (features_.bytes."${deps."tokio_codec"."0.1.1"."bytes"}" deps) + (features_.futures."${deps."tokio_codec"."0.1.1"."futures"}" deps) + (features_.tokio_io."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) + ]; + + +# end +# tokio-executor-0.1.5 + + crates.tokio_executor."0.1.5" = deps: { features?(features_.tokio_executor."0.1.5" deps {}) }: buildRustCrate { + crateName = "tokio-executor"; + version = "0.1.5"; + description = "Future execution primitives\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "15j2ybs8w38gncgbxkvp2qsp6wl62ibi3rns0vlwggx7svmx4bf3"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps) + ]); + }; + features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec { + futures."${deps.tokio_executor."0.1.5".futures}".default = true; + tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true); + }) [ + (features_.futures."${deps."tokio_executor"."0.1.5"."futures"}" deps) + ]; + + +# end +# tokio-fs-0.1.4 + + crates.tokio_fs."0.1.4" = deps: { features?(features_.tokio_fs."0.1.4" deps {}) }: buildRustCrate { + crateName = "tokio-fs"; + version = "0.1.4"; + description = "Filesystem API for Tokio.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "05bpc1p1apb4jfw18i84agwwar57zn07d7smqvslpzagd9b3sd31"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."tokio_fs"."0.1.4"."futures"}" deps) + (crates."tokio_io"."${deps."tokio_fs"."0.1.4"."tokio_io"}" deps) + (crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) + ]); + }; + features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec { + futures."${deps.tokio_fs."0.1.4".futures}".default = true; + tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true); + tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true; + tokio_threadpool."${deps.tokio_fs."0.1.4".tokio_threadpool}".default = true; + }) [ + (features_.futures."${deps."tokio_fs"."0.1.4"."futures"}" deps) + (features_.tokio_io."${deps."tokio_fs"."0.1.4"."tokio_io"}" deps) + (features_.tokio_threadpool."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) + ]; + + +# end +# tokio-io-0.1.10 + + crates.tokio_io."0.1.10" = deps: { features?(features_.tokio_io."0.1.10" deps {}) }: buildRustCrate { + crateName = "tokio-io"; + version = "0.1.10"; + description = "Core I/O primitives for asynchronous I/O in Rust.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "14d65rqa5rb2msgkz2xn40cavs4m7f4qyi7vnfv98v7f10l9wlay"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."tokio_io"."0.1.10"."bytes"}" deps) + (crates."futures"."${deps."tokio_io"."0.1.10"."futures"}" deps) + (crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps) + ]); + }; + features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec { + bytes."${deps.tokio_io."0.1.10".bytes}".default = true; + futures."${deps.tokio_io."0.1.10".futures}".default = true; + log."${deps.tokio_io."0.1.10".log}".default = true; + tokio_io."0.1.10".default = (f.tokio_io."0.1.10".default or true); + }) [ + (features_.bytes."${deps."tokio_io"."0.1.10"."bytes"}" deps) + (features_.futures."${deps."tokio_io"."0.1.10"."futures"}" deps) + (features_.log."${deps."tokio_io"."0.1.10"."log"}" deps) + ]; + + +# end +# tokio-reactor-0.1.7 + + crates.tokio_reactor."0.1.7" = deps: { features?(features_.tokio_reactor."0.1.7" deps {}) }: buildRustCrate { + crateName = "tokio-reactor"; + version = "0.1.7"; + description = "Event loop that drives Tokio I/O resources.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1ssrc6gic43lachv7jk97jxzw609sgcsrkwi7chf96sn7nqrhj0z"; + dependencies = mapFeatures features ([ + (crates."crossbeam_utils"."${deps."tokio_reactor"."0.1.7"."crossbeam_utils"}" deps) + (crates."futures"."${deps."tokio_reactor"."0.1.7"."futures"}" deps) + (crates."lazy_static"."${deps."tokio_reactor"."0.1.7"."lazy_static"}" deps) + (crates."log"."${deps."tokio_reactor"."0.1.7"."log"}" deps) + (crates."mio"."${deps."tokio_reactor"."0.1.7"."mio"}" deps) + (crates."num_cpus"."${deps."tokio_reactor"."0.1.7"."num_cpus"}" deps) + (crates."parking_lot"."${deps."tokio_reactor"."0.1.7"."parking_lot"}" deps) + (crates."slab"."${deps."tokio_reactor"."0.1.7"."slab"}" deps) + (crates."tokio_executor"."${deps."tokio_reactor"."0.1.7"."tokio_executor"}" deps) + (crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) + ]); + }; + features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec { + crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true; + futures."${deps.tokio_reactor."0.1.7".futures}".default = true; + lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true; + log."${deps.tokio_reactor."0.1.7".log}".default = true; + mio."${deps.tokio_reactor."0.1.7".mio}".default = true; + num_cpus."${deps.tokio_reactor."0.1.7".num_cpus}".default = true; + parking_lot."${deps.tokio_reactor."0.1.7".parking_lot}".default = true; + slab."${deps.tokio_reactor."0.1.7".slab}".default = true; + tokio_executor."${deps.tokio_reactor."0.1.7".tokio_executor}".default = true; + tokio_io."${deps.tokio_reactor."0.1.7".tokio_io}".default = true; + tokio_reactor."0.1.7".default = (f.tokio_reactor."0.1.7".default or true); + }) [ + (features_.crossbeam_utils."${deps."tokio_reactor"."0.1.7"."crossbeam_utils"}" deps) + (features_.futures."${deps."tokio_reactor"."0.1.7"."futures"}" deps) + (features_.lazy_static."${deps."tokio_reactor"."0.1.7"."lazy_static"}" deps) + (features_.log."${deps."tokio_reactor"."0.1.7"."log"}" deps) + (features_.mio."${deps."tokio_reactor"."0.1.7"."mio"}" deps) + (features_.num_cpus."${deps."tokio_reactor"."0.1.7"."num_cpus"}" deps) + (features_.parking_lot."${deps."tokio_reactor"."0.1.7"."parking_lot"}" deps) + (features_.slab."${deps."tokio_reactor"."0.1.7"."slab"}" deps) + (features_.tokio_executor."${deps."tokio_reactor"."0.1.7"."tokio_executor"}" deps) + (features_.tokio_io."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) + ]; + + +# end +# tokio-tcp-0.1.2 + + crates.tokio_tcp."0.1.2" = deps: { features?(features_.tokio_tcp."0.1.2" deps {}) }: buildRustCrate { + crateName = "tokio-tcp"; + version = "0.1.2"; + description = "TCP bindings for tokio.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "0yvfwybqnyca24aj9as8rgydamjq0wrd9xbxxkjcasvsdmsv6z1d"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."tokio_tcp"."0.1.2"."bytes"}" deps) + (crates."futures"."${deps."tokio_tcp"."0.1.2"."futures"}" deps) + (crates."iovec"."${deps."tokio_tcp"."0.1.2"."iovec"}" deps) + (crates."mio"."${deps."tokio_tcp"."0.1.2"."mio"}" deps) + (crates."tokio_io"."${deps."tokio_tcp"."0.1.2"."tokio_io"}" deps) + (crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) + ]); + }; + features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec { + bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true; + futures."${deps.tokio_tcp."0.1.2".futures}".default = true; + iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true; + mio."${deps.tokio_tcp."0.1.2".mio}".default = true; + tokio_io."${deps.tokio_tcp."0.1.2".tokio_io}".default = true; + tokio_reactor."${deps.tokio_tcp."0.1.2".tokio_reactor}".default = true; + tokio_tcp."0.1.2".default = (f.tokio_tcp."0.1.2".default or true); + }) [ + (features_.bytes."${deps."tokio_tcp"."0.1.2"."bytes"}" deps) + (features_.futures."${deps."tokio_tcp"."0.1.2"."futures"}" deps) + (features_.iovec."${deps."tokio_tcp"."0.1.2"."iovec"}" deps) + (features_.mio."${deps."tokio_tcp"."0.1.2"."mio"}" deps) + (features_.tokio_io."${deps."tokio_tcp"."0.1.2"."tokio_io"}" deps) + (features_.tokio_reactor."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) + ]; + + +# end +# tokio-threadpool-0.1.9 + + crates.tokio_threadpool."0.1.9" = deps: { features?(features_.tokio_threadpool."0.1.9" deps {}) }: buildRustCrate { + crateName = "tokio-threadpool"; + version = "0.1.9"; + description = "A task scheduler backed by a work-stealing thread pool.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "0ipr0j79mhjjsvc0ma95sj07m0aiyq6rkwgvlalqwhinivl5d39g"; + dependencies = mapFeatures features ([ + (crates."crossbeam_deque"."${deps."tokio_threadpool"."0.1.9"."crossbeam_deque"}" deps) + (crates."crossbeam_utils"."${deps."tokio_threadpool"."0.1.9"."crossbeam_utils"}" deps) + (crates."futures"."${deps."tokio_threadpool"."0.1.9"."futures"}" deps) + (crates."log"."${deps."tokio_threadpool"."0.1.9"."log"}" deps) + (crates."num_cpus"."${deps."tokio_threadpool"."0.1.9"."num_cpus"}" deps) + (crates."rand"."${deps."tokio_threadpool"."0.1.9"."rand"}" deps) + (crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) + ]); + }; + features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true; + crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true; + futures."${deps.tokio_threadpool."0.1.9".futures}".default = true; + log."${deps.tokio_threadpool."0.1.9".log}".default = true; + num_cpus."${deps.tokio_threadpool."0.1.9".num_cpus}".default = true; + rand."${deps.tokio_threadpool."0.1.9".rand}".default = true; + tokio_executor."${deps.tokio_threadpool."0.1.9".tokio_executor}".default = true; + tokio_threadpool."0.1.9".default = (f.tokio_threadpool."0.1.9".default or true); + }) [ + (features_.crossbeam_deque."${deps."tokio_threadpool"."0.1.9"."crossbeam_deque"}" deps) + (features_.crossbeam_utils."${deps."tokio_threadpool"."0.1.9"."crossbeam_utils"}" deps) + (features_.futures."${deps."tokio_threadpool"."0.1.9"."futures"}" deps) + (features_.log."${deps."tokio_threadpool"."0.1.9"."log"}" deps) + (features_.num_cpus."${deps."tokio_threadpool"."0.1.9"."num_cpus"}" deps) + (features_.rand."${deps."tokio_threadpool"."0.1.9"."rand"}" deps) + (features_.tokio_executor."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) + ]; + + +# end +# tokio-timer-0.2.5 + + crates.tokio_timer."0.2.5" = deps: { features?(features_.tokio_timer."0.2.5" deps {}) }: buildRustCrate { + crateName = "tokio-timer"; + version = "0.2.5"; + description = "Timer facilities for Tokio\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "0jyhizvnpldkbqvqygrg0zd5zvfj9p0ywvjzf47iy632vq3qnwzm"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."tokio_timer"."0.2.5"."futures"}" deps) + (crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) + ]); + }; + features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec { + futures."${deps.tokio_timer."0.2.5".futures}".default = true; + tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true; + tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true); + }) [ + (features_.futures."${deps."tokio_timer"."0.2.5"."futures"}" deps) + (features_.tokio_executor."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) + ]; + + +# end +# tokio-udp-0.1.3 + + crates.tokio_udp."0.1.3" = deps: { features?(features_.tokio_udp."0.1.3" deps {}) }: buildRustCrate { + crateName = "tokio-udp"; + version = "0.1.3"; + description = "UDP bindings for tokio.\n"; + authors = [ "Carl Lerche <me@carllerche.com>" ]; + sha256 = "1g1x499vqvzwy7xfccr32vwymlx25zpmkx8ppqgifzqwrjnncajf"; + dependencies = mapFeatures features ([ + (crates."bytes"."${deps."tokio_udp"."0.1.3"."bytes"}" deps) + (crates."futures"."${deps."tokio_udp"."0.1.3"."futures"}" deps) + (crates."log"."${deps."tokio_udp"."0.1.3"."log"}" deps) + (crates."mio"."${deps."tokio_udp"."0.1.3"."mio"}" deps) + (crates."tokio_codec"."${deps."tokio_udp"."0.1.3"."tokio_codec"}" deps) + (crates."tokio_io"."${deps."tokio_udp"."0.1.3"."tokio_io"}" deps) + (crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) + ]); + }; + features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec { + bytes."${deps.tokio_udp."0.1.3".bytes}".default = true; + futures."${deps.tokio_udp."0.1.3".futures}".default = true; + log."${deps.tokio_udp."0.1.3".log}".default = true; + mio."${deps.tokio_udp."0.1.3".mio}".default = true; + tokio_codec."${deps.tokio_udp."0.1.3".tokio_codec}".default = true; + tokio_io."${deps.tokio_udp."0.1.3".tokio_io}".default = true; + tokio_reactor."${deps.tokio_udp."0.1.3".tokio_reactor}".default = true; + tokio_udp."0.1.3".default = (f.tokio_udp."0.1.3".default or true); + }) [ + (features_.bytes."${deps."tokio_udp"."0.1.3"."bytes"}" deps) + (features_.futures."${deps."tokio_udp"."0.1.3"."futures"}" deps) + (features_.log."${deps."tokio_udp"."0.1.3"."log"}" deps) + (features_.mio."${deps."tokio_udp"."0.1.3"."mio"}" deps) + (features_.tokio_codec."${deps."tokio_udp"."0.1.3"."tokio_codec"}" deps) + (features_.tokio_io."${deps."tokio_udp"."0.1.3"."tokio_io"}" deps) + (features_.tokio_reactor."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) + ]; + + +# end +# try-lock-0.2.2 + + crates.try_lock."0.2.2" = deps: { features?(features_.try_lock."0.2.2" deps {}) }: buildRustCrate { + crateName = "try-lock"; + version = "0.2.2"; + description = "A lightweight atomic lock."; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv"; + }; + features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec { + try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true); + }) []; + + +# end +# unicase-1.4.2 + + crates.unicase."1.4.2" = deps: { features?(features_.unicase."1.4.2" deps {}) }: buildRustCrate { + crateName = "unicase"; + version = "1.4.2"; + description = "A case-insensitive wrapper around strings."; + authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; + sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."unicase"."1.4.2"."version_check"}" deps) + ]); + features = mkFeatures (features."unicase"."1.4.2" or {}); + }; + features_.unicase."1.4.2" = deps: f: updateFeatures f (rec { + unicase = fold recursiveUpdate {} [ + { "1.4.2"."heapsize" = + (f.unicase."1.4.2"."heapsize" or false) || + (f.unicase."1.4.2".heap_size or false) || + (unicase."1.4.2"."heap_size" or false); } + { "1.4.2"."heapsize_plugin" = + (f.unicase."1.4.2"."heapsize_plugin" or false) || + (f.unicase."1.4.2".heap_size or false) || + (unicase."1.4.2"."heap_size" or false); } + { "1.4.2".default = (f.unicase."1.4.2".default or true); } + ]; + version_check."${deps.unicase."1.4.2".version_check}".default = true; + }) [ + (features_.version_check."${deps."unicase"."1.4.2"."version_check"}" deps) + ]; + + +# end +# unicase-2.1.0 + + crates.unicase."2.1.0" = deps: { features?(features_.unicase."2.1.0" deps {}) }: buildRustCrate { + crateName = "unicase"; + version = "2.1.0"; + description = "A case-insensitive wrapper around strings."; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; + build = "build.rs"; + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."unicase"."2.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."unicase"."2.1.0" or {}); + }; + features_.unicase."2.1.0" = deps: f: updateFeatures f (rec { + unicase."2.1.0".default = (f.unicase."2.1.0".default or true); + version_check."${deps.unicase."2.1.0".version_check}".default = true; + }) [ + (features_.version_check."${deps."unicase"."2.1.0"."version_check"}" deps) + ]; + + +# end +# unicode-bidi-0.3.4 + + crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + description = "Implementation of the Unicode Bidirectional Algorithm"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]); + features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); + }; + features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { + matches."${deps.unicode_bidi."0.3.4".matches}".default = true; + unicode_bidi = fold recursiveUpdate {} [ + { "0.3.4"."flame" = + (f.unicode_bidi."0.3.4"."flame" or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4"."flamer" = + (f.unicode_bidi."0.3.4"."flamer" or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4"."serde" = + (f.unicode_bidi."0.3.4"."serde" or false) || + (f.unicode_bidi."0.3.4".with_serde or false) || + (unicode_bidi."0.3.4"."with_serde" or false); } + { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } + ]; + }) [ + (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]; + + +# end +# unicode-normalization-0.1.5 + + crates.unicode_normalization."0.1.5" = deps: { features?(features_.unicode_normalization."0.1.5" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.5"; + description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; + }; + features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec { + unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true); + }) []; + + +# end +# unicode-width-0.1.4 + + crates.unicode_width."0.1.4" = deps: { features?(features_.unicode_width."0.1.4" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + features = mkFeatures (features."unicode_width"."0.1.4" or {}); + }; + features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec { + unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); + }) []; + + +# end +# unicode-xid-0.0.4 + + crates.unicode_xid."0.0.4" = deps: { features?(features_.unicode_xid."0.0.4" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n"; + authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + features = mkFeatures (features."unicode_xid"."0.0.4" or {}); + }; + features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec { + unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); + }) []; + + +# end +# unreachable-1.0.0 + + crates.unreachable."1.0.0" = deps: { features?(features_.unreachable."1.0.0" deps {}) }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + description = "An unreachable code optimization hint in stable rust."; + authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + dependencies = mapFeatures features ([ + (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) + ]); + }; + features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec { + unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); + void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); + }) [ + (features_.void."${deps."unreachable"."1.0.0"."void"}" deps) + ]; + + +# end +# url-1.6.0 + + crates.url."1.6.0" = deps: { features?(features_.url."1.6.0" deps {}) }: buildRustCrate { + crateName = "url"; + version = "1.6.0"; + description = "URL library for Rust, based on the WHATWG URL Standard"; + authors = [ "The rust-url developers" ]; + sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18"; + dependencies = mapFeatures features ([ + (crates."idna"."${deps."url"."1.6.0"."idna"}" deps) + (crates."matches"."${deps."url"."1.6.0"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.6.0"."percent_encoding"}" deps) + ]); + features = mkFeatures (features."url"."1.6.0" or {}); + }; + features_.url."1.6.0" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.6.0".idna}".default = true; + matches."${deps.url."1.6.0".matches}".default = true; + percent_encoding."${deps.url."1.6.0".percent_encoding}".default = true; + url = fold recursiveUpdate {} [ + { "1.6.0"."encoding" = + (f.url."1.6.0"."encoding" or false) || + (f.url."1.6.0".query_encoding or false) || + (url."1.6.0"."query_encoding" or false); } + { "1.6.0"."heapsize" = + (f.url."1.6.0"."heapsize" or false) || + (f.url."1.6.0".heap_size or false) || + (url."1.6.0"."heap_size" or false); } + { "1.6.0".default = (f.url."1.6.0".default or true); } + ]; + }) [ + (features_.idna."${deps."url"."1.6.0"."idna"}" deps) + (features_.matches."${deps."url"."1.6.0"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.6.0"."percent_encoding"}" deps) + ]; + + +# end +# utf8-ranges-0.1.3 + + crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "0.1.3"; + description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; + }; + features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec { + utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); + }) []; + + +# end +# uuid-0.7.1 + + crates.uuid."0.7.1" = deps: { features?(features_.uuid."0.7.1" deps {}) }: buildRustCrate { + crateName = "uuid"; + version = "0.7.1"; + description = "A library to generate and parse UUIDs."; + authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ]; + sha256 = "1wh5izr7bssf1j8y3cawj4yfr5pz4cfxgsjlk2gs1vccc848qpbj"; + dependencies = mapFeatures features ([ + ] + ++ (if features.uuid."0.7.1".rand or false then [ (crates.rand."${deps."uuid"."0.7.1".rand}" deps) ] else [])); + features = mkFeatures (features."uuid"."0.7.1" or {}); + }; + features_.uuid."0.7.1" = deps: f: updateFeatures f (rec { + rand."${deps.uuid."0.7.1".rand}".default = true; + uuid = fold recursiveUpdate {} [ + { "0.7.1"."byteorder" = + (f.uuid."0.7.1"."byteorder" or false) || + (f.uuid."0.7.1".u128 or false) || + (uuid."0.7.1"."u128" or false); } + { "0.7.1"."md5" = + (f.uuid."0.7.1"."md5" or false) || + (f.uuid."0.7.1".v3 or false) || + (uuid."0.7.1"."v3" or false); } + { "0.7.1"."nightly" = + (f.uuid."0.7.1"."nightly" or false) || + (f.uuid."0.7.1".const_fn or false) || + (uuid."0.7.1"."const_fn" or false); } + { "0.7.1"."rand" = + (f.uuid."0.7.1"."rand" or false) || + (f.uuid."0.7.1".v3 or false) || + (uuid."0.7.1"."v3" or false) || + (f.uuid."0.7.1".v4 or false) || + (uuid."0.7.1"."v4" or false) || + (f.uuid."0.7.1".v5 or false) || + (uuid."0.7.1"."v5" or false); } + { "0.7.1"."sha1" = + (f.uuid."0.7.1"."sha1" or false) || + (f.uuid."0.7.1".v5 or false) || + (uuid."0.7.1"."v5" or false); } + { "0.7.1"."std" = + (f.uuid."0.7.1"."std" or false) || + (f.uuid."0.7.1".default or false) || + (uuid."0.7.1"."default" or false); } + { "0.7.1".default = (f.uuid."0.7.1".default or true); } + ]; + }) [ + (features_.rand."${deps."uuid"."0.7.1"."rand"}" deps) + ]; + + +# end +# vcpkg-0.2.2 + + crates.vcpkg."0.2.2" = deps: { features?(features_.vcpkg."0.2.2" deps {}) }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.2"; + description = "A library to find native dependencies in a vcpkg tree at build\ntime in order to be used in Cargo build scripts.\n"; + authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; + sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + }; + features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec { + vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true); + }) []; + + +# end +# vec_map-0.8.0 + + crates.vec_map."0.8.0" = deps: { features?(features_.vec_map."0.8.0" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + description = "A simple map based on a vector for small integer keys"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.0" or {}); + }; + features_.vec_map."0.8.0" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.0"."serde" = + (f.vec_map."0.8.0"."serde" or false) || + (f.vec_map."0.8.0".eders or false) || + (vec_map."0.8.0"."eders" or false); } + { "0.8.0"."serde_derive" = + (f.vec_map."0.8.0"."serde_derive" or false) || + (f.vec_map."0.8.0".eders or false) || + (vec_map."0.8.0"."eders" or false); } + { "0.8.0".default = (f.vec_map."0.8.0".default or true); } + ]; + }) []; + + +# end +# version_check-0.1.3 + + crates.version_check."0.1.3" = deps: { features?(features_.version_check."0.1.3" deps {}) }: buildRustCrate { + crateName = "version_check"; + version = "0.1.3"; + description = "Tiny crate to check the version of the installed/running rustc."; + authors = [ "Sergio Benitez <sb@sergio.bz>" ]; + sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg"; + }; + features_.version_check."0.1.3" = deps: f: updateFeatures f (rec { + version_check."0.1.3".default = (f.version_check."0.1.3".default or true); + }) []; + + +# end +# void-1.0.2 + + crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + description = "The uninhabited void type for use in statically impossible cases."; + authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + features = mkFeatures (features."void"."1.0.2" or {}); + }; + features_.void."1.0.2" = deps: f: updateFeatures f (rec { + void = fold recursiveUpdate {} [ + { "1.0.2"."std" = + (f.void."1.0.2"."std" or false) || + (f.void."1.0.2".default or false) || + (void."1.0.2"."default" or false); } + { "1.0.2".default = (f.void."1.0.2".default or true); } + ]; + }) []; + + +# end +# want-0.0.6 + + crates.want."0.0.6" = deps: { features?(features_.want."0.0.6" deps {}) }: buildRustCrate { + crateName = "want"; + version = "0.0.6"; + description = "Detect when another Future wants a result."; + authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; + sha256 = "03cc2lndz531a4kgql1v9kppyb1yz2abcz5l52j1gg2nypmy3lh8"; + dependencies = mapFeatures features ([ + (crates."futures"."${deps."want"."0.0.6"."futures"}" deps) + (crates."log"."${deps."want"."0.0.6"."log"}" deps) + (crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps) + ]); + }; + features_.want."0.0.6" = deps: f: updateFeatures f (rec { + futures."${deps.want."0.0.6".futures}".default = true; + log."${deps.want."0.0.6".log}".default = true; + try_lock."${deps.want."0.0.6".try_lock}".default = true; + want."0.0.6".default = (f.want."0.0.6".default or true); + }) [ + (features_.futures."${deps."want"."0.0.6"."futures"}" deps) + (features_.log."${deps."want"."0.0.6"."log"}" deps) + (features_.try_lock."${deps."want"."0.0.6"."try_lock"}" deps) + ]; + + +# end +# winapi-0.2.8 + + crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + }; + features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + winapi."0.2.8".default = (f.winapi."0.2.8".default or true); + }) []; + + +# end +# winapi-0.3.6 + + crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.6"; + description = "Raw FFI bindings for all of Windows API."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.6" or {}); + }; + features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + winapi."0.3.6".default = (f.winapi."0.3.6".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + +# end +# winapi-build-0.1.1 + + crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + description = "Common code for build.rs in WinAPI -sys crates."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + }; + features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); + }) []; + + +# end +# winapi-i686-pc-windows-gnu-0.4.0 + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# end +# winapi-x86_64-pc-windows-gnu-0.4.0 + + crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# end +# ws2_32-sys-0.2.1 + + crates.ws2_32_sys."0.2.1" = deps: { features?(features_.ws2_32_sys."0.2.1" deps {}) }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + description = "Contains function definitions for the Windows API library ws2_32. See winapi for types and constants."; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."ws2_32_sys"."0.2.1"."winapi"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) + ]); + }; + features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec { + winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true; + winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true; + ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true); + }) [ + (features_.winapi."${deps."ws2_32_sys"."0.2.1"."winapi"}" deps) + (features_.winapi_build."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) + ]; + + +# end +# xattr-0.1.11 + + crates.xattr."0.1.11" = deps: { features?(features_.xattr."0.1.11" deps {}) }: buildRustCrate { + crateName = "xattr"; + version = "0.1.11"; + description = "unix extended filesystem attributes"; + authors = [ "Steven Allen <steven@stebalien.com>" ]; + sha256 = "0v8wad18pdxv7242a7xs18i9hy00ih3vwajz7my05zbxx2ss01nx"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."xattr"."0.1.11"."libc"}" deps) + ]); + features = mkFeatures (features."xattr"."0.1.11" or {}); + }; + features_.xattr."0.1.11" = deps: f: updateFeatures f (rec { + libc."${deps.xattr."0.1.11".libc}".default = true; + xattr = fold recursiveUpdate {} [ + { "0.1.11"."unsupported" = + (f.xattr."0.1.11"."unsupported" or false) || + (f.xattr."0.1.11".default or false) || + (xattr."0.1.11"."default" or false); } + { "0.1.11".default = (f.xattr."0.1.11".default or true); } + ]; + }) [ + (features_.libc."${deps."xattr"."0.1.11"."libc"}" deps) + ]; + + +# end +} diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/tools/package-management/cargo-download/default.nix index 398e007c3702..1cb53a4b6c8d 100644 --- a/pkgs/tools/package-management/cargo-download/default.nix +++ b/pkgs/tools/package-management/cargo-download/default.nix @@ -1,7 +1,10 @@ { stdenv, lib, fetchgit, darwin, buildPlatform -, buildRustCrate, defaultCrateOverrides }: +, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: -((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_download {}).override { +((import ./Cargo.nix { + inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit; + cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; }; +}).cargo_download {}).override { crateOverrides = defaultCrateOverrides // { cargo-download = attrs: { buildInputs = lib.optional stdenv.isDarwin diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index f75bf6bf1625..3299ab8b63b6 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/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4e2c8a7b3a7a..9e5a3f4d6978 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/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 6a96e5b43b50..5954ca4959b6 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl_1_1, libarchive }: +{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ zlib openssl_1_1 libarchive ]; + buildInputs = [ zlib openssl libarchive ]; patches = [ ./cert-paths.patch ]; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 6fbcffdae290..654d2dd6a7ac 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/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 3c6f52a4c7f6..1270423e9285 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; license = licenses.bsd3; + broken = true; # build failure withn openssl 1.1 }; } diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 4d9beb654ece..b96fc49886a4 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.101.2"; + version = "0.101.4"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha"; + sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b"; }; # don't install sample config files into the absolute sysconfdir folder @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = https://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom robberer qknight fpletz ]; + maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/tools/security/dnsenum/default.nix index d764e8a71ae6..3374c827d756 100644 --- a/pkgs/tools/security/dnsenum/default.nix +++ b/pkgs/tools/security/dnsenum/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/fwaeytens/dnsenum"; description = "A tool to enumerate DNS information"; - maintainers = with maintainers; [ c0bw3b globin ]; + maintainers = with maintainers; [ c0bw3b ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 06270723f4d0..2575636aeca2 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/darkoperator/dnsrecon"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b globin ]; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6b1d8e6c4f88..296080cbd8e7 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/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index abc1bacd212b..809d8e29ea35 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/mschwager/fierce"; description = "DNS reconnaissance tool for locating non-contiguous IP space"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ c0bw3b globin ]; + maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 20ad5bbc0b27..216d58192fbc 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "5.1.6"; + version = "5.2.0"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "05sjbmv2wq3nlmammrwxqc62c4sagjjgczzddr1jcqkf6kywzkl8"; + sha256 = "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn"; }; buildInputs = [ curl openssl zlib ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 18e3836c99d9..6fac3b66cbc6 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "4.1.0"; + version = "4.3.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "00mxyy4jhdbcvbwabf4yvq4h5mpnlfp2z93gy2266kz6gkd5myzk"; + sha256 = "1743d7a7ix882yxz9pk230vdvdj46sbscqv4wqyhb0la2pl9jqdp"; }; buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index afe2d457a7fe..02d8625aa762 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20190612201656.952fee6c59"; + versionSuffix = "20190813132700.6f497ec371"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "4.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "4.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "0jwxw75yz7sbvfqw2aksa3p7jlcv817743fl59qk6rq1x9ag6qpx"; + sha256 = "1mbbfy1aijqr8209jjja6dm2nzw721qqw94839df047rcwnd38pg"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 350d0e66dc7d..e7c09e0b2d5e 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.3"; name = "kpcli-${version}"; src = fetchurl { url = "mirror://sourceforge/kpcli/${name}.pl"; - sha256 = "11z6zbnsmqgjw73ai4nrq4idr83flrib22d8fqh1637d36p1nnk1"; + sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix new file mode 100644 index 000000000000..afcdf0c0a07a --- /dev/null +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -0,0 +1,38 @@ +{ stdenv, python3, fetchFromGitHub }: + +let + inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; +in +buildPythonApplication rec { + pname = "lesspass-cli"; + version = "9.0.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk"; + }; + sourceRoot = "source/cli"; + + # some tests are designed to run against code in the source directory - adapt to run against + # *installed* code + postPatch = '' + for f in tests/test_functional.py tests/test_interaction.py ; do + substituteInPlace $f --replace "lesspass/core.py" "-m lesspass.core" + done + ''; + + checkInputs = [ pytest mock pexpect ]; + checkPhase = '' + mv lesspass lesspass.hidden # ensure we're testing against *installed* package + pytest tests + ''; + + meta = with stdenv.lib; { + description = "Stateless password manager"; + homepage = https://lesspass.com; + maintainers = with maintainers; [ jasoncarr ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 3bc5758aad44..1b66dab35c8f 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -20,22 +20,22 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.70"; + version = "7.80"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; + sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; }; patches = [ ./zenmap.patch ] ++ optionals stdenv.cc.isClang [( # Fixes a compile error due an ambiguous reference to bind(2) in # nping/EchoServer.cc, which is otherwise resolved to std::bind. - # Also fixes a missing include. # https://github.com/nmap/nmap/pull/1363 fetchpatch { url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff"; - sha256 = "088r8ylpc9hachsxs4r17cqfa1ncyspbjvkc573lill7rk1r9m0s"; + includes = [ "nping/EchoServer.cc" ]; + sha256 = "0xcph9mycy57yryjg253frxyz87c4135rrbndlqw1400c8jxq70c"; } )]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 8ddbd60a38d1..94f517d2e92d 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -120,7 +120,7 @@ let description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = https://www.passwordstore.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 6d35c4aa8375..c951a5e37ef6 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pass-otp-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tadfisher"; repo = "pass-otp"; rev = "v${version}"; - sha256 = "0m8x5dqwcr9jim530685nsq4zn941hhl7ridmmd63b204z141rwa"; + sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v"; }; buildInputs = [ oathToolkit ]; @@ -19,13 +19,15 @@ stdenv.mkDerivation rec { sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash ''; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" + "BASHCOMPDIR=$(out)/share/bash-completion/completions" + ]; meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; homepage = https://github.com/tadfisher/pass-otp; license = licenses.gpl3; - maintainers = with maintainers; [ jwiegley tadfisher ]; + maintainers = with maintainers; [ jwiegley tadfisher toonn ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sequoia-tool/default.nix b/pkgs/tools/security/sequoia-tool/default.nix deleted file mode 100644 index 00472c1a3aa4..000000000000 --- 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 000000000000..5d9ffca69375 --- /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/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index b3b71a16eb88..249ff435c5fc 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.0.5"; + version = "0.4.1.5"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0vk9j3ybz5dwwbmqrdj1bjcsxy76pc8frmfvflkdzwfkvkqcp8mm"; + sha256 = "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 7d0ff797336d..e7a82f6089e7 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w"; }; + patches = [ + ./openssl-1.1.patch + ./signed-ptr.patch + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ gawk trousers cryptsetup openssl ]; diff --git a/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/pkgs/tools/security/tpm-luks/openssl-1.1.patch new file mode 100644 index 000000000000..10132242b345 --- /dev/null +++ b/pkgs/tools/security/tpm-luks/openssl-1.1.patch @@ -0,0 +1,63 @@ +diff --git a/swtpm-utils/lib/hmac.c b/swtpm-utils/lib/hmac.c +index 5545375..f9bedea 100644 +--- a/swtpm-utils/lib/hmac.c ++++ b/swtpm-utils/lib/hmac.c +@@ -381,15 +381,19 @@ uint32_t TSS_authhmac(unsigned char *digest, unsigned char *key, unsigned int ke + /****************************************************************************/ + uint32_t TSS_rawhmac(unsigned char *digest, const unsigned char *key, unsigned int keylen, ...) + { +- HMAC_CTX hmac; ++ HMAC_CTX* hmac; + unsigned int dlen; + unsigned char *data; + va_list argp; +- +-#ifdef HAVE_HMAC_CTX_CLEANUP +- HMAC_CTX_init(&hmac); +-#endif +- HMAC_Init(&hmac,key,keylen,EVP_sha1()); ++ ++ hmac = HMAC_CTX_new(); ++ ++ if (hmac == NULL) ++ { ++ return ERR_MEM_ERR; ++ } ++ ++ HMAC_Init_ex(hmac,key,keylen,EVP_sha1(),NULL); + + va_start(argp,keylen); + for (;;) +@@ -398,15 +402,11 @@ uint32_t TSS_rawhmac(unsigned char *digest, const unsigned char *key, unsigned i + if (dlen == 0) break; + data = (unsigned char *)va_arg(argp,unsigned char *); + if (data == NULL) return ERR_NULL_ARG; +- HMAC_Update(&hmac,data,dlen); ++ HMAC_Update(hmac,data,dlen); + } +- HMAC_Final(&hmac,digest,&dlen); ++ HMAC_Final(hmac,digest,&dlen); + +-#ifdef HAVE_HMAC_CTX_CLEANUP +- HMAC_CTX_cleanup(&hmac); +-#else +- HMAC_cleanup(&hmac); +-#endif ++ HMAC_CTX_free(hmac); + va_end(argp); + return 0; + } +diff --git a/swtpm-utils/lib/keys.c b/swtpm-utils/lib/keys.c +index 99691b6..6627a1f 100644 +--- a/swtpm-utils/lib/keys.c ++++ b/swtpm-utils/lib/keys.c +@@ -1249,8 +1249,7 @@ RSA *TSS_convpubkey(pubkeydata *k) + exp); + } + /* set up the RSA public key structure */ +- rsa->n = mod; +- rsa->e = exp; ++ RSA_set0_key(rsa, mod, exp, NULL); + return rsa; + } + diff --git a/pkgs/tools/security/tpm-luks/signed-ptr.patch b/pkgs/tools/security/tpm-luks/signed-ptr.patch new file mode 100644 index 000000000000..83e356a4ef9e --- /dev/null +++ b/pkgs/tools/security/tpm-luks/signed-ptr.patch @@ -0,0 +1,15 @@ +diff --git a/swtpm-utils/getcapability.c b/swtpm-utils/getcapability.c +index 7359ba3..17b4324 100644 +--- a/swtpm-utils/getcapability.c ++++ b/swtpm-utils/getcapability.c +@@ -480,7 +480,8 @@ int main(int argc, char *argv[]) + } + + if (c) { +- char pcrmap[4], *pf; ++ char pcrmap[4]; ++ unsigned char *pf; + + memcpy(pcrmap, ndp.pcrInfoRead.pcrSelection.pcrSelect, + ndp.pcrInfoRead.pcrSelection.sizeOfSelect); + diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 1944cf236e1e..5a2dc6652ddc 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { sourceRoot = "."; + patches = [ + (fetchurl { + url = https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch; + sha256 = "161yysw4wgy3spsz6p1d0ib0h5pnrqm8bdh1l71c4hz6a6wpcyxj"; + }) + ]; + nativeBuildInputs = [ perl ]; buildInputs = [ trousers openssl opencryptoki ]; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 95fa1047fe54..94da72c54b34 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20190703"; + version = "20190816"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "031m124a109vv6fx667h4ca2iav0xszrlvif9zcfxcaxbjsn6991"; + sha256 = "0p7ws106hf8bir9yb1a5m6v3wmvqagxmk3l9rpp4i89vib44vv3s"; }; NIX_CFLAGS_COMPILE = "-O3"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ]; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "ACPICA Tools"; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index e77d44875820..5c9b0292e5c0 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/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 079494bb5990..b8cd85c0abca 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.4"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1sg12ycig2g5yv9l3vx25wsjmz7ybnrsvji0vs51yjmclwsygm5a"; + sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c869c4b11a5c..ee9554cc09f9 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/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index b553206f13ab..7966deeccc2e 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.3"; + version = "3.1.4"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0mxydn6pwdhky659rz6k1jlh95hy43pmz4nx53kligjwy2v060xq"; + sha256 = "0rca9bjn46i3xzah53l1r5bv1493773chj8x11by2asxyl9wlf4r"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 0ab8d226f3a0..38fe1e6347f9 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "List files recursively"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.globin ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 4d5de56fbf0d..131ba53f5847 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; homepage = http://smarden.org/runit; - maintainers = with maintainers; [ rickynils joachifm ]; + maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 5d5d3b1939db..ab7fdf7c4bf8 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.00"; + version = "0.10.01"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0x602d9alilxxx2v59ryyg6s81l9nf8bxyavk5wf8jd5mshx57fh"; + sha256 = "0gcgm96prkzysszgq34cpx30y0bx9b5zll7943zwg3941fkg4x2a"; }; # All platforms inputs then Linux-only ones diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index a57cafb54e25..1f444ca5cd81 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/balabit/syslog-ng-incubator; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; broken = true; # 2018-05-12 }; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index dcc9942a0611..6998ed36ee52 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = https://www.balabit.com/network-security/syslog-ng/; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 2219d623a039..4c4ad91e7279 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; license = licenses.bsd2; - maintainers = with maintainers; [ fadenb fpletz globin ]; + maintainers = with maintainers; [ fadenb fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 818c76712c7e..2a98a2f889e8 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1g1l7k8yxj8bl1ysdx8v6anv1s7xk9j072y44gwki70dy48n7j92"; + sha256 = "1ajhivl9jifcf12nbk281yayk7666v65m249aclyli0bz1kh8cfs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix new file mode 100644 index 000000000000..514f3f675399 --- /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/default.nix b/pkgs/tools/text/ripgrep/default.nix index 4fa90441bdbe..4b1275d041f4 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = https://github.com/BurntSushi/ripgrep; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = [ maintainers.tailhook ]; + maintainers = with maintainers; [ tailhook globin ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 3e436b80be8a..b73015dd19f3 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,10 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "vale-${version}"; - version = "1.4.3"; - - goPackagePath = "github.com/errata-ai/vale"; +buildGoModule rec { + pname = "vale"; + version = "1.7.1"; subPackages = [ "." ]; @@ -12,9 +10,11 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1dgh2frf577048cacwnrl0xx5hha055z42sqq38lf07ybwyxdxms"; + sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m"; }; + modSha256 = "0av728w22rrlw2030d09q5dz9ks58p3n4g1hx4xcs0gi33sdsdb8"; + meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 3f9ba73e13d9..6d26129f2c12 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, texlive }: +{ stdenv, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); @@ -21,6 +21,11 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/biber + ''; meta = with stdenv.lib; { description = "Backend for BibLaTeX"; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index f2a48e5db049..3145d580dc62 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "0a2rxn0pihknvyvfvzib42v9c7zfdg8pi95q40fywwjb9clz59c9"; + sha256 = "0y9p03dzdaszx02jbkdf3vcs52fqml591cmic5jdch5yznrg03ky"; }; postPatch = '' diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5aab4c80d275..57347a120214 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -5,7 +5,7 @@ , perl, perlPackages, pkgconfig, autoreconfHook , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , cairo, pixman, xorg, clisp, biber -, makeWrapper +, makeWrapper, shortenPerlShebang }: # Useful resource covering build options: @@ -292,6 +292,7 @@ latexindent = perlPackages.buildPerlPackage rec { outputs = [ "out" ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' @@ -308,6 +309,8 @@ latexindent = perlPackages.buildPerlPackage rec { install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang "$out"/bin/latexindent ''; }; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 23aca98ec81c..a3b58e7274de 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 1435fd2bde0e..e8e6a76a7a26 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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7283c2ce534f..1a4169605a64 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,6 +111,7 @@ mapAliases ({ gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 + gnome-mpv = celluloid; # added 2019-08-22 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 @@ -145,10 +146,14 @@ 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 + icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 + icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 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 +235,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 @@ -277,6 +283,7 @@ mapAliases ({ postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; + processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 @@ -327,6 +334,7 @@ mapAliases ({ spice_protocol = spice-protocol; # added 2018-02-25 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4096f24b5f2..b345fc297462 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -149,10 +149,16 @@ in buildMaven = callPackage ../build-support/build-maven.nix {}; + castget = callPackage ../applications/networking/feedreaders/castget { }; + castxml = callPackage ../development/tools/castxml { }; + clj-kondo = callPackage ../development/tools/clj-kondo { }; + cmark = callPackage ../development/libraries/cmark { }; + cm256cc = callPackage ../development/libraries/cm256cc { }; + conftest = callPackage ../development/tools/conftest {}; corgi = callPackage ../development/tools/corgi { }; @@ -169,6 +175,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 +283,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 +302,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 +319,7 @@ in c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; - }; + }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -375,6 +390,10 @@ in setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; + shortenPerlShebang = makeSetupHook + { deps = [ dieHook ]; } + ../build-support/setup-hooks/shorten-perl-shebang.sh; + singularity-tools = callPackage ../build-support/singularity-tools { }; srcOnly = args: callPackage ../build-support/src-only args; @@ -435,6 +454,8 @@ in _0x0 = callPackage ../tools/misc/0x0 { }; + _3llo = callPackage ../tools/misc/3llo { }; + _1password = callPackage ../applications/misc/1password { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -555,6 +576,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; }; @@ -747,6 +770,8 @@ in chkcrontab = callPackage ../tools/admin/chkcrontab { }; + claws = callPackage ../tools/misc/claws { }; + codespell = with python3Packages; toPythonApplication codespell; cozy = callPackage ../applications/audio/cozy-audiobooks { }; @@ -755,6 +780,8 @@ in crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -803,6 +830,8 @@ 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 { }; @@ -837,6 +866,8 @@ in lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + pacparser = callPackage ../tools/networking/pacparser { }; pass = callPackage ../tools/security/pass { }; @@ -1164,7 +1195,9 @@ in brltty = callPackage ../tools/misc/brltty { }; - bro = callPackage ../applications/networking/ids/bro { }; + bro = callPackage ../applications/networking/ids/bro { + openssl = openssl_1_0_2; + }; brook = callPackage ../tools/networking/brook { }; @@ -1581,6 +1614,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firestarter = callPackage ../applications/misc/firestarter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1671,6 +1706,10 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + + gthree = callPackage ../development/libraries/gthree { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1685,6 +1724,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 { }; @@ -1749,7 +1790,7 @@ in massren = callPackage ../tools/misc/massren { }; - megasync = callPackage ../applications/misc/megasync { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; meritous = callPackage ../games/meritous { }; @@ -1767,6 +1808,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 { @@ -1807,6 +1850,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2079,7 +2124,9 @@ in cabextract = callPackage ../tools/archivers/cabextract { }; - cadaver = callPackage ../tools/networking/cadaver { }; + cadaver = callPackage ../tools/networking/cadaver { + openssl = openssl_1_0_2; + }; davix = callPackage ../tools/networking/davix { }; @@ -2452,6 +2499,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 { }; @@ -2601,7 +2650,9 @@ in dmd = callPackage ../development/compilers/dmd { }; - dmg2img = callPackage ../tools/misc/dmg2img { }; + dmg2img = callPackage ../tools/misc/dmg2img { + openssl = openssl_1_0_2; + }; docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; @@ -2624,7 +2675,7 @@ in dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; - dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -2741,6 +2792,10 @@ in tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; + tracker = callPackage ../development/libraries/tracker { }; + + tracker-miners = callPackage ../development/libraries/tracker-miners { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -2753,6 +2808,8 @@ in wallutils = callPackage ../tools/graphics/wallutils { }; + wev = callPackage ../tools/misc/wev { }; + wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; z-lua = callPackage ../tools/misc/z-lua { }; @@ -2888,7 +2945,9 @@ in ethtool = callPackage ../tools/misc/ethtool { }; - ettercap = callPackage ../applications/networking/sniffers/ettercap { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { + openssl = openssl_1_0_2; + }; euca2ools = callPackage ../tools/virtualization/euca2ools { }; @@ -3027,6 +3086,8 @@ in stdenv = gccStdenv; }; + flux = callPackage ../development/compilers/flux { }; + fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; @@ -3262,6 +3323,8 @@ in gdmap = callPackage ../tools/system/gdmap { }; + gelasio = callPackage ../data/fonts/gelasio { }; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -3365,6 +3428,10 @@ in gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { + gegl = gnome3.gegl_0_4; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -3438,12 +3505,16 @@ in google-fonts = callPackage ../data/fonts/google-fonts { }; + google-clasp = callPackage ../development/misc/google-clasp { }; + google-compute-engine = python2.pkgs.google-compute-engine; google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; 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 { }; @@ -3584,7 +3655,9 @@ in gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; - gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gtmess = callPackage ../applications/networking/instant-messengers/gtmess { + openssl = openssl_1_0_2; + }; gup = callPackage ../development/tools/build-managers/gup {}; @@ -3598,7 +3671,9 @@ in gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; - gvpe = callPackage ../tools/networking/gvpe { }; + gvpe = callPackage ../tools/networking/gvpe { + openssl = openssl_1_0_2; + }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -3830,6 +3905,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; @@ -3862,7 +3938,9 @@ in packages = config.ihaskell.packages or (self: []); }; - imapproxy = callPackage ../tools/networking/imapproxy { }; + imapproxy = callPackage ../tools/networking/imapproxy { + openssl = openssl_1_0_2; + }; imapsync = callPackage ../tools/networking/imapsync { }; @@ -3878,8 +3956,6 @@ in inetutils = callPackage ../tools/networking/inetutils { }; - infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; - inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -3928,7 +4004,9 @@ in buildGoPackage = buildGo110Package; }; - ipmitool = callPackage ../tools/system/ipmitool { }; + ipmitool = callPackage ../tools/system/ipmitool { + openssl = openssl_1_0_2; + }; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -3958,6 +4036,8 @@ in isync = callPackage ../tools/networking/isync { }; + ix = callPackage ../tools/misc/ix { }; + jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { }; @@ -4342,26 +4422,18 @@ in nodejs-slim = nodejs-slim-10_x; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1; - }; + + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; - openssl = openssl_1_1; - }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { - openssl = openssl_1_1; }; + nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { enableNpm = false; - openssl = openssl_1_1; - }; - nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { - openssl = openssl_1_1; }; + nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; - openssl = openssl_1_1; }; # Update this when adding the newest nodejs major version! @@ -4400,9 +4472,7 @@ in ldapvi = callPackage ../tools/misc/ldapvi { }; - ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1; - }; + ldns = callPackage ../development/libraries/ldns { }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -4456,6 +4526,8 @@ in libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; + libspf2 = callPackage ../development/libraries/libspf2 { }; + libsrs2 = callPackage ../development/libraries/libsrs2 { }; libtermkey = callPackage ../development/libraries/libtermkey { }; @@ -4476,7 +4548,7 @@ in libmongo-client = callPackage ../development/libraries/libmongo-client { }; - libmesode = callPackage ../development/libraries/libmesode { }; + libmesode = callPackage ../development/libraries/libmesode {}; libnabo = callPackage ../development/libraries/libnabo { }; @@ -5088,6 +5160,8 @@ in offlineimap = callPackage ../tools/networking/offlineimap { }; + ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { }; @@ -5152,7 +5226,12 @@ in pam = if stdenv.isLinux then pam else null; }; - openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { + hpnSupport = true; + # the hpn patchset does not yet support openssl>1.0.2 + # https://github.com/rapier1/openssh-portable/issues/14 + openssl = openssl_1_0_2; + }); openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { withGssapiPatches = true; @@ -5164,7 +5243,7 @@ in opentsdb = callPackage ../tools/misc/opentsdb {}; - openvpn = callPackage ../tools/networking/openvpn { }; + openvpn = callPackage ../tools/networking/openvpn {}; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -5172,6 +5251,8 @@ in stdenv = clangStdenv; }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; + oppai-ng = callPackage ../tools/misc/oppai-ng { }; update-dotdee = with python3Packages; toPythonApplication update-dotdee; @@ -5182,7 +5263,9 @@ in opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { + openssl = openssl_1_0_2; + }; optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; @@ -5200,6 +5283,8 @@ in ossec = callPackage ../tools/security/ossec {}; + osslsigncode = callPackage ../development/tools/osslsigncode {}; + ostree = callPackage ../tools/misc/ostree { }; otfcc = callPackage ../tools/misc/otfcc { }; @@ -5226,7 +5311,7 @@ in pacman = callPackage ../tools/package-management/pacman { }; - padthv1 = callPackage ../applications/audio/padthv1 { }; + padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; pagmo2 = callPackage ../development/libraries/pagmo2 { }; @@ -5287,7 +5372,10 @@ in pngout = callPackage ../tools/graphics/pngout { }; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; }; + ipsecTools = callPackage ../os-specific/linux/ipsec-tools { + flex = flex_2_5_35; + openssl = openssl_1_0_2; + }; patch = gnupatch; @@ -5348,7 +5436,9 @@ in libusb = libusb1; }; - bully = callPackage ../tools/networking/bully { }; + bully = callPackage ../tools/networking/bully { + openssl = openssl_1_0_2; + }; pcapc = callPackage ../tools/networking/pcapc { }; @@ -5499,6 +5589,8 @@ in pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -5519,7 +5611,9 @@ in proxychains = callPackage ../tools/networking/proxychains { }; - proxytunnel = callPackage ../tools/misc/proxytunnel { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { + openssl = openssl_1_0_2; + }; pws = callPackage ../tools/misc/pws { }; @@ -5611,7 +5705,6 @@ in qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { }; qgrep = callPackage ../tools/text/qgrep {}; @@ -5695,7 +5788,9 @@ in rt = callPackage ../servers/rt { }; - rtmpdump = callPackage ../tools/video/rtmpdump { }; + rtmpdump = callPackage ../tools/video/rtmpdump { + openssl = openssl_1_0_2; + }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -5889,6 +5984,10 @@ in scdoc = callPackage ../tools/typesetting/scdoc { }; + scream-receivers = callPackage ../misc/scream-receivers { + pulseSupport = config.pulseaudio or false; + }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -5945,7 +6044,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 { }; @@ -5975,7 +6076,9 @@ in shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { }; + shellinabox = callPackage ../servers/shellinabox { + openssl = openssl_1_0_2; + }; shrikhand = callPackage ../data/fonts/shrikhand { }; @@ -6106,6 +6209,8 @@ in stdman = callPackage ../data/documentation/stdman { }; + stm32loader = with python3Packages; toPythonApplication stm32loader; + storebrowse = callPackage ../tools/system/storebrowse { }; stubby = callPackage ../tools/networking/stubby { }; @@ -6134,6 +6239,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 @@ -6163,6 +6270,8 @@ in sunxi-tools = callPackage ../development/tools/sunxi-tools { }; + sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; + super = callPackage ../tools/security/super { }; supertux-editor = callPackage ../applications/editors/supertux-editor { }; @@ -6173,6 +6282,8 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { }; + ssdeep = callPackage ../tools/security/ssdeep { }; ssh-ident = callPackage ../tools/networking/ssh-ident { }; @@ -6296,7 +6407,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt56.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -6362,12 +6473,14 @@ in tilix = callPackage ../applications/misc/tilix { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -6403,7 +6516,6 @@ in toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; tor = callPackage ../tools/security/tor { - openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -6473,7 +6585,9 @@ in trilium = callPackage ../applications/office/trilium { }; - trousers = callPackage ../tools/security/trousers { }; + trousers = callPackage ../tools/security/trousers { + openssl = openssl_1_0_2; + }; trx = callPackage ../tools/audio/trx { }; @@ -6586,9 +6700,11 @@ in vbetool = callPackage ../tools/system/vbetool { }; - vde2 = callPackage ../tools/networking/vde2 { }; + vde2 = callPackage ../tools/networking/vde2 { + openssl = openssl_1_0_2; + }; - vboot_reference = callPackage ../tools/system/vboot_reference { }; + vboot_reference = callPackage ../tools/system/vboot_reference {}; vcftools = callPackage ../applications/science/biology/vcftools { }; @@ -6602,8 +6718,6 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; - vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; @@ -6674,7 +6788,9 @@ in inherit (python27Packages) ldap; }; - vtun = callPackage ../tools/networking/vtun { }; + vtun = callPackage ../tools/networking/vtun { + openssl = openssl_1_0_2; + }; waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { }; @@ -6793,7 +6909,7 @@ in uemacs = callPackage ../applications/editors/uemacs { }; - uftp = callPackage ../servers/uftp { }; + uftp = callPackage ../servers/uftp {}; uhttpmock = callPackage ../development/libraries/uhttpmock { }; @@ -6928,7 +7044,7 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -7227,6 +7343,10 @@ in adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web { + jdk = jdk8; + }; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -7332,6 +7452,7 @@ in crystal_0_26 crystal_0_27 crystal_0_29 + crystal_0_30 crystal; icr = callPackage ../development/tools/icr {}; @@ -7714,7 +7835,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; }; + fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; fstar = callPackage ../development/compilers/fstar { }; @@ -7782,12 +7903,6 @@ in gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea8_web = callPackage ../development/compilers/icedtea-web { - jdk = jdk8; - }; - - icedtea_web = icedtea8_web; - idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; }); @@ -7896,6 +8011,8 @@ in inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; + graalvm8-ee = callPackage ../development/compilers/graalvm/enterprise-edition.nix { }; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -8105,8 +8222,15 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; + mono6 = callPackage ../development/compilers/mono/6.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; + msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; + mosml = callPackage ../development/compilers/mosml { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -8117,11 +8241,7 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { - # QT 5.12 has a weird regression involving the floorplanning window having - # a 'blank' or 'transparent' background, so fall back to 5.11 for now. - qtbase = qt511.qtbase; - }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; nasm = callPackage ../development/compilers/nasm { }; @@ -8238,10 +8358,8 @@ in pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; - rls = callPackage ../development/tools/rust/rls { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - rustfmt = callPackage ../development/tools/rust/rustfmt { }; + inherit (rustPackages) rls; + rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8254,6 +8372,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 {}; @@ -8270,6 +8390,8 @@ in gputils = null; }; + serialdv = callPackage ../development/libraries/serialdv { }; + serpent = callPackage ../development/compilers/serpent { }; shmig = callPackage ../development/tools/database/shmig { }; @@ -8695,7 +8817,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. @@ -8714,7 +8836,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 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -8847,6 +8969,8 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + wasm = ocamlPackages.wasm; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -9008,6 +9132,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 { }; @@ -9095,11 +9221,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 { }; @@ -9391,6 +9513,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; }; @@ -9443,10 +9567,16 @@ in gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; + gnome-hexgl = callPackage ../games/gnome-hexgl {}; + gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; + + gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; @@ -9695,7 +9825,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 { }; @@ -9756,7 +9888,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 { }; @@ -9903,6 +10035,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 { }; @@ -9961,6 +10095,8 @@ in travis = callPackage ../development/tools/misc/travis { }; + tree-sitter = callPackage ../development/tools/parsing/tree-sitter { }; + trellis = callPackage ../development/tools/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -10068,8 +10204,6 @@ in a52dec = callPackage ../development/libraries/a52dec { }; - aacskeys = callPackage ../development/libraries/aacskeys { }; - aalib = callPackage ../development/libraries/aalib { }; abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; @@ -10230,7 +10364,7 @@ in boost_process = callPackage ../development/libraries/boost-process { }; - botan = callPackage ../development/libraries/botan { }; + botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; }; botan2 = callPackage ../development/libraries/botan/2.0.nix { }; box2d = callPackage ../development/libraries/box2d { }; @@ -10247,7 +10381,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 { }; @@ -10358,7 +10492,9 @@ in cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; - cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { + openssl = openssl_1_0_2; + }; uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -10692,10 +10828,6 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = res.gtk2; - }; - gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { gtk = res.gtk2; }; @@ -10748,6 +10880,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 { @@ -10890,6 +11024,10 @@ in grib-api = callPackage ../development/libraries/grib-api { }; + grilo = callPackage ../development/libraries/grilo { }; + + grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; + grpc = callPackage ../development/libraries/grpc { }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; @@ -11702,6 +11840,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; + libgtop = callPackage ../development/libraries/libgtop {}; libLAS = callPackage ../development/libraries/libLAS { }; @@ -11820,6 +11960,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + libirecovery = callPackage ../development/libraries/libirecovery { }; + libivykis = callPackage ../development/libraries/libivykis { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -11878,10 +12020,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 {}; @@ -11980,7 +12118,9 @@ in libksba = callPackage ../development/libraries/libksba { }; - libksi = callPackage ../development/libraries/libksi { }; + libksi = callPackage ../development/libraries/libksi { + openssl = openssl_1_0_2; + }; liblinear = callPackage ../development/libraries/liblinear { }; @@ -12028,6 +12168,8 @@ in libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodule = callPackage ../development/libraries/libmodule { }; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmp3splt = callPackage ../development/libraries/libmp3splt { }; @@ -12300,6 +12442,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 { }; @@ -12442,8 +12587,6 @@ in luabind_luajit = luabind.override { lua = luajit; }; - luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; }; - lzo = callPackage ../development/libraries/lzo { }; mapnik = callPackage ../development/libraries/mapnik { }; @@ -12564,13 +12707,17 @@ in muparser = callPackage ../development/libraries/muparser { }; + mutest = callPackage ../development/libraries/mutest { }; + mygpoclient = pythonPackages.mygpoclient; mygui = callPackage ../development/libraries/mygui { ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { }; + mysocketw = callPackage ../development/libraries/mysocketw { + openssl = openssl_1_0_2; + }; mythes = callPackage ../development/libraries/mythes { }; @@ -12599,7 +12746,9 @@ in neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { + openssl = openssl_1_0_2; + }; nettle = callPackage ../development/libraries/nettle { }; @@ -12754,7 +12903,8 @@ in inherit (callPackages ../development/libraries/libressl { }) libressl_2_8 - libressl_2_9; + libressl_2_9 + libressl_3_0; libressl = libressl_2_9; @@ -12762,7 +12912,7 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_0_2; + openssl = openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 @@ -12971,20 +13121,6 @@ in developerBuild = true; }); - qt56 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.6) { - inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); - - libsForQt56 = lib.makeScope qt56.newScope mkLibsForQt5; - qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; @@ -13099,6 +13235,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 { }; @@ -13246,8 +13386,6 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; - patchwork = callPackage ../applications/networking/ssb/patchwork { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -13615,7 +13753,9 @@ in tcllib = callPackage ../development/libraries/tcllib { }; - tcltls = callPackage ../development/libraries/tcltls { }; + tcltls = callPackage ../development/libraries/tcltls { + openssl = openssl_1_0_2; + }; tclx = callPackage ../development/libraries/tclx { }; @@ -13655,6 +13795,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; @@ -13736,6 +13880,7 @@ in ucommon_openssl = callPackage ../development/libraries/ucommon { gnutls = null; + openssl = openssl_1_0_2; }; ucommon_gnutls = lowPrio (ucommon.override { @@ -14323,7 +14468,9 @@ in mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + mod_wsgi = self.mod_wsgi2; + mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; }; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; }; php = pkgs.php.override { inherit apacheHttpd; }; @@ -14410,7 +14557,7 @@ in dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { - libmaa = callPackage ../servers/dict/libmaa.nix {}; + libmaa = callPackage ../servers/dict/libmaa.nix {}; }; dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {}); @@ -14437,6 +14584,7 @@ in prosody = callPackage ../servers/xmpp/prosody { # _compat can probably be removed on next minor version after 0.10.0 lua5 = lua5_2_compat; + withExtraLibs = [ luaPackages.luadbi-sqlite3 ]; inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi; }; @@ -14472,7 +14620,6 @@ in freeradius = callPackage ../servers/freeradius { }; freeswitch = callPackage ../servers/sip/freeswitch { - openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -14542,8 +14689,6 @@ in labelImg = callPackage ../applications/science/machine-learning/labelimg { }; - mailman = callPackage ../servers/mail/mailman { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; mattermost = callPackage ../servers/mattermost { }; @@ -14584,6 +14729,8 @@ in mlmmj = callPackage ../servers/mail/mlmmj { }; + moodle = callPackage ../servers/web-apps/moodle { }; + morty = callPackage ../servers/web-apps/morty { }; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; @@ -14609,14 +14756,12 @@ in # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; @@ -14650,6 +14795,8 @@ in openxpki = callPackage ../servers/openxpki { }; + openxr-loader = callPackage ../development/libraries/openxr-loader { }; + osrm-backend = callPackage ../servers/osrm-backend { }; p910nd = callPackage ../servers/p910nd { }; @@ -14662,8 +14809,6 @@ in postsrsd = callPackage ../servers/mail/postsrsd { }; - rmilter = callPackage ../servers/mail/rmilter { }; - rspamd = callPackage ../servers/mail/rspamd { }; pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { @@ -14730,6 +14875,7 @@ in mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; boost = boost160; + openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14760,6 +14906,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 { }; @@ -14798,15 +14950,15 @@ in oracleXE = callPackage ../servers/sql/oracle-xe { }; - softether_4_25 = callPackage ../servers/softether/4.25.nix { }; + softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; }; softether_4_29 = callPackage ../servers/softether/4.29.nix { }; softether = softether_4_29; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; - OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; - OVMF-CSM = OVMF.override { openssl = null; }; - #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; }; + OVMF = callPackage ../applications/virtualization/OVMF { }; + OVMF-CSM = OVMF.override { csmSupport = true; }; + OVMF-secureBoot = OVMF.override { secureBoot = true; }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -14842,6 +14994,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 { }; @@ -14862,6 +15015,7 @@ in prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; + prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; @@ -14990,6 +15144,8 @@ in sambaFull = samba4Full; + sampler = callPackage ../applications/misc/sampler { }; + shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; shairport-sync = callPackage ../servers/shairport-sync { }; @@ -15033,7 +15189,6 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; squid = callPackage ../servers/squid { }; - squid4 = callPackage ../servers/squid/4.nix { }; sslh = callPackage ../servers/sslh { }; @@ -15087,9 +15242,13 @@ in virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; - virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { + openssl = openssl_1_0_2; + }; - virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; + virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { + openssl = openssl_1_0_2; + }; virtuoso = virtuoso6; @@ -15384,6 +15543,8 @@ in gradm = callPackage ../os-specific/linux/gradm { }; + inherit (nodePackages) gtop; + hd-idle = callPackage ../os-specific/linux/hd-idle { }; hdparm = callPackage ../os-specific/linux/hdparm { }; @@ -15404,7 +15565,9 @@ in pcm = callPackage ../os-specific/linux/pcm { }; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { + openssl = openssl_1_0_2; + }; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; @@ -15636,7 +15799,7 @@ in ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - blcr = callPackage ../os-specific/linux/blcr { }; + blcr = if stdenv.lib.versionOlder "3.18" kernel.version then callPackage ../os-specific/linux/blcr { } else null; chipsec = callPackage ../tools/security/chipsec { inherit kernel; @@ -15657,7 +15820,7 @@ in hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - e1000e = callPackage ../os-specific/linux/e1000e {}; + e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -15725,7 +15888,8 @@ in phc-intel = callPackage ../os-specific/linux/phc-intel { }; - prl-tools = callPackage ../os-specific/linux/prl-tools { }; + # Disable for kernels 4.15 and above due to compatibility issues + prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; sch_cake = callPackage ../os-specific/linux/sch_cake { }; @@ -15996,6 +16160,8 @@ in goconvey = callPackage ../development/tools/goconvey { }; + gofumpt = callPackage ../development/tools/gofumpt { }; + gotags = callPackage ../development/tools/gotags { }; golint = callPackage ../development/tools/golint { }; @@ -16030,7 +16196,9 @@ in quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { + openssl = openssl_1_0_2; + }; linux-pam = callPackage ../os-specific/linux/pam { }; @@ -16042,6 +16210,8 @@ in ofp = callPackage ../os-specific/linux/ofp { }; + ofono = callPackage ../tools/networking/ofono { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -16062,7 +16232,9 @@ in pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; - pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { + openssl = openssl_1_0_2; + }; pam_u2f = callPackage ../os-specific/linux/pam_u2f { }; @@ -16175,6 +16347,8 @@ in sdparm = callPackage ../os-specific/linux/sdparm { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sepolgen = callPackage ../os-specific/linux/sepolgen { }; setools = callPackage ../os-specific/linux/setools { }; @@ -16314,6 +16488,10 @@ in libgcrypt = null; }; + usbguard-nox = usbguard.override { + withGui = false; + }; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; @@ -16612,6 +16790,8 @@ in jost = callPackage ../data/fonts/jost { }; + joypixels = callPackage ../data/fonts/joypixels { }; + junicode = callPackage ../data/fonts/junicode { }; kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; @@ -16809,7 +16989,6 @@ in powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { }; @@ -16854,6 +17033,10 @@ in stdmanpages = callPackage ../data/documentation/std-man-pages { }; + starship = callPackage ../tools/misc/starship { }; + + stig = callPackage ../applications/networking/p2p/stig { }; + stix-otf = callPackage ../data/fonts/stix-otf { }; stix-two = callPackage ../data/fonts/stix-two { }; @@ -16935,6 +17118,8 @@ in gtk = res.gtk2; }; + theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; + themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; theano = callPackage ../data/fonts/theano { }; @@ -17168,7 +17353,6 @@ in clightning = altcoins.clightning; lnd = altcoins.lnd; - bitcoin-xt = altcoins.bitcoin-xt; cryptop = altcoins.cryptop; jnetmap = callPackage ../applications/networking/jnetmap {}; @@ -17354,6 +17538,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 { @@ -17439,6 +17625,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 { }; @@ -17527,15 +17717,6 @@ in cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; - cutegram = - let callpkg = libsForQt56.callPackage; - in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec { - libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; - telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml { - inherit libqtelegram-aseman-edition; - }; - }; - cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; @@ -17737,7 +17918,9 @@ in electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elinks = callPackage ../applications/networking/browsers/elinks { + openssl = openssl_1_0_2; + }; elvis = callPackage ../applications/editors/elvis { }; @@ -17955,7 +18138,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; }; }; @@ -18044,7 +18227,9 @@ in fehlstart = callPackage ../applications/misc/fehlstart { }; - fetchmail = callPackage ../applications/misc/fetchmail { }; + fetchmail = callPackage ../applications/misc/fetchmail { + openssl = openssl_1_0_2; + }; fff = callPackage ../applications/misc/fff { }; @@ -18092,7 +18277,9 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { + openssl = openssl_1_0_2; + }; fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; @@ -18376,7 +18563,7 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; - getxbook = callPackage ../applications/misc/getxbook {}; + getxbook = callPackage ../applications/misc/getxbook { }; ghq = gitAndTools.ghq; @@ -18524,10 +18711,10 @@ in gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-mpv = callPackage ../applications/video/gnome-mpv { }; + celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts gnome-autoar; + inherit (gnome3) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -18663,6 +18850,15 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + pinboard-notes-backup = haskell.lib.overrideCabal + (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" + haskellPackages.pinboard-notes-backup) + (drv: { + postInstall = '' + install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 + '' + (drv.postInstall or ""); + }); + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-theme-black = callPackage ../applications/networking/instant-messengers/slack/dark-theme.nix { }; slack-dark = pkgs.slack.override { theme = slack-theme-black; }; @@ -18856,12 +19052,12 @@ in iptraf-ng = callPackage ../applications/networking/iptraf-ng { }; + irccloud = callPackage ../applications/networking/irc/irccloud { }; + irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; - irssi_otr = callPackage ../applications/networking/irc/irssi/otr { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; bip = callPackage ../applications/networking/irc/bip { }; @@ -19031,6 +19227,8 @@ in kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kubeless = callPackage ../applications/networking/cluster/kubeless { }; + k9s = callPackage ../applications/networking/cluster/k9s { }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; @@ -19351,7 +19549,6 @@ in monero = callPackage ../applications/altcoins/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost16x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { @@ -19378,6 +19575,8 @@ in inherit (ocaml-ng.ocamlPackages_4_01_0) monotoneViz; + moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; + moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; mop = callPackage ../applications/misc/mop { }; @@ -20001,8 +20200,7 @@ in qiv = callPackage ../applications/graphics/qiv { }; - processing = processing3; - processing3 = callPackage ../applications/graphics/processing3 { + processing = callPackage ../applications/graphics/processing { jdk = oraclejdk8; }; @@ -20111,9 +20309,7 @@ in qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtchan = callPackage ../applications/networking/browsers/qtchan { - qt = qt5; - }; + qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { }; qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; @@ -20225,10 +20421,6 @@ in rdup = callPackage ../tools/backup/rdup { }; - realpine = callPackage ../applications/networking/mailreaders/realpine { - tcl = tcl-8_5; - }; - reaper = callPackage ../applications/audio/reaper { }; recode = callPackage ../tools/text/recode { }; @@ -20263,6 +20455,8 @@ in rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rsclock = callPackage ../applications/misc/rsclock { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; @@ -20399,8 +20593,6 @@ in ncurses = ncurses5; }; - ssvnc = callPackage ../applications/networking/remote/ssvnc { }; - stupidterm = callPackage ../applications/misc/stupidterm { gtk = gtk3; }; @@ -20449,6 +20641,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 { @@ -20640,6 +20836,15 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; + syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { }; + syncthingtray-minumal = libsForQt5.callPackage ../applications/misc/syncthingtray { + webviewSupport = false; + jsSupport = false; + kioPluginSupport = false; + plasmoidSupport = false; + systemdSupport = true; + }; + synergy = callPackage ../applications/misc/synergy { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; @@ -20695,8 +20900,6 @@ in ''; tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; @@ -20740,8 +20943,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 { @@ -20884,6 +21085,8 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; + unison-ucm = callPackage ../development/compilers/unison { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -22556,8 +22759,6 @@ in theme-jade1 = callPackage ../misc/themes/jade1 { }; - theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; - theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -22773,6 +22974,8 @@ in somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; + sortmerna = callPackage ../applications/science/biology/sortmerna { }; + stacks = callPackage ../applications/science/biology/stacks { }; star = callPackage ../applications/science/biology/star { }; @@ -23398,7 +23601,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 { }; @@ -23429,7 +23632,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -23672,6 +23875,8 @@ in epkowa = callPackage ../misc/drivers/epkowa { }; + utsushi = callPackage ../misc/drivers/utsushi { }; + idsk = callPackage ../tools/filesystems/idsk { }; igraph = callPackage ../development/libraries/igraph { }; @@ -23886,6 +24091,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 {}; @@ -23941,6 +24150,8 @@ in nix-serve = callPackage ../tools/package-management/nix-serve { }; + nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { }; @@ -24132,6 +24343,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 {}; @@ -24169,6 +24384,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 @@ -24325,6 +24542,8 @@ in inherit (gnome3) zenity; }; + wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; + with-shell = callPackage ../applications/misc/with-shell { }; wmutils-core = callPackage ../tools/X11/wmutils-core { }; @@ -24333,7 +24552,9 @@ in wordpress = callPackage ../servers/web-apps/wordpress { }; - wraith = callPackage ../applications/networking/irc/wraith { }; + wraith = callPackage ../applications/networking/irc/wraith { + openssl = openssl_1_0_2; + }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -24493,7 +24714,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -24532,8 +24753,6 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; - tw-rs = callPackage ../misc/tw-rs { }; - simplenote = callPackage ../applications/misc/simplenote { }; hy = callPackage ../development/interpreters/hy {}; @@ -24625,6 +24844,8 @@ in tsung = callPackage ../applications/networking/tsung {}; + bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; + qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; avrbinutils = pkgsCross.avr.buildPackages.binutils; @@ -24652,4 +24873,8 @@ in zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; runwayml = callPackage ../applications/graphics/runwayml {}; + + uhubctl = callPackage ../tools/misc/uhubctl {}; + + kodelife = callPackage ../applications/graphics/kodelife {}; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index ef43f8784ae9..df9d3dbcff5b 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30 }: +{ callPackage, wxGTK30, openssl_1_0_2 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -16,6 +16,7 @@ rec { # These are standard Erlang versions, using the generic builder. erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; + openssl = openssl_1_0_2; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -25,6 +26,7 @@ rec { erlangR18_nox = erlangR18.override { wxSupport = false; }; erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; + openssl = openssl_1_0_2; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 3ac7b9413d95..d4c2c3b1e3f3 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -137,7 +137,7 @@ in rec { coqPackages_8_9 = mkCoqPackages coq_8_9; coqPackages_8_10 = mkCoqPackages coq_8_10; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute - coqPackages_8_8 + coqPackages_8_9 ); coq = coqPackages.coq; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1740b3278097..e89a7d9df2aa 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -45,10 +45,31 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; - FSharpCore = fetchNuGet { + FSharpCore302 = fetchNuGet { + baseName = "FSharp.Core"; + version = "3.0.2"; + sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q"; + outputFiles = [ "*" ]; + }; + + FSharpCore3125 = fetchNuGet { + baseName = "FSharp.Core"; + version = "3.1.2.5"; + sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih"; + outputFiles = [ "*" ]; + }; + + FSharpCore4001 = fetchNuGet { baseName = "FSharp.Core"; version = "4.0.0.1"; - sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn"; + sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k"; + outputFiles = [ "*" ]; + }; + + FSharpCore4117 = fetchNuGet { + baseName = "FSharp.Core"; + version = "4.1.17"; + sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1"; outputFiles = [ "*" ]; }; @@ -89,8 +110,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { FSharpCompilerTools = fetchNuGet { baseName = "FSharp.Compiler.Tools"; - version = "4.1.4"; - sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8"; + version = "4.1.27"; + sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl"; outputFiles = [ "*" ]; }; @@ -101,10 +122,10 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "build/*" ]; }; - FsLexYacc704 = fetchNuGet { + FsLexYacc706 = fetchNuGet { baseName = "FsLexYacc"; - version = "7.0.4"; - sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi"; + version = "7.0.6"; + sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2"; outputFiles = [ "*" ]; }; @@ -203,8 +224,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SystemValueTuple = fetchNuGet { baseName = "System.ValueTuple"; - version = "4.3.0"; - sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88"; + version = "4.3.1"; + sha256 = "0qzq878s66yfkf4n2b9af8lw2bx45s3cg6mi0w8w0bi358fa7q70"; outputFiles = [ "*" ]; }; @@ -848,13 +869,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Nuget = buildDotnetPackage { baseName = "Nuget"; - version = "3.4.3"; + version = "4.9.1"; src = fetchFromGitHub { owner = "mono"; repo = "nuget-binary"; - rev = "1f3025c2eb13bfcb56b47ddd77329ac3d9911d1c"; - sha256 = "01snk05hcrp5i2ys3p1y34r05q1b460q6wb8p3vwpba2q2czdax5"; + rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c"; + sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; buildInputs = [ unzip ]; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5719c5a74fe1..0c85176acba2 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -55,7 +55,9 @@ let mkMelpaStablePackages = melpaGeneric "stable"; mkMelpaPackages = melpaGeneric "unstable"; - mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; + mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { + inherit lib; + }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv runCommand; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b5ec6ed335b2..16dd32a8a7a6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -128,6 +128,8 @@ let cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { }; + checkseum = callPackage ../development/ocaml-modules/checkseum { }; cil = callPackage ../development/ocaml-modules/cil { }; @@ -450,6 +452,8 @@ let mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + mmap = callPackage ../development/ocaml-modules/mmap { }; + mparser = callPackage ../development/ocaml-modules/mparser { }; mstruct = callPackage ../development/ocaml-modules/mstruct { }; @@ -764,6 +768,8 @@ let then callPackage ../development/ocaml-modules/uri { } else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; + uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { legacyVersion = true; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 338e4b61ff48..6180f6372e27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6,7 +6,7 @@ be almost as much code as the function itself. */ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, - buildPerl}: + buildPerl, shortenPerlShebang}: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above assert stdenv.lib.versionAtLeast perl.version "5.28.2"; @@ -88,23 +88,30 @@ 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 - buildInputs = stdenv.lib.optional stdenv.isDarwin gnused; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/ack + ''; + + # tests fails on nixos and hydra because of different purity issues + doCheck = false; + meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = https://beyondgrep.com; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; }; - # tests fails on nixos and hydra because of different purity issues - doCheck = false; }; AlgorithmAnnotate = buildPerlPackage { @@ -152,10 +159,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 ]; @@ -192,10 +199,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"; @@ -229,10 +236,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 = { @@ -305,6 +312,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"; @@ -360,10 +380,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 = { @@ -383,6 +403,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"; @@ -473,14 +519,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/; @@ -538,10 +584,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 = { @@ -688,6 +734,8 @@ let propagatedBuildInputs = [ pkgs.openssl IPCRun3 ]; patchPhase = '' sed -i 's|my $openssl_bin = "openssl";|my $openssl_bin = "${pkgs.openssl}/bin/openssl";|' lib/Authen/ModAuthPubTkt.pm + # -dss1 doesn't exist for dgst in openssl 1.1, -sha1 can also handle DSA keys now + sed -i 's|-dss1|-sha1|' lib/Authen/ModAuthPubTkt.pm ''; meta = { description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; @@ -711,10 +759,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 ]; @@ -826,10 +874,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 = { @@ -840,6 +888,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"; @@ -1167,10 +1228,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; @@ -1227,10 +1288,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 = { @@ -1259,7 +1320,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)"; @@ -1415,10 +1476,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"; @@ -1669,6 +1730,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"; @@ -1742,12 +1818,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"; @@ -1823,6 +1898,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"; @@ -1839,10 +1930,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 ]; @@ -2189,10 +2280,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"; @@ -2225,10 +2316,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"; @@ -2489,15 +2580,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 { @@ -2528,10 +2620,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 ]; @@ -2741,6 +2833,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"; @@ -2787,11 +2894,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 { @@ -2811,10 +2919,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 ]; @@ -2912,10 +3020,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 ]; @@ -2938,10 +3046,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 ]; @@ -2966,10 +3074,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 = { @@ -2980,10 +3088,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"; @@ -3062,10 +3170,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; @@ -3076,10 +3184,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 = { @@ -3267,10 +3375,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"; }; }; @@ -3299,8 +3407,8 @@ let url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto"; meta = with stdenv.lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; @@ -3314,8 +3422,8 @@ let url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto"; }; CryptOpenSSLGuess = buildPerlPackage { @@ -3352,8 +3460,8 @@ let sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; }; @@ -3382,7 +3490,7 @@ let url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; - makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; + makeMakerFlags = "--libpath=${pkgs.openssl_1_0_2.out}/lib --incpath=${pkgs.openssl_1_0_2.dev}/include"; buildInputs = [ PathClass ]; propagatedBuildInputs = [ LWPProtocolHttps ]; }; @@ -3455,10 +3563,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"; @@ -3683,10 +3791,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 ]; @@ -3835,6 +3943,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"; @@ -3950,10 +4073,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 = '' @@ -3963,7 +4086,7 @@ let meta = { description = "Date manipulation routines"; }; - buildInputs = [ TestInter ]; + buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; }; DateSimple = buildPerlPackage { @@ -3980,10 +4103,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 ]; @@ -4248,10 +4371,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 ]; @@ -4356,10 +4479,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 = { @@ -4385,10 +4508,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"; @@ -4783,10 +4906,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"; @@ -4908,6 +5031,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"; @@ -5126,14 +5277,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"; @@ -5670,10 +5821,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 ]; @@ -5927,10 +6078,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"; @@ -6074,10 +6225,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 = { @@ -6169,10 +6320,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 ]; }; @@ -6574,10 +6725,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 = { @@ -6739,17 +6890,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 { @@ -6817,13 +6969,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; @@ -6901,10 +7053,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 ]; @@ -7363,10 +7515,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 = { @@ -8701,6 +8853,11 @@ let sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; + meta = with stdenv.lib; { description = "A tool to read, write and edit EXIF meta information"; homepage = https://www.sno.phy.queensu.ca/~phil/exiftool/; @@ -8725,10 +8882,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 = { @@ -8746,10 +8903,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 ]; @@ -8879,10 +9036,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"; @@ -8903,6 +9060,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"; @@ -9065,10 +9235,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'"; @@ -9123,10 +9293,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 = { @@ -9395,15 +9565,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 { @@ -9598,6 +9769,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"; @@ -9681,10 +9867,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"; @@ -9725,10 +9911,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 ]; @@ -9755,10 +9941,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) @@ -9927,11 +10113,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; @@ -10073,10 +10259,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 = { @@ -10087,10 +10273,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 = { @@ -10176,10 +10362,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 ]; @@ -10335,10 +10521,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 ]; @@ -10350,10 +10536,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 ]; @@ -10409,7 +10595,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"; @@ -10605,11 +10791,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; @@ -11030,10 +11216,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; @@ -11324,6 +11510,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"; @@ -11677,12 +11878,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; @@ -12329,10 +12530,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; @@ -12582,10 +12783,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. @@ -12652,14 +12853,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 { @@ -13200,6 +13400,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"; @@ -13213,6 +13427,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"; @@ -13268,10 +13498,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 ]; @@ -13339,13 +13569,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"; @@ -13450,10 +13680,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"; @@ -13626,10 +13856,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 = { @@ -13773,13 +14003,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. @@ -13794,10 +14024,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 = { @@ -13808,12 +14038,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 ]; @@ -13848,10 +14078,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"; @@ -13989,7 +14219,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"; @@ -13999,10 +14229,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 ]; @@ -14262,10 +14492,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"; }; }; @@ -14363,10 +14593,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 = { @@ -14404,12 +14634,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; @@ -14468,10 +14698,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"; @@ -14605,10 +14835,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"; @@ -14702,10 +14932,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"; @@ -14763,6 +14993,19 @@ let }; }; + DeviceSerialPort = buildPerlPackage rec { + pname = "Device-SerialPort"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/COOK/${pname}-${version}.tar.gz"; + sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk"; + }; + meta = with stdenv.lib; { + description = "Linux/POSIX emulation of Win32::SerialPort functions."; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + ServerStarter = buildPerlModule { pname = "Server-Starter"; version = "0.34"; @@ -15078,12 +15321,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"; @@ -15132,10 +15375,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 ]; @@ -15208,10 +15451,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 ]; @@ -15854,7 +16097,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; @@ -15989,10 +16232,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; @@ -16146,10 +16389,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; { @@ -16260,12 +16503,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 ]; @@ -16274,10 +16517,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 = { @@ -16455,10 +16698,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 = { @@ -16658,6 +16901,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"; @@ -16750,6 +17007,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"; @@ -16855,10 +17128,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 = { @@ -17298,10 +17571,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 ]; @@ -17341,10 +17614,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"; @@ -17379,10 +17652,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"; @@ -17660,11 +17933,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 '' @@ -17703,10 +17976,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)"; @@ -17790,6 +18063,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"; @@ -18018,10 +18306,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 ]; }; @@ -18380,10 +18668,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"; @@ -18393,10 +18681,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 ]; @@ -18419,6 +18707,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"; @@ -18514,6 +18813,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"; @@ -18756,6 +19068,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"; @@ -18812,15 +19153,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 ]; @@ -18893,10 +19230,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"; @@ -18961,12 +19298,16 @@ let sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/youtube-viewer + ''; meta = { description = "A lightweight application for searching and streaming videos from YouTube"; @@ -19000,10 +19341,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 ]; @@ -19066,6 +19407,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"; @@ -19331,10 +19688,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 = '' @@ -19482,10 +19839,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 ]; @@ -19521,10 +19878,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 3b7bb5692a22..879ffc9f441c 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,14 +215,34 @@ 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"; sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; pcs = buildPecl rec { @@ -372,12 +392,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.12"; + version = "0.11.15"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "12k74108f7a3k7ms8n4c625vpxrq75qamw1k1q09ndzmbn3i7c9b"; + sha256 = "1fa3bq5k548jpyph2rxkgnarblyy5f1m55awjcps8mjqbw9r6439"; }; phases = [ "installPhase" ]; @@ -450,10 +470,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 +513,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"; + + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "v${version}"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + }; + + 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"; - sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5"; + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + }; - meta.broken = true; + 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 6b89401cb958..e8dca7c924b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ 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 { }; @@ -519,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 { }; @@ -565,19 +569,29 @@ in { favicon = callPackage ../development/python-modules/favicon { }; + fdint = callPackage ../development/python-modules/fdint { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filterpy = callPackage ../development/python-modules/filterpy { }; + filemagic = callPackage ../development/python-modules/filemagic { }; + fints = callPackage ../development/python-modules/fints { }; fire = callPackage ../development/python-modules/fire { }; firetv = callPackage ../development/python-modules/firetv { }; - fdint = callPackage ../development/python-modules/fdint { }; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - filemagic = callPackage ../development/python-modules/filemagic { }; + flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; + + flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; + + foxdot = callPackage ../development/python-modules/foxdot { }; + + fsspec = callPackage ../development/python-modules/fsspec { }; fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; @@ -637,6 +651,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 { @@ -667,12 +683,18 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; langdetect = callPackage ../development/python-modules/langdetect { }; + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + + lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + libmr = callPackage ../development/python-modules/libmr { }; limitlessled = callPackage ../development/python-modules/limitlessled { }; @@ -689,6 +711,10 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { }); + + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + manhole = callPackage ../development/python-modules/manhole { }; markerlib = callPackage ../development/python-modules/markerlib { }; @@ -797,6 +823,8 @@ in { poetry = callPackage ../development/python-modules/poetry { }; + postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + pplpy = callPackage ../development/python-modules/pplpy { }; pprintpp = callPackage ../development/python-modules/pprintpp { }; @@ -877,6 +905,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 { }; @@ -984,6 +1014,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; }); @@ -1010,6 +1042,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 { }; @@ -1158,6 +1192,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 { }; @@ -1265,6 +1301,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 { }; @@ -1336,8 +1374,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 { }; @@ -1491,6 +1533,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 { }; @@ -1544,6 +1588,8 @@ in { cram = callPackage ../development/python-modules/cram { }; + crc16 = callPackage ../development/python-modules/crc16 { }; + csscompressor = callPackage ../development/python-modules/csscompressor {}; csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; @@ -1887,6 +1933,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 { }; @@ -1928,11 +1976,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 { }; @@ -2121,6 +2165,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 { }; @@ -2424,6 +2470,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 { }; @@ -2446,6 +2494,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 { }; @@ -2802,6 +2852,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 { }; @@ -2818,6 +2870,10 @@ in { django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; @@ -2971,6 +3027,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 { }; @@ -3134,6 +3192,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 { }; @@ -3490,6 +3550,8 @@ in { python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + python-unshare = callPackage ../development/python-modules/python-unshare { }; + fs = callPackage ../development/python-modules/fs { }; fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; @@ -3712,7 +3774,7 @@ in { mpd2 = callPackage ../development/python-modules/mpd2 { }; - mpv = callPackage ../development/python-modules/mpv { }; + mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; mrbob = callPackage ../development/python-modules/mrbob {}; @@ -4063,6 +4125,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 { }; @@ -4084,6 +4148,8 @@ in { pgspecial = callPackage ../development/python-modules/pgspecial { }; + pgpy = callPackage ../development/python-modules/pgpy { }; + pickleshare = callPackage ../development/python-modules/pickleshare { }; piep = callPackage ../development/python-modules/piep { }; @@ -4103,6 +4169,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 { @@ -4261,7 +4329,7 @@ in { inherit (pkgs) graphviz; }; - pydot_ng = callPackage ../development/python-modules/pydot_ng { }; + pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; pyelftools = callPackage ../development/python-modules/pyelftools { }; @@ -4697,6 +4765,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 { }; @@ -4825,6 +4898,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 { }; @@ -4968,8 +5043,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 { }; @@ -4983,6 +5056,11 @@ 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 { }; @@ -4991,6 +5069,8 @@ in { xarray = callPackage ../development/python-modules/xarray { }; + xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + xlwt = callPackage ../development/python-modules/xlwt { }; xxhash = callPackage ../development/python-modules/xxhash { }; @@ -5038,6 +5118,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 { }; @@ -5285,6 +5367,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 { }; @@ -5622,6 +5706,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 {}; @@ -5757,6 +5843,7 @@ in { cudatoolkit = pkgs.cudatoolkit_10; cudnn = pkgs.cudnn_cudatoolkit_10; nccl = pkgs.nccl_cudatoolkit_10; + openssl = pkgs.openssl_1_0_2; }; tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build; @@ -6007,7 +6094,10 @@ in { us = callPackage ../development/python-modules/us { }; - wsproto = callPackage ../development/python-modules/wsproto { }; + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; h11 = callPackage ../development/python-modules/h11 { }; @@ -6121,6 +6211,8 @@ in { 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 108c6006fb64..eac84cfc1a8d 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; }; - } |