From 0ed43b564344381bc9f508f7557b05087c807d71 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Fri, 29 Jun 2018 22:11:55 +0200 Subject: [PATCH 01/99] kmod-blacklist-ubuntu: Fix typo from commit "do not blacklist i2c_i801" That commit did not actually accomplish its intent because it misspelled the module name. --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 7137390ecab..ee58d8b9c05 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf cat "$f" >> "$out"/modprobe.conf # https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945 - sed -i '/^blacklist i2c_801/d' $out/modprobe.conf + sed -i '/^blacklist i2c_i801/d' $out/modprobe.conf done substituteInPlace "$out"/modprobe.conf \ From ca370302bcff9bd26d118fb6beabda3969189d74 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Jul 2018 03:12:18 +0900 Subject: [PATCH 02/99] thunderbird-bin: 52.9.0 -> 52.9.1 --- .../thunderbird-bin/release_sources.nix | 474 +++++++++--------- 1 file changed, 237 insertions(+), 237 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 05c372d0780..047b1659642 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.9.0"; + version = "52.9.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ar/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ar/thunderbird-52.9.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4585aabb08aaf049622f7cc8b485fb6a28ffd26759c760dab75af679a434d3ea7f356e5255a990f22f362e1506722207c2c2b866718a695dd651a53923a37fb2"; + sha512 = "9384c43cbac7d6b88fa160e22fb21e6f4250276b46d3fc0322dca45a6b5ebacfc39a431b54d34262a32f2a7cc9130b68b6dc4b636a737ecb7132e077592882a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ast/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ast/thunderbird-52.9.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f8558b2b833be94accd96ccd62b9b1fd8f837d11f9f53a514bf19b2007af4c69afac762f091c4116ec4b7ceadc3538183c2370b4b485a430d3b975aa94de0027"; + sha512 = "b1d0b26dc21c4487f016c60aa8560ff34c868c6e617040f963ff9e76b859d7d265cf529c0d70fcb736aa946ad50b1a0cae0dd66df1594e102a85cfa489b07358"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/be/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/be/thunderbird-52.9.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "78e259db1a9b73178fe2ffcc8ee05c5b1324513a4ea0d564a0d702d42aa2bb87f990f780021c19d3c880922ea443b8925d71370fd31d4577e985f6dd1d2af11b"; + sha512 = "635ad3d57463eb51830dfb66871258b69bcfcd9ed0c2b38956a25db242905113a6604812a6d6aa1778dde1783595e2b4cb6b3a51f48af6f6740e6613ba78adf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bg/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bg/thunderbird-52.9.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "783fe76fb9c34b47a41ea625f31a66e047fc37a4df521c74628d785cdca2fe8c06a7fac1fa1a3cdb5f782c1acd79862317f19ee1597350c991881bde682061ef"; + sha512 = "573f0b63a16f62662958ff1884a2cf76436242f377258f39ea254732aaa4d1f358ee651b2e4f5eb2cd3c20f69ad6b6ea2bc6985fc3d99e23edeb75d3ca55ba27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bn-BD/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bn-BD/thunderbird-52.9.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "bcc80e20e418f676936335ff0aca9d542ab6563d678e8f986373b86aba160be8a815bef28a1b3af70a54047d857bf2f09b1cd7e7926d32e8ff41b790bfbbfd61"; + sha512 = "d277706e699ebdbcc4ccbf8f6d5c4c256b0ed65ad7b604962e8cc2dffa5b06eeffad7dfd5dc5a08b87a25f0e728daa79d2e0ca0ab9ade7136057a3aef203f26f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/br/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/br/thunderbird-52.9.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "183faf91edaa6035b768fa24bbfa6aff165e07c43174828bf8de8d2a41f1e80b96d65b88714556b9230b2cef37a2b03f2d9b40baa623bda3a831b528a2c3d61c"; + sha512 = "11e362e77f4b5ce75823c3aa60fab68969d8b19b6fb9a51027c81ad4e1e4f46c4a5a4e3218361521d076859453523a30cf79ec715abfc59cca31c541f02562ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ca/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ca/thunderbird-52.9.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4f55b3a0da97c3530f8c69f13b53b27e7ec492f0aeda2fd5075a9a340fd0b76a88a29e0f3c5ef8a801872bd263803e4da4b59dbf4258e6f4f0fd986aec63bd7d"; + sha512 = "7eba10d82c0b2bd58d87670c345ac8948c06f1b6a0ac853d40b1993fc101931dc581b3e252ebe0a22948f18738d60714aeabebc8dc1953f0199ccb6b2fa1af47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cs/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cs/thunderbird-52.9.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "13ac8185a5bb7e20f4d1961cc5983e3a3a60467d9530a326d9cac184a1ce44113deb113242d21855504376396985e9307dfb0f95bf73f9ce50f68d1a6287355b"; + sha512 = "2c05465bc32b6703ee930ccc17b7bebeba3e0eda37b959f08812d3a891fe17664862b7e981a37e43e0adf775d7cb929d866ebdbc044ff53ecf6b1066fcc2796b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cy/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cy/thunderbird-52.9.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1bdff75c79684bd67564954844d53735e6d63c0815aa7629cbf55124f138476c17b891229a657892faf29decefcdfcef8e984eb1e9c935dbb2d555f18bad75fc"; + sha512 = "0cb9735931a29e098e707d27f22f412ba0d0d242799a10658b4ba41abc3ffae5fc2028f4efaf82ef1544f7ddc8efd8401b076945f8b5669231af62fb00cb2019"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/da/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/da/thunderbird-52.9.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "af08df6ddc75e3bf4d1fb678894799eb112963edeb424c149e4b5703e8112f4b747e25dae5706a5f7ac066258cb6a16dbb197e29c45b787124f42c004671897a"; + sha512 = "906ae74d45a9915e76fb666a89b00c5378aa9498f29025088eddd3853a93b79ba0eab2d5678908e10f11fc5273dc15ebeee6714a02a70df6ab7bdc0fb7df4917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/de/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/de/thunderbird-52.9.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "0aca6f9fa7549e36a10df14f2f74d213ba88c614c98b6701a1d5b3d498a6fd8c7b399464a170b55363746cb1b662d05a1e56bc171c778b83428314a2874e5177"; + sha512 = "729a833d64df3d1270b07ba2bfdd963efaee4d0bba98d23d4b07f9924878806f59b916af117dd5b866fecba6715bf10b9586e2a34b6de66fce803a76eda07232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/dsb/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/dsb/thunderbird-52.9.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "73fcb0ea062f7cabf96088dc4c8400d084a3b8e5258dbf56132f2d23046e6286ba041e77c97d6e12448809e14aec402bb4edbc9e7602e713e1d74cd2e1244bb7"; + sha512 = "420a61731fb8159104a14b9741166f250d689ca18f15ffb1e408366fd976e723a72b94cc5ed512895e1e0fc58cfcba2dd39c7c898a38cf996fd59a1de7967fd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/el/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/el/thunderbird-52.9.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "0103d5de58e5971bf74f74e43e99b519b8ade5aedf70fe2422e4bfe68a9a8d8b9c4cb81efd82d485e085f7ab3afe4a40e81f65ab37681626385ecdd7384959b2"; + sha512 = "7a7cccdf48c9fae667ea33294dbabfd2217cdcf6922a847dd93db3567e9d9d527015124d777e94db5a7c32a9d9f31ecc272978972dd07ada60c8bd3e323b1d12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-GB/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-GB/thunderbird-52.9.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "608c7b33f333aea4a1737e763bb57562332eea53555f98e27ccfe8e5485d6850847242bbb9d6d63a840a68895b45b2fa036ce675b4d88fcf37b09f71ba8eef69"; + sha512 = "a713653bc7da8347d2897ff522c8cb13983fd913ec987a81b9bcb1242dac14c0cd875e7bb5dfda14938953af0a526d24a54d40e1b88e31107498baf00aaeb6c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-US/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4b6479bdf244cc7dbf175109b9b353d021728e53f16c6f172a6c9b5d2f1018a0bb5a69f1f0fb40d95fa7ab117497f20514f7795b7180b69506102b1a6d654888"; + sha512 = "98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-AR/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-AR/thunderbird-52.9.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "40106ce1b5f54870db329699ef434a7e7995cea50937df642afe17f2c11445ba4c2d337bd3e8d0a689500abe8e538dc6d5ad6e1b8bc82d47a8b23a4e70b9c269"; + sha512 = "fde54338bcc99c98f9e8e77f30795252459f79037ed996f3bb055e3c650104a3f73878f72bf02c0a0db4d907322f896600e6f057c4a39888708183489f80f579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-ES/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-ES/thunderbird-52.9.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "2724a4e6355804e9fef679952aa435806bcab0e444b8ec2ca4e6ac950951723f02585683f7f9f203c8ab1388f3be53e0de161bd51250469d286ba82eb1ed2b2e"; + sha512 = "08eb3b2c6422429e19e909dec8d7cc0cc2288e7b991e466f32618d2018ab4b9dbd8be78f469315645b5efe866f7014dadd3d5a6e997f6540422d6d8de61bbc39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/et/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/et/thunderbird-52.9.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c5907d7998700e1915c35e4f45fde0f28339d3ea2daece85b63428aa39be24f23ab1f5f69ffa9241ef2fb858909dae4aa5f3577b569d237796d1d9a24bb15704"; + sha512 = "0a1e8496e256990715c11eadd7d1804336542215e4ac34615145fca02a30ca97f2f92220631bbb0f55cfd1579442064d1c0112665bd6e3a35719faefcdf13ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/eu/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/eu/thunderbird-52.9.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d9711b60be3559f3905a6db72cda46c39c9cd89493effcc4f618241444910c8af19c244be3f043513c62e1d2a7e5c91a5e4be7e8397c71f783056c8e1141fbb1"; + sha512 = "8696ed02d5bcfeb12ad1057c6a5e2558f3261189d7147bfa86e1043f13da58d60ae5b48a31f2113e1b699f049c9f06a946998cba766bb5faed9b1ba612ed2ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fi/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fi/thunderbird-52.9.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "07a915424b71e5b1bad7f76bf58e678374c3d385231a2f32c04da4374acd758a2425cd0766d7c904ad5edbe390ae8fbf20eb59996111410fd8853b618ca1d7ff"; + sha512 = "e60015623faff6c065ff719fbbdcaf81c48f5d9175a61c8a4920e27a51d8495db782b6916ba320717d36807f758bf5826f2f882cacfc25ba0bbb4fe1bddbce6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fr/thunderbird-52.9.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7368953ce57bab8cb7a774f60aea222d59d7982c5e8f1015d0b11bad1f0857d8a8df05a59db6e3526af92562f70c8bef65882954e7b0b4534e4b240c196ca125"; + sha512 = "e5a276e8f53387f8acd939fbe158d594c7b5d9ebcd6f0a2ea92fede421d1584ef42e49bfcf84efe651d62ca60c311634e9fc4ee429fb38c70f82cfd0e3823fd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fy-NL/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fy-NL/thunderbird-52.9.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2284bec81a2f082dee4820489941cc638f7026fd7a7e4256b7f9a4bfab688ca88e9b5fb08f3a1e796cb4845192ec49cf453a4a4d8f83bbc116630c0d40dba84c"; + sha512 = "1f98eec3b67b2aabde704fb14603df6258c0f996868c57490194b1e672b52b59026a17e2b7e35033b71d95f3d46968ad1eb7e46f35f9799af49781d7746d8b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ga-IE/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ga-IE/thunderbird-52.9.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ae0722e8bbf24319b9276a2f8f9ba3551d7f0201152622133f53d0d42c8abc64d4ceb7b27e45a0a4447cc6d5abdcb705c74f44c0102fcd9c0d7e9938adc4a755"; + sha512 = "54c8c9484400749efb129630ab6a107da6ce1a77c8e8c43185fb84f98b13c33edfe512c63d571a5206c3600729eb644a8e8a0c325932d81579c8e8932a51abab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gd/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gd/thunderbird-52.9.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1464c0c2b1f2c89fd93419102da9a79400b6683767cc25d50bb249855091cb1549b410fddfa990b463404645ac3737d31ad4abffdbed58a7b94b17fe43f6ff6f"; + sha512 = "4cd2140b0871ee144ba5996c98a67fc6b8c6f0beecc15a628968716d472e4b93286ad606e9b5a54b294329f83dec85f48f5008c30e1970ec2feb40f0bb0eed98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gl/thunderbird-52.9.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "990202de53a2f86253819202337b312fdead9dccb6b011fae514614a7e45eb91976b5b9b7dbb3a7a9378c523280172b177a0ad7ac85e92b624086cdb8dab0651"; + sha512 = "e87fab8d479c847ec7110926ee7ac93668495caddc77bc8a4a3e382ee1aa12488221b6facabbbf74c0aeecdc226705d9cf4edd649a7b3a6410fa98c62ab37fc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/he/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/he/thunderbird-52.9.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "862cb3047c83c1277ca195cffa21fae79e79f12b9330b3eb27378c050495552b857b43daf18425768e76004fc88f978f46d6b062b8e14d6a4789fa5442479d05"; + sha512 = "26766b3b37c3b13173cb06865185fa08d4e8a1c07c3f8ce958545b21b3ffe473885c6559a6799fc82c426702f1433d783b55c821cb1e30480456dc9352c9f3ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hr/thunderbird-52.9.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "419c10d7ad1168fc43c390651199c56aaf331fc9f6015a46f2fefde83ce31cd26c26f856d00b85b5f7278c6540f235d17f3f7f83d85bf79df7b50aeb6dc198fa"; + sha512 = "458500d47e73ccc2d8a370ea63826224cb1a8514a322a9c8b98aff16363e3807a1d4e4e0b007b3eccb8888def285831d1afdfd9004dcbf729779137b28bd9333"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hsb/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hsb/thunderbird-52.9.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e2efdc85a7653e6dc3d15d27453bd3294aaba3b7cfd0b41da63d1a9954fabd544469304bd038beae6a3dd7bc5159e1960beeb18325d15190a24f5f8aff470e63"; + sha512 = "a612cf7e309437abd521b0964d254c3c980ad096f339da0db803d6bb739d9761796af2460ff989355102b628b4d383db412556dcf897c351ada417089703f2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hu/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hu/thunderbird-52.9.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1140a52c2bd80c46ec14a8ab429f94ab380fa091f29604b0045f35c210c670d66cf6dcae0ce16b3cd865b5756a08f8c3e31b561c4a36e75cdefe6ef333074b90"; + sha512 = "49790909eb91f8862807fbd213974b906d4ca979646c11c7377c205cd6a7092ad9942900729ee90927261ff969a71773941b29a8be19dd4d8d7a325559f81500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hy-AM/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hy-AM/thunderbird-52.9.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "35c657c76494dbce3d5c5f5e78be1983530caa1d028d4c8407c15bc6d104765ec47c247b48a8a848530fbf1f42ab2fea5202a73442b149caee7c85ceedaf2ad3"; + sha512 = "57285eb8916dfd90bb4bae2d791695f3bf2c2c82742f9040d20d8c0f6194adc493f36733a6a2b9d474c036ac25309330f96de17e49938a5f97ea9c369a02daed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/id/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/id/thunderbird-52.9.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "0659d0314cfdb1b8ac465281f5d6017b60f36eec2947ae608561f22c91edda6b294de3437e26d448b260b175e6e8b2bc8b5b253efbc14dbb93038bb535b8e8b4"; + sha512 = "61313d060dc24b1e685aa434c6beefdd6b114a2ca24f19690e1cc712db75d238610c3a23ffddaa373bcbfd080e0bd53c8e3d05243c7d184535bbf95b5d0df00c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/is/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/is/thunderbird-52.9.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "915e420a4ae20927dff42a5211d582548f9e20fc4079627a79bb96244d06ac983865c7ba814562eb0bc67ec620f07e06e7c9739d9985464370417d186b39724a"; + sha512 = "28968973b8379c91dcb1e6c27127ab55a8044edd0c518defc9c2977ac728928bfd1c75e2e357e3faf71acc3b4bad6e90a1f588742cdb0abf9ace85cd424c288b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/it/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/it/thunderbird-52.9.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "61b94999940d80e6fdc5c446d0cf28382797f28f88f7f9175fba880c068d052f24a53ad6b8c5d688a11d5c756dcab6eb046694fa5454bcee24fbbfb7912a83d0"; + sha512 = "3231f2639940323db9a23c236be5ef8304ce953821971801bbea2d8674c2b54d1ead79041992d17609c6d1a9e86e352af84d76137a7728eb085aa54da0c02d38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ja/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ja/thunderbird-52.9.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5068296796e6eae90711d7d36a8da446e11097e65bdf0ee57aaa231e96ee044baf5b9a82c77424e783ad4acf8a5b9b93433f73a7b0fb98de3ff01c576b19bddc"; + sha512 = "542aadd1a658f9e21fdf0bfa32069e5adfba58750fda943389ce4e3230cf063503c78353e739fb6771434b209b6c836f87c94f7831d50f2b41c8dd38dc6da198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/kab/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/kab/thunderbird-52.9.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d8ce200213fddfa2520a7df57be2daa8983dfdc8fbab5dfd5beec793234c82831fecf913387ad8043ce859abdabc1f2bbc08b5c5a2f7e476a987646cc8921870"; + sha512 = "f97fb7db2e055ccad2310d813a15086494d0815fc3cc48d49928c5642175f9db80b4deec8c4a4f5568417a26e898348ad10ec887b8a8be161586ff3c53ee3ff2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ko/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ko/thunderbird-52.9.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "84c2a4ccdda118b304a690eba28d92fbffa7616434a8278616a1e923b6d757c8600b5e35ab25a13c29fd1a290b1f19540725569db82f3e821fc8b8e9a119737b"; + sha512 = "1854d0c0365bca930a4480226dd54bee3e6798857e68cea3dfdce94247f298be6933f2ed8a7abd89e87ae063a7a14c9d7ad1998abb0fd07dfe9a2a0b2e63dd71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/lt/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/lt/thunderbird-52.9.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "38f9dd15a596af07b882fa265487dbaa638e1221a1fe8cf3377bb0a9e19f5f9450da8213ba63ed57d4e33e1543b9b9af6d0c4a7334260672d3c61b9b4ac51bfb"; + sha512 = "2979f9059f6dae5abd9ead9bc87052e7a4116d0f0001a3585b70e2a0609c85c1e6a38d547a8a187f9057d68f7a87a4875cc209f00a1dd1011ec7634cf0339aa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nb-NO/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nb-NO/thunderbird-52.9.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "75fd6fd0bcb786bbffaa657344834af1f113823db703582968b8813de6e8a69d26e657542e29b6e309f714a222140b961de264e3b81f12a678731bc74ef8d65b"; + sha512 = "e9a61cf7cecf7026bd4aa7574ece60e9738f710a43733d7347a1ebdc460322b975ab86be81919a85faa01f728aab754825062da5642231658daa1a318e919c3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nl/thunderbird-52.9.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ff34802f626606b91fa01a7cc00b6ff97f84edff91afbd8a51a465e740ac97b3119357f8f04d214ddda3bc1a8f61574360baced40e38b5aeac8d870e06ccca24"; + sha512 = "07c3db2e75395059f735a17bd4db3a68ee7fa97fbad3dfafb0aa1371d360a8fd5b693bd6034afde2457e7e13fa6968d78df0f297c55fb8882e10f4311eb03244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nn-NO/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nn-NO/thunderbird-52.9.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ee73bc257ca5f1d35fe2c0cd861a4ff2ce6e9329a59feef2492bc9edf03d80bf879b7c2899417ed381faccf20813d8120a867107ee17f216a8c02d9011802c76"; + sha512 = "1eaad3950f23e1e7a83bea070a8d5c4207b5c2443af11623872a446ab45ee8e2746be9de638828f951a47dd8966426a1d166eb98dc900de39d0a230d438bdd10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pa-IN/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pa-IN/thunderbird-52.9.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8874b47fc730e61dbad1a78e38d7be1f23cc898ac609e6dc302d2217633a812ba75f519699ceda0b492fc451d3d8f7bebe2e0a55f6ad9bcec0310c2927035d36"; + sha512 = "da0b4fca7428104c75650435efa2ab65edc6ca4518ed4b6274195465cbea5d5cf9bbb7f3aa22209f298afab970556f51638bc752ea50edf2a3fd7b562314af61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pl/thunderbird-52.9.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e612b9bf659f1124721c771015fc2698533d83f73d65cdc6ba95a5e1bc89748b0667f8b83b3d9f9b2173cd448ef8a88028e704fdbf5b6536884c6c9253075d24"; + sha512 = "41c14a41b00b0a92ee8bce565ba2fe9a4ca1461ce5a1f54dbb40558bc2d871d07ee5edfbc6c8df1a7aba7e1a957cd11acd509e193b657473b14b745bbf06e3e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-BR/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-BR/thunderbird-52.9.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a94c7feb52fc7ef1e819af28598d558f9b6b39833081bce0078b2e3aecc0ebe97cd519f3de8726512c453b89930eb3fc7280e66e89bd773222896fa807ade6a4"; + sha512 = "146dcbef8d811cb1c295cc72349f10c8f345bd9b7c95a1347b68681cb5edd02d129f583338c0bf619b37df357fc000212894a6d28a3e833b0626bd1a62b02b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-PT/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-PT/thunderbird-52.9.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "94eabd80a87d5201c141f8d54952dcab971eb3c3f4e1436465bd9adfaf606310c8cd3b0c0fb1270260f0fa34183112ac54cbfc1734d18dde84c848b5efcf0d0a"; + sha512 = "aa60bb80a1a4df1800037a6dbde7f8deef9c4f7f1bc3926bbc5f223d4436caa62d5e9ded7eac0d91f766b35d6ae9a40fd2aabcc603e5d2276f1bf598b715b56c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/rm/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/rm/thunderbird-52.9.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "46ed5419e3d6d12d1de660c9a4d65a641f25716ad11392cfd88d0719610529f8bf92a961518d21f914dca5bff5a49a780df0c1a0a31632d13b89215e0e106726"; + sha512 = "4e109d618b6c6d9d578b90012a142d8ed8e16a430412c95e0a2567dfe7407f828ea70cf9088a4f9d5d33fe294618f052870630ae521feb0c474e76e6946d1bc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ro/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ro/thunderbird-52.9.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c842a16aa76106bec5ef16edcda149296da7b2196d78830dbf51c9b840316f55fe1fa73943f4de6aac403a45a74af0f390a9499fccbd1d1f94de23a52e0e2a67"; + sha512 = "0fbbf47332fccf2eea593f12751b5e1ec502dbfbae7e100d56906e2850191129f8fa5a51794f13f6225c2de6c219933e36074970b5b7698fcbcb58cab2abe6cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ru/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ru/thunderbird-52.9.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4165b3b55c7106bb4f4f4d2aa46d17358be96dbdabb4d3bff8913f8f7b4efb898e13391ef3dd58875b244d49ca8aad6a83cbe2208e2e6e1be851f16659570194"; + sha512 = "8d26c8c5248418cbf329c3ea6ff0fa60baf9b12110048327beb15073d2398aa7d31c97acc33d1b6bcc65e38b651d619f5a47007961ac1adb290783ad22c4be64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/si/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/si/thunderbird-52.9.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "23e9b1524451d5932701ead1b61ccfb1945b5aa752c5b686fd889c1ef1064b44fa2b96b8c5416ab124bcb04bdf21cfaa2e6ae3eb0a76997db72f91a9eeb958f6"; + sha512 = "17cfaacbafbaa98cf73f6df074c99c40faf6687576cd44315ce4360bb725d8ab0b2fcdbda08f160441449e779b3d769765063079b3fee8c0b4a366799f0c38c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sk/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sk/thunderbird-52.9.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "0cdf4d30d1e466ea9779394238ecb76937aceb546b25b6dac038060273121450643ed83b0f279e4e7f67c084d263896cf02fbc138a01c3c917c1c0d54a229cbb"; + sha512 = "d22d8d46f3a3d3206368225b7691cf4c6fa235ec1d2e2476f46c1982d2fe071909d66cb180ef2fdb81ba494e25ce3d4d20a30fa579e27c2e2327b60b5c2f44a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sl/thunderbird-52.9.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "5be5d7b380ffe2147b3194b97c9811f62b7c7315a0c6746e28f7c1ae20ab9be04c3202dbca6ee0b235479ffad1f111d44eb4d636bdd3d3f077751cde14afeb86"; + sha512 = "00a89b3dfd33979d5a7c9f256b57add0d91504a00712effa8ed3a14dae80e92aead5bc5857507810b1b99a77cfea709e07454a3834193677fbefa68db46edd50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sq/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sq/thunderbird-52.9.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "fe24594d05688eadd9ce855a7f45b6c94e596beb967359611d21495ca890e5b9a3b2d2f8cf764fb81e88c62c7dc6285837993d05a88060f08d79fc6947becd6b"; + sha512 = "3bf0024db0d43d26bec31eb40fd7a2fe42d105072663c21a5e7f8f38cd718a555d7796cbc2d28da426db01dcf003cb2c351237e67a0cc9b4b3f3cf7b6c37e522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sr/thunderbird-52.9.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9cb0ddd297e9261d4a2b852624a72370030d212cb2aab869aab117e4e21575eda635940fb55fd67cd95384ea956a180fbf5c6e3b6aa333a8907fec70461c15fb"; + sha512 = "f3e6ba6a80976bcdd37539d78829bd16344069082dee68ada14ec1de611a3e65f132431c074107b43fe855e46f15504766c9dda536c7112de081d0c450d8fd04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sv-SE/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sv-SE/thunderbird-52.9.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c17e07785d86770acc788f8f05c1d404db08ad383a92dd21698532f85953fcf9f7cf1779824076937a2dd1ca362881db8b8b7a7213db6d431fe504355a42d1aa"; + sha512 = "5eb1d2ce97320961c3d70403f8f81a36d0d686cec8cb518065d4ea950d7b2ae1588ef64a6b2276c6f8a0fc59136108a4fa50f44ed890742aea2fb77e14886b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ta-LK/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ta-LK/thunderbird-52.9.1.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "64701069778da5be5777fd12d4aa859bac2ccb229df076cc218ac4a8f07b29d614a25564d38a220ae76bdcfba874dbecf62294b53515fb6c1ba923b22dccc0a4"; + sha512 = "e59d4e4797aa96a8edfeac79bd9720f4a893c548b66efcef365a92cde1e1f9bbdd4c9046d7483a148e28f9377ca2eebda42683769fb4e02f4a56ce629596280e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/tr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/tr/thunderbird-52.9.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "99c2133c3a4bcdadd6803ee6dfcb204ae8a095edf68f7f854004844835ad88772ae1a83c92ccda717719b2c44aaf8776a2a49af2737111a6a5f1ff83a2028af5"; + sha512 = "ca29daa1d9f255e3a5748259fe632382937d51c593412e28cb6d99d7339cf5b9482ebcc0e76120d0988519538e10484187d13134c27335ea708a5a115b9bc2d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/uk/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/uk/thunderbird-52.9.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b4006430e6b08d4ceb40bb76eb0a19bf743b4c6ba39ebb4999021c4ca625228a173c6e2539ba5e711be191e8b7550e45ea7160936aaafb0a3d1b44ca7ba7dbf8"; + sha512 = "ff02ebaa4d8d9174387b7ad777e5372361567b077882a9cea84c30dc1e430e76f8cc07e14f7b32c8340c893e6aa395dbc249decd89f6facdb05ed9e2e14d34a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/vi/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/vi/thunderbird-52.9.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9f65e5447923f9f2d36fbcf80c056ede580221a8e5f5f0ba10bd5ecab354d1b35fb787f8a0f2779465c9fe78a83c8fcc9bf3a16d0f853aa620f899b48eb4b0c0"; + sha512 = "210b9f8f70ac499305e0bb66b9dfa294c4c0f6784520e8238874ea7ade9d6ef58760e3beaeb5f0ab14554fe34618cfbfb023ba5486c8ec12ba57f5e72d3fd069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-CN/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-CN/thunderbird-52.9.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "72768a3d97ca1093d381312923ac42127248c3aee9eea1c6b187a4989082b87c326c56cbea7f9c6c2dcc626e39391c834f28697e00b1dddbe22a861a1199aaa3"; + sha512 = "bc41f53a3c37e2aa7f8d960aa7d2f7b90d25971ce34eb664476c92a4b7db3753c96f22f5b0157a1298ab2b65e03b85b8268ff5fb0fbbce7aa3364fb587a17549"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-TW/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-TW/thunderbird-52.9.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "496c01eb0aed26ff77c032f03617dee5340415837a039b1b7e953d1029b91163422430742499e7a1152b171760ea06cd9fe0e538a234edfba44033f6cf2b7978"; + sha512 = "b400036ddd90488b7cf67e98b2530e4d4594637f9259f20a92a7a3c62b2f7a60ce390b9907a1b2efa44af29941938faed4e10ff6bda0c67656b8907638578712"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ar/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ar/thunderbird-52.9.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "44379cb4694512417728230fb6084fe13147dc25e832b5914eafc9f2b93c96103cf923025cee84570cc001221d8176d49752a7432792714f9dd4a0c454e02bee"; + sha512 = "1c8f71b60a0b5088d3d8b4576e02727a939a60b821aeb3015f9aa5b65231ca93b14894fb506fe2acbf579ad4686e83cf1e0d3179575a0510d571de146c4bb7f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ast/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ast/thunderbird-52.9.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "73ec4faf9c3ba21decffa60658e4db5ff22902f4bd8b65849ec98367bae8d309fafd596a17016275eb10e7ff9854315980ab87cce2d7efab29a287700d377c43"; + sha512 = "3d78cdd28deda66fd42a2981d66c765f6ff4af8a37d166712094a7959541ac6f42fabd240307d2189d7bbe24c2d850bb99d7fbca5ccc9820ef68210c3dead49c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/be/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/be/thunderbird-52.9.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "21cc3cf7392b99ab566c69bda193457cd7b2fa2e0e0aabf29354ab6be6be3c556890e630650fd18deb940a89b93f91dff8d7e0763b684e32d599b0d6747cafbd"; + sha512 = "d08e59550f24a1303c7591fd0b8028c49613b3f0fbfc9adbdf0100955e35fb2569b5159df7847cc514249b25eaf5fce71e7902fb1c13824a9eabe650fa438e5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bg/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bg/thunderbird-52.9.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7d2fe68e8906083753e6f62a7fff622e0b2a959222c9cffbaca6797f6b401777b760c99802d9f2df6a200d6d7e89c81d58872bff93358605d1d2a5ef9f6ac0b9"; + sha512 = "c78340650a7f19d14335cd35cc80938f0e5fbfc94063d600d7dd441b925dc2b6270e85369ac293f0addbbe74e10802dbc69bb76e0cec2a6af8648a5ca0481322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bn-BD/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bn-BD/thunderbird-52.9.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "18238e34dbeb90ca13cf38a0a5d9335e1ee669e7788afc0b369ca5bb2c45ae18b5faaa846e19a6089cbb098d862529003da29aada28bda0712401269e6aac05d"; + sha512 = "5909ede1236341f07d00d3dba5d3297b7bc24cb9c08d133851fe5e412638a3b9e00291dc40fd927b73095dcc9a239441b3c71ec7a5ab3210fecbd4e4a5a229dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/br/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/br/thunderbird-52.9.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d65cd714e87d2e4901fc61b9749860617200043b019cd1888b66c86de06a5f5bca8947ac97ee25695c950c82f94ad334cdfba5d5cf18351c6409849529779e57"; + sha512 = "9682db4630a840c676c0b68f010da21a65ae9f81c4373def81effe08c9c2b8759626d54e8923e6bb1381453acbac8942c4ab07f2491d3d3027e91c8fe9275f2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ca/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ca/thunderbird-52.9.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d39b1855e78b6bf24c877649e408973770a7ef244e7a95ddaa571aeed88d75225c9f3e1e8fa6b3440c7480a57d3a0cc8ac63343af13f6031f4ddbc4e649ddd78"; + sha512 = "3937ecef0ad33e43bc8822bb22f8c3398d51b37278c195dd9b4f4ed9c5d49e53cfb79c9a0b1c684a72735d44dd7865097b716268e7d6280b70e46b219b87302e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cs/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cs/thunderbird-52.9.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "bda0e525a980495ed72bfa9bfeb7f0235d8461b9ce057d8d7f4e5334348153e6c410abfa9b0f75946f3100a9693b0363cc8e4f542e834b1b15b2acb7b8fed1dc"; + sha512 = "88f958ef60ac5b73fd29ccd40d9e2794dc8d57df2c15f426aa32a5d605d6b4702e2350003b394d19ad13fe3215552070947ff0ab2851698162946221b3ff1a88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cy/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cy/thunderbird-52.9.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "29e1f5e0bcb60d1eba274103c5f94b60dade1d04eeba3bfc684ec9aaf4f9750b0970badf94bbb3db7f575d82e53caa929584168e4663019a382b942a79636df7"; + sha512 = "0301925a7378a706ad12225aad4d10ff15962426c02a294b1e9ea9e1f779c429bd2994c964d4f05048b371b71f0c6c0ab1b37204b242990b931a3a774a05b04f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/da/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/da/thunderbird-52.9.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ca24d47fa8c71c9b182cb31998b72ce63ee82f8c4377090f155a3155988759e6be8e8e28c8e0f0217c4318c87c16ffa34e638bc27d06f5ac41ee2c6171d16fdb"; + sha512 = "960996c312b862bab9447985e1cc9b1f09a61989e538ac3eac2a95b06496102b5387cfe1e762128f1b521844f4515335f4ad4bd9078771f9c2245159eb39a8ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/de/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/de/thunderbird-52.9.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2d820c628683710a3d5fb69212dc51523c867def469c7f5c4a15456d99e22988143c7804ec3692ba62e61628657abc286785925a94a1358c79ecc623f0693336"; + sha512 = "3ab75cb50218db215a1c7d4c39b6038ea3dd52ebe17b5d3fb0cafc74a02dba143d6e4c0efab7c6c1c494ee83297878d82355bd4639f6aa1625be3af5f0b514a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/dsb/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/dsb/thunderbird-52.9.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2f97cfd783405eab580457311d7faa24c8cf6956cc62a60272b60b21cb68ccc35fabb0964dd97786537e784eba7eff8d67e496a242e9edee2fb6f95891931592"; + sha512 = "157b25d20020c4159708790e50b09eac2b814a817655540abf878910b53ac2c1040790e8aa115bccd54797a5068954b08daa5c28f70c7ac161eb2be78f82cedc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/el/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/el/thunderbird-52.9.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8ca85b4c91b07f914c805d020ab4424a3ecd443c86c52c66cafa6be16ec344b025407b7e52d0a6d240da1e8d9470dc6237b7a93e835f9fa6dc16b33b45de3807"; + sha512 = "52c0be75e9979a08f1335da437cb47fc17cd928fbea5af85283b5d07f07fdb4ac6e2f924d53f7db9e31cc0b9e7659f48f8d6e06a28d609760a0f8e6641bc96e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-GB/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-GB/thunderbird-52.9.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7a51412c09c78bdfe03484db0bf7a274f5cdfe6c352cfdb710abecc56b2f203c782a70d4212b22602f61546a564c65b1341900a80a6d537074d8877479dca222"; + sha512 = "53e66c5e9c98a6af311732341073b553c577dcfe35178996c7a27ee0cc0dddfc7774a065fdebbfa0a4cd4f6f3f422e9fe67fac07a586342e9dde33b59d6bd17a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-US/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "fcd2d06dcd49a5b60284e0a370bb0e5cedfd01dbc06a9057a8063a0e84abde6a6c7a7779bc60e475629a33645b70b718508bbccfea76ff1e6be42c0052eb0e45"; + sha512 = "69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-AR/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-AR/thunderbird-52.9.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b41eac5efe305b395237de378b49d33e1804661ddef3bd321f08a97bb8ab437299a899e81bdd5230981dc6119de45902ed1fd961cbe02570b2545ccba58f28e9"; + sha512 = "e557b6249af266de41863b49a811f4c5c979e88dc15ccce6fe60694b98dfd9f09d8ae7316652626c19e5379f20b27e58f4f1be465f4df896a3aab693cb0ef5b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-ES/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-ES/thunderbird-52.9.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4405a7ca6b8809223ac6d441a52183687df9d016cb115dac10e4d78f0df4af4f41daf2c95544948f119cc5977e3b749be919d66f14049221aac50c81d2007847"; + sha512 = "779d6a4a793f4bca441f8ed8ffbeabf20a7ba8555b0fa36229814db68f98d35dd15855446c7dfb8aa9509b40dd5cbabbb0ad66a604d6205daa9fdb4b1a4b9295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/et/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/et/thunderbird-52.9.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1c6933a054068f2a027e9e50200da3398d94152a4decf74750e3c8121103a628f6762c6867fc465216eee8dcec74ce8a06426b7ea668e6e157d00ae6df5c1aaa"; + sha512 = "7da30d3e48b520c74562d11719d1988ad94cbdf676f244ffd9527475f696b54f50a1e14905a045b7d5375e1b99ba3d0459acac1e72d22ada24b0e91e74e7c2cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/eu/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/eu/thunderbird-52.9.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "aa54aad06cee5d4a6130bb5269fd649157a09f377c10c2f3aecc24a88a48ae2ba4cd3d0af35ccb9a7cb5a54097bf19eec31ac23d652236a0e440c54468672a99"; + sha512 = "d8c50713410ee2fe8896e603cba9e04685c8dd277aba9dc2270a2e0d282a609e1feab44398007e9aa96cc0e43997598c6aa702a231d568dafa7f96a8be548e31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fi/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fi/thunderbird-52.9.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6dc8d8c586ea6fd23fd5c5438c650f39e7fb441ff30f1ef541a1f62a3e39b58fa154b50298df6585d5f4a2451b8d660d620fae4a9d3812b50270cc4e2b6cde9e"; + sha512 = "215394b3f4cab3b44d337adb56308b432c62000a592b9ee3b8e985636a6f3fec9189de64c9aba32ae1753b0ea085dca312b1696844aa658356ca9f96a0b7f255"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fr/thunderbird-52.9.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "106d63fd73482886682e02f222b7907f130485c14ae8b2f6196f380828a224726d53e1ab0b9d6a12044fb62168934de745285a686ccc8e36bc78f4988cb3cee7"; + sha512 = "041c325d7015725fd81c31a1709017ee3091321187c39f84173fa5fa9c963a111e3a3bd0eb85f63a246c5a101e94d536bd0cf4a5d22b6e6bbd5fc284dcb3c965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fy-NL/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fy-NL/thunderbird-52.9.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8ea82bc44e837e38f01fb3ae6310a9726c8ca2a8b1bd0a6f1eef9c5d4b83fe3d2ae62ae12e0aa5466dc591f1f566339b50fc03d77cbfbba2701784affd597585"; + sha512 = "6f18bf01a6ca108f13b02b8cff1175640efd9c945827f28301c859858b47f238db7a5481a495c18ae5fab2639e8e3799441e0690ff52dd03d8772ca41f03c641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ga-IE/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ga-IE/thunderbird-52.9.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "16d4de4df7ca43ff7b66c362f82ff2b9970e8a835042cc3a3725178c1d31459c7a41a2689f23640996317b7d3af6f7b35b9335f48c28e75144102611ce6c87b7"; + sha512 = "da5509e03c4ecb8f8ab4e6e5c23218af04f4415eec33f62b5f9a48f5d7bd6cbd4d7c583439ae6fe71f009f4287a9a02b188c37a326e3a0683654c766849d25c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gd/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gd/thunderbird-52.9.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "121939eec9f61b07885d68bbfc864e24ab57be48f70ec866903ada1a8e9887169dc0d0fdb62ec7fba71d0d36429325cf1ebdc29d02bb38fb71a41439c4290411"; + sha512 = "56b1ed5fd7f63e68ee8ae7d291ebbca6881ccbb9c0481430dac23851ac4bd23ec98ffb93ba846f58d216094f55781ca2197717dcc21427dc3873f6e992b67032"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gl/thunderbird-52.9.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "7fc0f727d1f5d99c2c1d6c30778b949d0304ad614a2323ddb034e4f49e8647d600f3c3bd40a0879a08945a27025abb43cf3af453f3506e7cce9790e80450555f"; + sha512 = "5a6bbd8729b1c263bee0e31f544b2137a0166e07d6ebf015573e8da51e91735c467c065ab40e2c330c62a0e9c86d2b2cb302949234d746c7c743f6864f3eabe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/he/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/he/thunderbird-52.9.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "bc792144bef2e87958e8773caef367750ee5dfa005d494e0c4f328c89de7555d3d3f8e19085551e5cc2aa06af06d5da698582c7b87b73b15d0fdd5e66daf566a"; + sha512 = "90998ad6963a3258a5790caf4d36a34348fcacbbf9ba9ef87a8aa8ad1fde35bf146835434754f9421282ea1e36084660d149f28b75c8d422b84232d420810a35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hr/thunderbird-52.9.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "56a4e35b53c319b8e639c79ff9edcf6ce62c43d338645ea8b39f41deecd3d4fb4b03d6c3356f1875647dbb69b411eb28fb905a3434765b4e42bf0291c42bfe20"; + sha512 = "727f2ec4f04b32adc2a2dd1b9e5af6de0963334abeeb4582a68fbacaabf7720251a3d5280fd7b1d8e6660747b5ea9ffc94a658d1d95651b8d3a232b15437fe23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hsb/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hsb/thunderbird-52.9.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "caa5bb1686a19ca904d55b5bf5de6760b1403df535f92e061e48720bfb62f7a3b6e8e0af690817b636774b0d0323e92393701aa9689c375c71545e7a56f93af3"; + sha512 = "213cfe86cf7025f76dca4af15d42d5d9fd676411d8fd64069f82ef34de7ae3de6208b0ea21c77604e6c19b9c015b9c4fe8de783de625a4345bb69f2a69a6ea3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hu/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hu/thunderbird-52.9.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d1d989dccf98f5db87ca565b33bf1d8278c4bef0e88a57f5465b1ec77328c9033bbae12b92115a9e431ae86bd33042e02f7dbf1933a70e3f0daadb13ca5f96ba"; + sha512 = "97ad1bc5c2c29e7fac01832d44337c79b05e3ddf6dccbc41caece5c249f9ab46ca0a9ae469d0b5a923ecbd43ec4f910b70af81010d9f9b8f35a9741efbc9bc6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hy-AM/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hy-AM/thunderbird-52.9.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6f4e519dc51cca5fba623e2883d72337392a831e837f294ef0359541e9483a8ef9ccee9065867482af92f57a230ae40bf38cd8cceea56c8a430a0735b5ec5f02"; + sha512 = "7738216dd50fc7a837080770fee652db2091a156623097f04e038a94c456e334af4939973960593ca915da14573263668b08dc7359e3d5a77ddb6c89c18c7efa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/id/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/id/thunderbird-52.9.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c73238c614ccabc55bd231f1337cb9c91a38f25a6a3c5420ee278a68d4b00eb56cf02f9cfee4fe52457762ffe4826a441cc25f5868bdb3c8afd81857f74c19c4"; + sha512 = "bef209d87eff0a4ba061c50c1a20937e6052941e3655d92c17eccd79657542db5a6deb68fbb2b25b2c0d5add872d86f4414b761c4f167c289d58238e21dea59e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/is/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/is/thunderbird-52.9.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "187fd5bb383d775fdd00bd558aadd38cacbcf14066b6e0db50e0bb72ea2abc4e3a123ec2e33b12895d7c1ab6911b75949e3216beb06b044294b1f92f9ff336d3"; + sha512 = "7f939bdca0369eb70a47d8df6f3e453a9b5472f7f3c78bce73380d6f72ec46c74bceab5087ecd4f4516fd0a405a6c70ebc19295da819e037f553f688df33b213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/it/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/it/thunderbird-52.9.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d4df787eab69c8a342cc48698d1c329a6e2feafc634d297d20d451b15bc8b7843a4dc7fbb39bdff24fd1720d387e101dda01dcd8a7fb5570d70016f1a98bf486"; + sha512 = "289a0db383c7d5ee0fc064867f8821c7f445facb37387229289a1f507174df7cffb390c19bbfec438a4e20c727769688f64000e0e2fbf17273fa21419c770070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ja/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ja/thunderbird-52.9.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "22cd069e4b1a1326888aaeff5a74d73d84ebacc160717fc8fa046ec3d011f082053ac7110870284e61931808c447ae54b40acda4b3aec2d267f572220fafe492"; + sha512 = "5b9920d334675cea0d603cf2eac923c55f234af5fab69f0002f3a2ae0afbb0a003e8f228448d5485d14543b65494ae7f5add6b28305bde1fa8a4792102d948d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/kab/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/kab/thunderbird-52.9.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "acd50322046c5e42fdebaab02f565e7c716e83c84a3813dbc7e957fe37e9c01a02c7574486a6296eb2080744c1798a1b02ab993218d56f277dd7284d557b29fd"; + sha512 = "6ad1cdef0c168d5a7e4d1e26f01354f12c7249440319132fdc07398a395074916576b7047762c231b05b039fa250c5f2fd4e9f6f85f85d2626fcd4fe58ae64b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ko/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ko/thunderbird-52.9.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "71e85afe9b8b7f8c2eb96f014b4d2e55272fa458d088cff90b58506be8100ab43fcff9ee5d8a2faedc4be30d8afb0bf40afa4626455c9b17d8f0ceb61708d1d3"; + sha512 = "090a467a7d8ef9f3ba759684cbea8625624f5481b890bd47098e7bbc94017934457cc2ec0a7225f6486a537860c08f695cef60c3ea4bf32b1937c87a66c66c7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/lt/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/lt/thunderbird-52.9.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5dc9f270212862ae4dc0e6e0e10229ee6e3ad83720f7ba9fbbf604bc406114d16775d087a3209c35471218e7bdac8fea348984b7d8501309b4b7d39dbf95f0b0"; + sha512 = "cd0190ffa07115f584718eb8a6c9e94dbe0c883ae48e5f4d5a86caf8db599d37d8e47d2402bd35625c0fdf752194d86a3bfb6a24f3010f0db2e5fcc5aab823fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nb-NO/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nb-NO/thunderbird-52.9.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4e187c7aef208e00c80632a075d649cd1dc4d2ffe8847fe32df78112d81dc98b5f665bfaf9d63911d389a2a24fc6fc4581ca95023fce05908fb9062c6d287923"; + sha512 = "6efb9bbd8f0fee9ab584d2b78425bf89d4dac2b2e7c1da745b922202691698add874b1b3d61b93a17de6256851667c25e7f13cd62591e7a47102c3ac07f8bc1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nl/thunderbird-52.9.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c0c15136ed4865c76d4b0ba24e7dcccec4c50e3706a770c6adfafc94a119df33bab7643d7cc6abdb85f37d4afdada5d5ad556b91ec3111501a2a9fd93f37ed54"; + sha512 = "ff2860ebe75ae4d542de0f9d7d7351140097367db16728054a97ae23d74c1c357d02bcbd4e05f0f98364ee80fb6054ae7cfdf60307d43da198b2bba20b17bd6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nn-NO/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nn-NO/thunderbird-52.9.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2ebd9d8c516d506fc7454768a71d0ec5fef6e766b285ddc46d97041624df8688eb6aa6cdf5082911c0d338e1293d73f87dd411081c209c4e4ca7f390d61040b5"; + sha512 = "96a61cbbeb647820e92c268d2a6ffd1578e56a8517a415689c97548f3d218fb26711cd737d6fd682127f9704a6f4ef11f0722620f8ed44379e08cef3945f727d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pa-IN/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pa-IN/thunderbird-52.9.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "9a8b43faf81d0e12b0a36af4f3bee1e360c09a8612ceb7df8200763f2e2c8c99a3e73551c4954359dccd9d393ba190f0d18904e59658272f93a8cb8ea6955d44"; + sha512 = "83dbd6b5d49ebbcb7b5fbccb0c120b85adaa6085664416921bd06659deeece1a7d27bcd567a47322e81da4793da62c8b54e4f6a751645e8c7add0c362b473d84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pl/thunderbird-52.9.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1323658b75438e2e473b34c810aec9094f2933af2c492cdfa0617ab58be5a956226640998241835d5c39868bf5d0a4ce176cd0e9b59e70a519649c858362c769"; + sha512 = "dd2bc656bc7ab1e21121eaa9903c63056647c31da6fa55c816c458684235559a2b2d9668e200e73f54e9b7c34bb6d0c905c0a31c6153494e16131f7e0ce9c9ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-BR/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-BR/thunderbird-52.9.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "669d5583d94692786bb4719d2a6428dcb52733811439636c6aa0f5a18a10804824cb9f158bf45d9f82c8a6317c2950c4da3d1391c6a0096ad13745ba95c5506c"; + sha512 = "83c09f9b314ff82ff59ced594709eff7a0d55c9a7f1c064917ebc3820946ef69aaf509da79cf447f618b3afaab648e4990797724c671ba850655559190a1647f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-PT/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-PT/thunderbird-52.9.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8de8b7bf494cf9ca9132b98c53659e8238db06df60449858cbf53e129eeb7640e26f7134744a031aad428bf1440e5339aef36e45b1a93b6250b130401ad68bf8"; + sha512 = "bf6c986e8b43f725a1541c0ac7c880384be40f2c90ffc87e598c177644bd32b2b07bc56be58c2db4f1aca64c4c6590a30199d9f93b7a5fd2d52a9d916ca309f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/rm/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/rm/thunderbird-52.9.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "de74e4afa564f0caefde8ddac66bfd41fb2ea0be2f03fe7b83cb1abb0fef184391a10d0993c680b56cecd282176e6d499101519a785b8f58e92ef0d0e0edb123"; + sha512 = "3f07918c0f7ae7117daccd382220aea3e132fa759c25948883c1d97b936e4302fbe6fe176ca4c109f9a35c580d46a7578561c2d2909364b5e915c66d80308cd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ro/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ro/thunderbird-52.9.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c4a9305420bc835840a319b334beb4ab45de7e509123b1a5d60466ecf4ed237153caf0d4f4fc75dc277de25bc8d05d017dea730b50cc977d5397a2466d8dfd5e"; + sha512 = "5c0a230ee4d49e6c5d6234480f288788a0b01bea44f85e29f336c5280cbc507da30e681df26938acf8f7d1b67ddd52fc5082d1019df0474ade399a27f1fdff26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ru/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ru/thunderbird-52.9.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a16338cfc3d8f6b5dfbbbfd846ace944791bc27414ebd7c9e429fb4131f988cd6fc5d33ef21c1b0b19b7ef15c3aac134dd4566a994f39609429fa35a85c77238"; + sha512 = "43ac720dedc608f49107d29119d699c9c1ab4e7d0f62608e44ba4ae55f9c669d5adacf9e11e7fcdc9e8dcddaf87b1a237202e3a6805a0cbaf803df28ddff13ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/si/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/si/thunderbird-52.9.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f45e41437c28dac8ed5ca9993128973a7ea8026b49147aec2f338722f06e6874bdedd62b08df00e0e7ef66b23d174374852e5d621db5354c78f8d22bb4382bf0"; + sha512 = "338af5daa9c2ba21c47c0aaa449172c3ce315fb8c1d04e522ed77fc986d539c2c15ebe5bda80688d568fa3671b3e32579b00fa4c834c0950db5773109e7aae7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sk/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sk/thunderbird-52.9.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "cd5ba98037c0429f36a82604cb7f620a41f536fb4941b3f39ec730668ce9c11ff89dbf3aa900dae6541b263ff602372cb9456c6da6c084e4e7f90d883153070e"; + sha512 = "30e69e3c3252f3fc2bf8a9efbc19ece01728a8a79deafc42bcc5dfe92d15174816e510a9324e950cb3135f84bdb6587d00eb31a330b94dd330eab0cf35342724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sl/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sl/thunderbird-52.9.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39a89eb8b69b1ecdb815a95e423487c67ff381a0200af57ec7939be6f10b9c4219df1c0fdecc814d85f1fb60f37b039e283fdc4060cff5a2481dda425d847446"; + sha512 = "0bd8ff9143652e5363a7c5e1fca0d0694c3891f83c63b2c3c06d4fac245efed31bdb486cdc41f4c5a615fcb1d1a502e6cbac3bdafa7d6e906f19ae6bd215fdc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sq/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sq/thunderbird-52.9.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d21440caf9fa0c70fcd8f9af1110fdff1dd2674fc0774712e8aec182c3e7521992b64ee079b88a8834afde689abe9f64429ddbcd2935eb07191db2a6bc454e44"; + sha512 = "294d17e1b5157fc7e168cf29bed2c9750775f6913375e745a66fdc7d70cf7ed783b7cf731c5090cd38803f60b0839e76ee4f260c248b73b675f4a78e5e301bab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sr/thunderbird-52.9.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "42101562502934485c11324ac63d13a3e0a0ee5044f36b6d5f938197c8932bc4305333744079313f6570c350936d2f79e122a3764dc73d98051dc9fa5805b13e"; + sha512 = "93f8a5c9e17ae9f577ee9746849fc46158e54d6bd550b5ce20e056707b3c05361f717b40637e1539aecc95f223318dd4311aff34dc511dee8507bf2622cf883d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sv-SE/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sv-SE/thunderbird-52.9.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "0bc5cf65d0d3baecc6b611107b595422dce5c7fda51465545a730b7499bac7419b8b914a9731fb54a3e197bd150d87954c94281a0942d0a1f44b1e39e2312bb8"; + sha512 = "3555a2d623ece9921bd6acbff45459da7a51de28494f0915639c76066b3b3bf91279716f2c42b5e5d78d09216a6fe6f5be88ab4dba1d2172852ca51d93a634b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ta-LK/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ta-LK/thunderbird-52.9.1.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "c326294f7d0d6b016bdd468b9b24a87f2a874f7773388213f55e9001f4a7b0fe1c21ffaf08efdb9286590308a413b821a61c567e79408d5e9851299b992366c7"; + sha512 = "203bb717b4fa77522dcee2a85cf0c0d8997abc6ac565ad908ab4eba8f7bb37e848fb94a0526c0fd8360569c9cf3c98cb82196e38cd930b11d82cad6cd88d8f5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/tr/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/tr/thunderbird-52.9.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2b850e90127c7dff0bc4a937a5a1fcdeee0d855be1cc484713db210d7e1fe6991869841da79dc859e9b01528a3c5186965fdd78b4b21bf14714af09caffa2acc"; + sha512 = "214b140e3c18a2fd4b936558f4bb80441bec9d2afc79e0a949365d2e20b3fa1a092aab332b307c674b7a1cd3822e428459992fdfa5f56b534733021e5fcc11c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/uk/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/uk/thunderbird-52.9.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9e249bf0cc84218c5e59a0e4f026650975a49ba1bc49955802d86e348fca437619455e90472a6e75b3489f8a5c13f8dca44567a5b6af4bb709500600ba44be7b"; + sha512 = "28a003f1c5c0135a978187e68779500caff1eed42b4da846cd2d5025835fe80ac6ef9cb0424d4a4bd339680666d9a2ca2526b46ffd9ba6b5b0bb725c5c4a7e71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/vi/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/vi/thunderbird-52.9.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4bfd348a419e59a4c1665c99122e9b8fb9d768b7fead8dc3f5576bcb7d24f915da243f6fb31a233eec07894806807966c07234add2d8a48a6439c488358f1c95"; + sha512 = "e2e79d972802b9c9b6319e147b741814f63dc7c5ecb663461483a5fcec45184c9a245752486f4411d961cf7d4da3ad41aeeb52364605ed78058bf53826fb0667"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-CN/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-CN/thunderbird-52.9.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "caefc3ff5cf38dd792daecfb2c6c5c8789ba4f5cf5e965b5e542b7b9605c8c89a2a3d86a330aa497d5984931f9b4daaedf4fc0c8bd9d16c42f2d3fa973ee8967"; + sha512 = "05554421534038c4a02cefc68ee9e116d15aa8b607be06de2be7cb7ef794157f6b01533f5a670d739284632faea10b374ad6912f6c332ca4fd5f0e8d0346efe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-TW/thunderbird-52.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-TW/thunderbird-52.9.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "df930968d97d74ae4ccbbb10e83c65e59254a4669887b5ad5aa303903ad0180a61ad9e7801817d3a6994714004c6391f96ff0335583ed344a8881c9b3baf55a4"; + sha512 = "e2b3081e08f87891a0559456fc74d8d3647d49cd14176abd5155aa8ca5d1e1394638386c6c27b433e581d539ac76d151e37dd4942df2e8646134a0218ef54e77"; } ]; } From a1151359dd2dc7ca3e842aa968c5bbc49e8cec92 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Jul 2018 03:12:46 +0900 Subject: [PATCH 03/99] thunderbird: 52.9.0 -> 52.9.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 43684c89730..92161164485 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.9.0"; + version = "52.9.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "30jv4r8yh270dynqiwlc0yf52f6bka366l48rsppz5nqdb9jvxz04vghhcrp832wrmhd9z6r4b09yb1syhg7n3sl7zsjj2gq1yblhi1"; + sha512 = "0ipvhllvlkcjshf2h938d531wpgnhbvdw1k088iazqamb3vrspxpfb4dhfrxvff995nym0gs7j5wa6bjd36nm4wajlabs5i6r80ms0d"; }; # New sed no longer tolerates this mistake. From 6f72b636019031de5bca89c63fc1a00a8b3d0768 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Jul 2018 20:26:28 +0200 Subject: [PATCH 04/99] nixos/nixos-option: don't abort in case of evaluation errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running e.g. `nixos-option boot.kernelPackages` I get an output like this on the current unstable channel (18.09pre144959.be1461fc0ab): ``` $ nixos-option boot.kernelPackages Value: *exit 1* ``` This is fairly counter-intuitive as I have no clue what might went wrong. `strace` delivers an output like this: ``` read(3, "error: Package \342\200\230cryptodev-linu"..., 128) = 128 read(3, "ux/cryptodev/default.nix:22 is m"..., 128) = 128 read(3, "lowBroken = true; }\nin configura"..., 128) = 128 read(3, "you can add\n { allowBroken = tr"..., 128) = 128 read(3, "n)\n", 128) = 3 read(3, "", 128) = 0 ``` `nixos-option` evaluates the system config using `nix-instantiate` which might break when the evaluation fails (e.g. due to broken or unfree packages that are prohibited to evaluate by default). The script aborts due to the shebang `@shell@ -e`. In order to ensure that no unexpected behavior occurs due to removing `-e` from the interpreter the easiest way to work around this was to wrap `nix-instantiate` in `evalNix()` with a `set +e`. The function checks the success of the evaluation with `$?` in the end. Additionally `evalNix` shouldn't break, if one evaluation (e.g. the values that contain a package set by default) to return additional information like a description. With the change `nixos-option boot.kernelPackages` delivers the following output for me: ``` Value: error: Package ‘cryptodev-linux-1.9-4.14.52’ in /nix/store/47z2s8cwppymmgzw6n7pbcashikyk5jk-nixos/nixos/pkgs/os-specific/linux/cryptodev/default.nix:22 is marked as broken, refusing to evaluate. Default: { __unfix__ = ; acpi_call = ; amdgpu-pro = ; ati_drivers_x11 = ; batman_adv = ; bbswitch = ; bcc = ; beegfs-module = ; blcr = ; broadcom_sta = ; callPackage = ; cpupower = ; cryptodev = ; dpdk = ; e1000e = ; ena = ; evdi = ; exfat-nofuse = ; extend = ; facetimehd = ; fusionio-vsl = ; hyperv-daemons = ; ixgbevf = ; jool = ; kernel = ; lttng-modules = ; mba6x_bl = ; mwprocapture = ; mxu11x0 = ; ndiswrapper = ; netatop = ; nvidiaPackages = ; nvidia_x11 = ; nvidia_x11_beta = ; nvidia_x11_legacy304 = ; nvidia_x11_legacy340 = ; nvidiabl = ; odp-dpdk = ; openafs = ; openafs_1_8 = ; perf = ; phc-intel = ; pktgen = ; ply = ; prl-tools = ; recurseForDerivations = true; rtl8192eu = ; rtl8723bs = ; rtl8812au = ; rtl8814au = ; rtlwifi_new = ; sch_cake = ; spl = ; splLegacyCrypto = ; splStable = ; splUnstable = ; stdenv = ; sysdig = ; systemtap = ; tbs = ; tmon = ; tp_smapi = ; usbip = ; v4l2loopback = ; v86d = ; vhba = ; virtualbox = ; virtualboxGuestAdditions = ; wireguard = ; x86_energy_perf_policy = ; zfs = ; zfsLegacyCrypto = ; zfsStable = ; zfsUnstable = ; } Example: { _type = "literalExample"; text = "pkgs.linuxPackages_2_6_25"; } Description: "This option allows you to override the Linux kernel used by\nNixOS. Since things like external kernel module packages are\ntied to the kernel you're using, it also overrides those.\nThis option is a function that takes Nixpkgs as an argument\n(as a convenience), and returns an attribute set containing at\nthe very least an attribute kernel.\nAdditional attributes may be needed depending on your\nconfiguration. For instance, if you use the NVIDIA X driver,\nthen it also needs to contain an attribute\nnvidia_x11.\n" Declared by: "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/kernel.nix" Defined by: "/home/ma27/Projects/nixos-config/system/boot.nix" ``` --- nixos/modules/installer/tools/nixos-option.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 5141f3cd51c..3f1e591b97b 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -16,6 +16,7 @@ verbose=false nixPath="" option="" +exit_code=0 argfun="" for arg; do @@ -74,8 +75,13 @@ fi ############################# evalNix(){ + # disable `-e` flag, it's possible that the evaluation of `nix-instantiate` fails (e.g. due to broken pkgs) + set +e result=$(nix-instantiate ${nixPath:+$nixPath} - --eval-only "$@" 2>&1) - if test $? -eq 0; then + exit_code=$? + set -e + + if test $exit_code -eq 0; then cat < Date: Thu, 12 Jul 2018 16:08:13 +0300 Subject: [PATCH 05/99] percona-xtrabackup: 2.4.9 -> 2.4.12 --- .../backup/percona-xtrabackup/default.nix | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 6899ba88a22..a1c53dcd97f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,41 +1,39 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, boost, bison, curl, ncurses, openssl, readline, xxd +, boost, bison, curl, ncurses, openssl, xxd , libaio, libev, libgcrypt, libgpgerror, libtool, zlib }: stdenv.mkDerivation rec { name = "percona-xtrabackup-${version}"; - version = "2.4.9"; + version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; rev = name; - sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost bison curl ncurses openssl readline xxd + boost bison curl ncurses openssl xxd libaio libev libgcrypt libgpgerror libtool zlib ]; cmakeFlags = [ "-DBUILD_CONFIG=xtrabackup_release" "-DINSTALL_MYSQLTESTDIR=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_BOOST=system" "-DWITH_SSL=system" "-DWITH_ZLIB=system" - "-DWITH_MECAB=system" - "-DWITH_EXTRA_CHARSETS=all" - "-DWITH_INNODB_MEMCACHED=1" "-DWITH_MAN_PAGES=OFF" - "-DWITH_HTML_DOCS=OFF" - "-DWITH_LATEX_DOCS=OFF" - "-DWITH_PDF_DOCS=OFF" ]; + postInstall = '' + rm -r "$out"/lib/plugin/debug + ''; + meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; homepage = http://www.percona.com/software/percona-xtrabackup; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52db70835f..74cdc46ff57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4364,6 +4364,7 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + stdenv = overrideCC stdenv gcc5; boost = boost159; }; From 47dfba89d18db76ee2f95905ee23e3c7f9d3f8cd Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 12 Jul 2018 22:22:48 +0000 Subject: [PATCH 06/99] s4cmd: init at 2.0.1 Tool for interacting with S3 buckets, with some performance optimizations over s3cmd. Skips installing the bash shell completion scripts in /etc, to work around: https://github.com/NixOS/nixpkgs/issues/4968 https://github.com/pypa/setuptools/issues/130 --- pkgs/tools/networking/s4cmd/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/s4cmd/default.nix diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix new file mode 100644 index 00000000000..20f129357df --- /dev/null +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -0,0 +1,35 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "s4cmd"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + }; + + propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; + + # The upstream package tries to install some bash shell completion scripts in /etc. + # Setuptools is bugged and doesn't handle --prefix properly: https://github.com/pypa/setuptools/issues/130 + patchPhase = '' + sed -i '/ data_files=/d' setup.py + sed -i 's|os.chmod("/etc.*|pass|' setup.py + ''; + + # Replace upstream's s4cmd wrapper script with the built-in Nix wrapper + postInstall = '' + ln -fs $out/bin/s4cmd.py $out/bin/s4cmd + ''; + + # Test suite requires an S3 bucket + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bloomreach/s4cmd; + description = "Super S3 command line tool"; + license = licenses.asl20; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c3109df6d0..6d7f5ce0634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4912,6 +4912,8 @@ with pkgs; s3cmd = callPackage ../tools/networking/s3cmd { }; + s4cmd = callPackage ../tools/networking/s4cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6Dns = callPackage ../tools/networking/s6-dns { }; From 0761bdbc291ca1f0c7f4795b7245607e8cf09426 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Jul 2018 20:42:34 -0400 Subject: [PATCH 07/99] lollypop-portal: init at 0.9.7 --- pkgs/misc/lollypop-portal/default.nix | 60 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/misc/lollypop-portal/default.nix diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix new file mode 100644 index 00000000000..f9cd9ae7df5 --- /dev/null +++ b/pkgs/misc/lollypop-portal/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig +, python36Packages, gnome3, gst_all_1, gtk3, libnotify +, kid3, easytag, gobjectIntrospection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "lollypop-portal"; + version = "0.9.7"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "gnumdk"; + repo = name; + rev = version; + sha256 = "0rn5xmh6391i9l69y613pjad3pzdilskr2xjfcir4vpk8wprvph3"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + python36Packages.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.totem-pl-parser + gnome3.libsecret + gnome3.gnome-settings-daemon + + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + gtk3 + libnotify + ]; + + pythonPath = with python36Packages; [ + pygobject3 + pydbus + pycairo + ]; + + preFixup = '' + buildPythonPath "$out/libexec/lollypop-portal $pythonPath" + + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}" + ) + ''; + + meta = with stdenv.lib; { + description = "DBus Service for Lollypop"; + homepage = https://gitlab.gnome.org/gnumdk/lollypop-portal; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4399955ee6..3ffab85cb61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21204,6 +21204,9 @@ with pkgs; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; + + lollypop-portal = callPackages ../misc/lollypop-portal { }; + openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; mailcore2 = callPackage ../development/libraries/mailcore2 { From d2c2f34c44889ad899568261d22b75a6456645a4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Jul 2018 20:44:50 -0400 Subject: [PATCH 08/99] lollypop: remove easytag --- pkgs/applications/audio/lollypop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index d961393f9ec..96e1c504373 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib ] ++ (with gnome3; [ - easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer From c283323c1e0ee783a85d92ddd1bd72bba2f835f6 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sat, 14 Jul 2018 01:38:41 +0400 Subject: [PATCH 09/99] chromium: 67.0.3396.87 -> 67.0.3396.99 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a1aba0da2d6..16873ead34f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1jfhdisp4j6rrb8zxj2am7vlkjfbwvq1si7cacjwfy624hlhxpxz"; - sha256bin64 = "0j3aw4zyg0alizgh73dp3fz8f6y71srdkycnzjm037p3p8m364j1"; - version = "68.0.3440.17"; + sha256 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4"; + sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp"; + version = "68.0.3440.59"; }; dev = { - sha256 = "0acgpi7slwvq5lxaagmn57a6jpz508hwa690ypny8zlhsiaqlxaz"; - sha256bin64 = "1vjmi9lm8xrkhmzv9sqnln867sm4b80y2z3djz7mj05hkzsb0zr9"; - version = "69.0.3452.0"; + sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg"; + sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8"; + version = "69.0.3486.0"; }; stable = { - sha256 = "07fvfarlzl4dcr0vbklzbg08iwvzfkczsqsg0d1p695q1hpsf9sx"; - sha256bin64 = "1c2xn84vs1v7gph7l4s408ml6l6c7lnlg4z2vcx20phxmlsgs1xg"; - version = "67.0.3396.87"; + sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5"; + sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3"; + version = "67.0.3396.99"; }; } From 2a7aa43c164cfe53d04a448b37447d3a4bbe9cc0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 13 Jul 2018 23:10:37 +0000 Subject: [PATCH 10/99] bazel: use per-user tmp directory to avoid conflict with other builders --- pkgs/development/tools/build-managers/bazel/0.4.nix | 3 ++- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 7fa39ef2162..69f467f577c 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + export TMPDIR=/tmp/.bazel-$UID ./compile.sh - ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ --genrule_strategy=standalone cp bazel-bin/scripts/bazel-complete.bash output/ diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 112cd840a9f..48b68e9cb00 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -483,9 +483,9 @@ stdenv.mkDerivation rec { # Change this to $(mktemp -d) as soon as we figure out why. buildPhase = '' - export TMPDIR=/tmp + export TMPDIR=/tmp/.bazel-$UID ./compile.sh - ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ --genrule_strategy=standalone \ --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix From e3d6f6f202742777e527b55390598ee403b44028 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 14 Jul 2018 15:00:02 +0000 Subject: [PATCH 11/99] processing3: fix crash under XFCE --- pkgs/applications/graphics/processing3/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 4ef078fdbac..87566950bfe 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: +{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -37,9 +37,11 @@ stdenv.mkDerivation rec { ln -s ${jdk} $out/${name}/java makeWrapper $out/${name}/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 \ + --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 ''; From 06ec2a9f196be3b431b05bf955da32efcce71ce2 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sat, 14 Jul 2018 01:40:18 +0400 Subject: [PATCH 12/99] chromium: fix 68 (beta) build Also replace openh264 patch with one landed in upstream. --- .../networking/browsers/chromium/common.nix | 7 ++++++- .../browsers/chromium/patches/fix-openh264.patch | 10 ---------- .../chromium/patches/nix_plugin_paths_68.patch | 2 +- .../chromium/patches/remove-webp-include-68.patch | 12 ++++++++++++ .../chromium/patches/remove-webp-include-69.patch | 11 +++++++++++ 5 files changed, 30 insertions(+), 12 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dbfd4753416..021c048669f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -142,13 +142,18 @@ let # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ./patches/fix-openh264.patch ./patches/fix-freetype.patch ] ++ optionals (versionRange "66" "68") [ ./patches/nix_plugin_paths_52.patch + (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch + ] ++ optionals (versionRange "68" "69") [ + ./patches/remove-webp-include-68.patch + (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") + ] ++ optionals (versionAtLeast version "69") [ + ./patches/remove-webp-include-69.patch ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch deleted file mode 100644 index 9d9ed6d2d05..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/third_party/openh264/BUILD.gn -+++ b/third_party/openh264/BUILD.gn -@@ -24,6 +24,7 @@ config("config") { - if (!is_win || is_clang) { - cflags += [ - "-Wno-format", -+ "-Wno-format-security", - "-Wno-header-hygiene", - "-Wno-unused-function", - "-Wno-unused-value", diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch index c90e98e72fa..3c80dbcec00 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -26,7 +26,7 @@ index f4e119d..d9775bd 100644 + std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; + const char* value = getenv(full_env.c_str()); + if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); ++ return base::PathService::Get(base::DIR_MODULE, result); + else + *result = base::FilePath(value); } diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch new file mode 100644 index 00000000000..1995bf1fa8f --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch @@ -0,0 +1,12 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +@@ -8,7 +8,7 @@ + #include "third_party/blink/renderer/platform/platform_export.h" + #include "third_party/blink/renderer/platform/wtf/vector.h" + #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/encode/SkJpegEncoder.h" + #include "third_party/skia/include/encode/SkPngEncoder.h" + diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch new file mode 100644 index 00000000000..07572cf7ee9 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch @@ -0,0 +1,11 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -13,7 +13,7 @@ + + #include "jpeglib.h" // for JPEG_MAX_DIMENSION + +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + + namespace blink { + From 07b9fd14dffef18e3140b88d41276d679fde9127 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 22:45:07 +0200 Subject: [PATCH 13/99] stb: init at 20180211 --- pkgs/development/libraries/stb/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/stb/default.nix diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix new file mode 100644 index 00000000000..4f36ac2ba1c --- /dev/null +++ b/pkgs/development/libraries/stb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "stb-${version}"; + version = "20180211"; + + src = fetchFromGitHub { + owner = "nothings"; + repo = "stb"; + rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"; + sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include/stb + cp *.h $out/include/stb/ + ''; + + meta = with stdenv.lib; { + description = "Single-file public domain libraries for C/C++"; + homepage = https://github.com/nothings/stb; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4399955ee6..93130ddd25c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11874,6 +11874,8 @@ with pkgs; libpcap = if stdenv.isLinux then libpcap else null; }; + stb = callPackage ../development/libraries/stb { }; + stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); From 3bedaf24f851220159e6206233694b374a9cc4c4 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 22:46:14 +0200 Subject: [PATCH 14/99] python.pkgs.libarcus: 3.3.0 -> 3.4.1 --- pkgs/development/python-modules/libarcus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 4a937ac94f0..2fc66e810d0 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,7 +3,8 @@ buildPythonPackage rec { pname = "libarcus"; - version = "3.3.0"; + version = "3.4.1"; + format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; From 14abd80d1f41184b28f2bacc30e319892fa71cc7 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 22:53:29 +0200 Subject: [PATCH 15/99] python.pkgs.uranium: 3.3.0 -> 3.4.1 --- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 7be8f01f23c..276ed481601 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb"; + sha256 = "1r6d65c9xfkn608k6wv3dprpks5h8g2v9mi4a67ifpzyw4y3f0rk"; }; disabled = pythonOlder "3.5.0"; From 28f6c3ce6792c3f3423a8b74ff003efa0b7fb1f8 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 22:53:57 +0200 Subject: [PATCH 16/99] curaengine: 3.3.0 -> 3.4.1 --- pkgs/applications/misc/curaengine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ac4c68f9b53..ba9a98c616b 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, libarcus }: +{ stdenv, fetchFromGitHub, cmake, libarcus, stb }: stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw"; + sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libarcus ]; + buildInputs = [ libarcus stb ]; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; From c429142448766bfb005b77c08c6b7b46effa46de Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 22:54:12 +0200 Subject: [PATCH 17/99] cura: 3.3.1 -> 3.4.1 --- pkgs/applications/misc/cura/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 3b00bba709a..f97b83a8507 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx"; + sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = "3.3.0"; - sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q"; + rev = "3.4.1"; + sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28"; }; buildInputs = [ qtbase qtquickcontrols2 ]; From 73082002ac42741db2251ede041c101463b10642 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 23:31:01 +0200 Subject: [PATCH 18/99] mergerfs-tools: init at 20171221 --- pkgs/tools/filesystems/mergerfs/tools.nix | 36 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/filesystems/mergerfs/tools.nix diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix new file mode 100644 index 00000000000..01f0de25a90 --- /dev/null +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, coreutils, makeWrapper +, rsync, python3, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mergerfs-tools-${version}"; + version = "20171221"; + + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs-tools"; + rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; + sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + makeFlags = [ + "INSTALL=${coreutils}/bin/install" + "PREFIX=$(out)" + ]; + + postInstall = with stdenv.lib; '' + wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} + ''; + + meta = with stdenv.lib; { + description = "Optional tools to help manage data in a mergerfs pool"; + homepage = https://github.com/trapexit/mergerfs-tools; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01de9af5347..bdb3b9b6702 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10915,6 +10915,8 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; + ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them From d81f819db35fe833d935486439d085bd5c3e85da Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 15 Mar 2018 12:55:03 +0100 Subject: [PATCH 19/99] nixos/cupsd: add option to start when needed --- nixos/modules/services/printing/cupsd.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index b074d15cbec..dbf18ec1d11 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,6 +124,16 @@ in ''; }; + startWhenNeeded = mkOption { + type = types.bool; + default = false; + description = '' + If set, CUPS is socket-activated; that is, + instead of having it permanently running as a daemon, + systemd will start it on the first incoming connection. + ''; + }; + listenAddresses = mkOption { type = types.listOf types.str; default = [ "localhost:631" ]; @@ -287,8 +297,13 @@ in 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; + }; + systemd.services.cups = - { wantedBy = [ "multi-user.target" ]; + { wantedBy = optionals (!cfg.startWhenNeeded) [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; From d6874a7e1edfe3cf256a01f692050b05ec77e2b2 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 14 Jul 2018 23:50:24 +0200 Subject: [PATCH 20/99] gurobi: init at 8.0.1 --- .../science/math/gurobi/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/science/math/gurobi/default.nix diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix new file mode 100644 index 00000000000..06d448f6252 --- /dev/null +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, autoPatchelfHook, python }: + +stdenv.mkDerivation rec { + name = "gurobi-${version}"; + version = "8.0.1"; + + src = with stdenv.lib; fetchurl { + url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; + sha256 = "0y3lb0mngnyn7ql4s2n8qxnr1d2xcjdpdhpdjdxc4sc8f2w2ih18"; + }; + + sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ (python.withPackages (ps: [ ps.gurobipy ])) ]; + + buildPhase = '' + cd src/build + make + cd ../.. + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin/ + rm $out/bin/gurobi.env + rm $out/bin/gurobi.sh + rm $out/bin/python2.7 + + cp lib/gurobi.py $out/bin/gurobi.sh + + mkdir -p $out/include + cp include/gurobi*.h $out/include/ + + mkdir -p $out/lib + cp lib/libgurobi*.so* $out/lib/ + cp lib/libgurobi*.a $out/lib/ + cp src/build/*.a $out/lib/ + ''; + + meta = with stdenv.lib; { + description = "Optimization solver for mathematical programming"; + homepage = https://www.gurobi.com; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c5ecb49bc3..dd3d19b1ae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20187,6 +20187,8 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; + gurobi = callPackage ../applications/science/math/gurobi { }; + jags = callPackage ../applications/science/math/jags { }; From 5a9ba174bde89a1c6ce25aebab6bce42f1bafc93 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 15 Jul 2018 09:36:08 +0900 Subject: [PATCH 21/99] lib.debug: fix traceValSeqFn was calling the wrong parent version. --- lib/debug.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/debug.nix b/lib/debug.nix index 91a9265a6b5..383eb32d75d 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -77,7 +77,7 @@ rec { (modify depth snip x)) y; /* A combination of `traceVal` and `traceSeq` */ - traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v); + traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v); traceValSeq = traceValSeqFn id; /* A combination of `traceVal` and `traceSeqN`. */ From 8cf34caba53e00a9d1b4d9868913fea2eca3efa1 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 15 Jul 2018 13:11:49 +1000 Subject: [PATCH 22/99] streamlink: set macOS as a supported platform --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 491e6fcd164..dbf22aa9f8e 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg zraexy ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ dezgeg zraexy enzime ]; }; } From ec523bef211d8e8f363bec1016287c58d28f1660 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Jul 2018 23:04:43 -0500 Subject: [PATCH 23/99] radare2-cutter: 1.5 -> 1.6 https://github.com/radareorg/cutter/releases/tag/v1.6 --- pkgs/development/tools/analysis/radare2-cutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index e35b0005041..8be84f28d36 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c"; + sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; From 692068ecfc64b742313022d63834d1b6f5a068fb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Jul 2018 23:25:21 -0500 Subject: [PATCH 24/99] radare2-cutter: use r2 built from rev Cutter pins as submodule --- .../tools/analysis/radare2-cutter/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 8be84f28d36..ff2b4d3b54f 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -7,10 +7,20 @@ , radare2 , python3 }: - +let + r2 = radare2.overrideDerivation (o: { + name = "radare2-for-cutter-${version}"; + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; + sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; + }; + }); + version = "1.6"; +in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.6"; src = fetchFromGitHub { owner = "radareorg"; @@ -31,7 +41,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" From e40a09e3ace41320ae49ea8109121385e7fb2659 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 15 Jul 2018 13:48:43 +0200 Subject: [PATCH 25/99] percona-xtrabackup: fix build with gcc7 --- pkgs/tools/backup/percona-xtrabackup/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index a1c53dcd97f..712d0af29a9 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { "-DWITH_SSL=system" "-DWITH_ZLIB=system" "-DWITH_MAN_PAGES=OFF" + "-DCMAKE_CXX_FLAGS=-std=gnu++03" ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74cdc46ff57..a52db70835f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4364,7 +4364,6 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { - stdenv = overrideCC stdenv gcc5; boost = boost159; }; From c77d1e5b318213ec432cda40f3c4c9bbae429281 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 15 Jul 2018 11:20:19 +0200 Subject: [PATCH 26/99] eclib: 20171219 -> 20180710 Also includes the necessary sage compatibility patch, borrowed from ArchLinux. --- .../math/sage/patches/eclib-20180710.patch | 40 +++++++++++++++++++ .../science/math/sage/sage-src.nix | 3 ++ pkgs/development/libraries/eclib/default.nix | 25 +++++++++--- .../python-modules/cvxopt/default.nix | 5 +++ 4 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/science/math/sage/patches/eclib-20180710.patch diff --git a/pkgs/applications/science/math/sage/patches/eclib-20180710.patch b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch new file mode 100644 index 00000000000..d06e1e6cedf --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch @@ -0,0 +1,40 @@ +diff --git a/src/sage/interfaces/mwrank.py b/src/sage/interfaces/mwrank.py +index 4417b59276..ae57ca2991 100644 +--- a/src/sage/interfaces/mwrank.py ++++ b/src/sage/interfaces/mwrank.py +@@ -54,8 +54,9 @@ def Mwrank(options="", server=None, server_tmpdir=None): + sage: M = Mwrank('-v 0 -l') + sage: print(M('0 0 1 -1 0')) + Curve [0,0,1,-1,0] : Rank = 1 +- Generator 1 is [0:-1:1]; height 0.0511114082399688 +- Regulator = 0.0511114082399688 ++ Generator 1 is [0:-1:1]; height 0.051111408239969 ++ Regulator = 0.051111408239969 ++ + """ + global instances + try: +diff --git a/src/sage/libs/eclib/wrap.cpp b/src/sage/libs/eclib/wrap.cpp +index 5fd5693b53..d12468faa8 100644 +--- a/src/sage/libs/eclib/wrap.cpp ++++ b/src/sage/libs/eclib/wrap.cpp +@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Curvedata* E, int verbose) + + + int mw_process(struct Curvedata* curve, struct mw* m, +- const struct bigint* x, const struct bigint* y, +- const struct bigint* z, int sat) ++ const bigint* x, const bigint* y, ++ const bigint* z, int sat) + { + Point P(*curve, *x, *y, *z); + if (!P.isvalid()) +@@ -188,7 +188,7 @@ int mw_rank(struct mw* m) + } + + /* Returns index and unsat long array, which user must deallocate */ +-int mw_saturate(struct mw* m, struct bigint* index, char** unsat, ++int mw_saturate(struct mw* m, bigint* index, char** unsat, + long sat_bd, int odd_primes_only) + { + vector v; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 348adf5d509..d342fba2116 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -176,6 +176,9 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24838 rebased ./patches/pynac-0.7.22.patch + + # https://trac.sagemath.org/ticket/25862 + ./patches/eclib-20180710.patch ]; patches = nixPatches ++ packageUpgradePatches; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index b2a224e10b1..e4d1fa2073f 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libtool , gettext @@ -17,13 +18,25 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171219"; + version = "20180710"; # upgrade might break the sage interface + # sage tests to run: + # src/sage/interfaces/mwrank.py + # src/sage/libs/eclib + # ping @timokau for more info src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; + sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; }; + patches = [ + # One of the headers doesn't get installed. + # See https://github.com/NixOS/nixpkgs/pull/43476. + (fetchpatch { + url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; + sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; + }) + ]; buildInputs = [ pari ntl @@ -35,12 +48,12 @@ stdenv.mkDerivation rec { autoreconfHook ]; doCheck = true; - meta = { + meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; homepage = https://github.com/JohnCremona/eclib; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index e17bd38da02..906e2c0bbe4 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include ''; + # https://github.com/cvxopt/cvxopt/issues/122 + # This is fixed on staging (by #43234, status 2018-07-15), but until that + # lands we should disable the tests. Otherwise the 99% of use cases that + # should be unaffected by that failure are affected. + doCheck = false; checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; From de0c67572f25a898e227084562f71d01cbd67b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Jul 2018 15:29:23 +0200 Subject: [PATCH 27/99] python.pkgs.vega_datasets: init at 0.5.0 --- .../python-modules/vega_datasets/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/vega_datasets/default.nix diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix new file mode 100644 index 00000000000..a7b6c6865cc --- /dev/null +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: + +buildPythonPackage rec { + pname = "vega_datasets"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + }; + + propagatedBuildInputs = [ pandas ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test vega_datasets --doctest-modules + ''; + + meta = with lib; { + description = "A Python package for offline access to vega datasets"; + homepage = https://github.com/altair-viz/vega_datasets; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index add15eaae88..bd9d62c3e63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14566,6 +14566,8 @@ in { }; }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; From e82de5730fadd81899c964e8dbd03a540ffa380e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Jul 2018 15:38:42 +0200 Subject: [PATCH 28/99] python.pkgs.altair: fix build --- .../python-modules/altair/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 274fa0fbbf2..8e75f1f3d8d 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, glibcLocales, vega, pandas, ipython, traitlets }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales +, entrypoints, jsonschema, numpy, pandas, six, toolz, typing }: buildPythonPackage rec { pname = "altair"; @@ -10,18 +11,19 @@ buildPythonPackage rec { sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0"; }; - postPatch = '' - sed -i "s/vega==/vega>=/g" setup.py - ''; + patches = fetchpatch { + url = https://github.com/altair-viz/altair/commit/bfca8aecce9593c48aa5834e3f8f841deb58391c.patch; + sha256 = "01izc5d8c6ry3mh0k0hfasb6jc4720g75yw2qdlp9ja8mnjsp4k3"; + }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales ]; checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules ''; - propagatedBuildInputs = [ vega pandas ipython traitlets ]; + propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz typing ]; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; From db00e457aca5e765957005ec9e1a41400e2bcb70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 16:26:41 +0200 Subject: [PATCH 29/99] gnome3.totem: disable vala plug-ins again Apparently the intermittent build failure is still there, not sure why I thought it was fixed. Closes: https://github.com/NixOS/nixpkgs/issues/43518 --- pkgs/desktops/gnome-3/core/totem/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index df37377e52e..7cf1872da5a 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 + # https://bugzilla.gnome.org/show_bug.cgi?id=784236 + # https://github.com/mesonbuild/meson/issues/1994 + "-Denable-vala=no" ]; wrapPrefixVariables = [ "PYTHONPATH" ]; From dab1b67f9aacc388332867fb2ee9490828e6ae45 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 15 Jul 2018 11:16:32 -0400 Subject: [PATCH 30/99] pythonPackages.aws-adfs: init at 0.12.0 (#43458) --- .../python-modules/aws-adfs/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/aws-adfs/default.nix diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix new file mode 100644 index 00000000000..c42ad6f1d6c --- /dev/null +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "aws-adfs"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjrm61k6905dmhgrqyc5caxx5hbhj3sr6cx4r6sbdyz453i7pc6"; + }; + + # Relax version constraint + patchPhase = '' + sed -i 's/coverage < 4/coverage/' setup.py + ''; + + # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset + HOME = "."; + + # Required for python3 tests, along with glibcLocales + LC_ALL = "en_US.UTF-8"; + + checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; + propagatedBuildInputs = [ lxml boto3 requests click configparser ]; + + meta = { + description = "Command line tool to ease aws cli authentication against ADFS"; + homepage = https://github.com/venth/aws-adfs; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd9d62c3e63..f04e149bac9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,6 +205,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; From 1d3138777559bcb2639cfee90bd1415a00142461 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 15 Jul 2018 18:24:27 +0200 Subject: [PATCH 31/99] groovy: 2.5.0 -> 2.5.1 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index d2d923d783d..961cfb4dad0 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.0"; + version = "2.5.1"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1qzciri8qjx5p7x015rk5ws7gj53qidamp85r2r7aj6ssyp3r40k"; + sha256 = "1zqq2jsaq547rm8qh8zpj36059jahsba733cwrmg6iq0c8ai4z3s"; }; buildInputs = [ unzip makeWrapper ]; From 26bd3e994be43590f812282b2dbfb4e8a93356a5 Mon Sep 17 00:00:00 2001 From: sjau Date: Sun, 15 Jul 2018 18:32:47 +0200 Subject: [PATCH 32/99] flexget: 2.13.5 -> 2.14.5 (#43570) --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ecad7549117..901229f86ca 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.13.5"; + version = "2.14.5"; src = fetchPypi { inherit pname version; - sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9"; + sha256 = "05kczj10p8f9b1ll4ii5anbg6nk5dhb7lm9skbj6ix7v9hi48hz4"; }; postPatch = '' From 2c65c6a08c36f68f760458d3e78610b903219b72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 18:48:09 +0200 Subject: [PATCH 33/99] =?UTF-8?q?pulseeffects:=204.1.6=20=E2=86=92=204.1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 6a24a11ddda..6a1237dd9b3 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -40,13 +40,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0fxd1rgf3l667gibd6brfrs8vkq6882w7jql871j5q5ynz1c9j46"; + sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9"; }; nativeBuildInputs = [ From 05c2aa212e062aefcc058b86adf7e367e8f1f6ea Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 13 Jul 2018 00:32:30 -0300 Subject: [PATCH 34/99] cataclysm-dda-git: 2017-12-09 -> 2018-07-15 --- pkgs/games/cataclysm-dda/git.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index fe4dcb25175..785cf91c8f2 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -3,14 +3,14 @@ SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, tiles ? true }: stdenv.mkDerivation rec { - version = "2017-12-09"; + version = "2018-07-15"; name = "cataclysm-dda-git-${version}"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; - rev = "24e92956db5587809750283873c242cc0796d7e6"; - sha256 = "1a7kdmx76na4g65zra01qaq98lxp9j2dl9ddv09r0p5yxaizw68z"; + rev = "e1e5d81"; + sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1"; }; nativeBuildInputs = [ pkgconfig ]; @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; + maintainers = with maintainers; [ rardiol ]; homepage = https://cataclysmdda.org/; license = licenses.cc-by-sa-30; platforms = platforms.unix; From 5901dae6739f0189032a97a71c75055cc8e2309e Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Fri, 13 Jul 2018 17:27:42 -0300 Subject: [PATCH 35/99] cataclysm-dda-git: debug flag --- pkgs/games/cataclysm-dda/git.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 785cf91c8f2..d1d1b4c54d4 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, -tiles ? true }: +tiles ? true, debug ? false }: stdenv.mkDerivation rec { version = "2018-07-15"; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { makeFlags = with stdenv.lib; [ "PREFIX=$(out)" "LUA=1" - "RELEASE=1" "USE_HOME_DIR=1" "LANGUAGES=all" "VERSION=git-${version}-${substring 0 8 src.rev}" @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isDarwin [ "NATIVE=osx" "CLANG=1" + ] ++ optionals (! debug) [ + "RELEASE=1" ]; postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) '' @@ -64,6 +65,8 @@ stdenv.mkDerivation rec { # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 enableParallelBuilding = false; + dontStrip = debug; + meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; longDescription = '' From bea8e84964124fe07c3750d13cb332e51f0ed284 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 19:00:53 +0200 Subject: [PATCH 36/99] =?UTF-8?q?phpPackages.php-cs-fixer:=202.12.1=20?= =?UTF-8?q?=E2=86=92=202.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7861b2a231d..a1761e68631 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.1"; + version = "2.12.2"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2"; + sha256 = "19cq04x1wi489259vyad15zy6y0k3qd7dj77pcf74gxqw92hgg5c"; }; phases = [ "installPhase" ]; From bfb393f55e3346941df552bb10b89af9788c52a0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 20:07:34 +0300 Subject: [PATCH 37/99] nginx-fancyindex: init at 0.4.3 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1919cfddf62..869551ef03a 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,6 +15,15 @@ inputs = [ pkgs.brotli ]; }; + fancyindex = { + src = fetchFromGitHub { + owner = "aperezdc"; + repo = "ngx-fancyindex"; + rev = "v0.4.3"; + sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; + }; + }; + ipscrub = { src = fetchFromGitHub { owner = "masonicboom"; From 98792fe35152d3470929b40ad83359b605233a76 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 19:10:02 +0200 Subject: [PATCH 38/99] =?UTF-8?q?flatpak-builder:=200.99.1=20=E2=86=92=200?= =?UTF-8?q?.99.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/flatpak-builder/default.nix | 4 +-- .../tools/flatpak-builder/fix-paths.patch | 30 ++++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5552bdcc5e6..377791007a3 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -36,7 +36,7 @@ }: let - version = "0.99.1"; + version = "0.99.3"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; + sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index 001ddd64568..6b82e623a02 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/builder-context.c +++ b/src/builder-context.c -@@ -711,7 +711,7 @@ +@@ -763,7 +763,7 @@ g_autoptr(GFile) rofiles_base = NULL; g_autoptr(GFile) rofiles_dir = NULL; g_autofree char *tmpdir_name = NULL; @@ -31,7 +31,7 @@ return res; --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c -@@ -401,7 +401,7 @@ +@@ -430,7 +430,7 @@ va_list ap; va_start (ap, error); @@ -40,7 +40,7 @@ va_end (ap); return res; -@@ -416,7 +416,7 @@ +@@ -445,7 +445,7 @@ va_list ap; va_start (ap, error); @@ -49,7 +49,7 @@ va_end (ap); return res; -@@ -428,7 +428,7 @@ +@@ -457,7 +457,7 @@ GError **error) { gboolean res; @@ -58,6 +58,15 @@ "sh", /* shell's $0 */ rpm_path, /* shell's $1 */ NULL }; +@@ -604,7 +604,7 @@ + va_list ap; + + va_start (ap, error); +- res = flatpak_spawn (dir, NULL, 0, error, "git", ap); ++ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap); + va_end (ap); + + return res; --- a/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c @@ -124,7 +124,7 @@ @@ -71,7 +80,7 @@ return res; --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c -@@ -204,11 +204,11 @@ +@@ -215,15 +215,15 @@ args = g_ptr_array_new (); if (use_git) { @@ -79,6 +88,11 @@ + g_ptr_array_add (args, "@git@"); g_ptr_array_add (args, "apply"); g_ptr_array_add (args, "-v"); + } else if (use_git_am) { +- g_ptr_array_add (args, "git"); ++ g_ptr_array_add (args, "@git@"); + g_ptr_array_add (args, "am"); + g_ptr_array_add (args, "--keep-cr"); } else { - g_ptr_array_add (args, "patch"); + g_ptr_array_add (args, "@patch@"); @@ -87,7 +101,7 @@ g_ptr_array_add (args, (gchar *) extra_options[i]); --- a/src/builder-utils.c +++ b/src/builder-utils.c -@@ -139,7 +139,7 @@ +@@ -149,7 +149,7 @@ va_list ap; va_start (ap, error); @@ -96,7 +110,7 @@ va_end (ap); return res; -@@ -153,7 +153,7 @@ +@@ -163,7 +163,7 @@ va_list ap; va_start (ap, error); @@ -105,7 +119,7 @@ va_end (ap); return res; -@@ -167,7 +167,7 @@ +@@ -177,7 +177,7 @@ va_list ap; va_start (ap, error); From 02ce906d8ae83d40cc9b269b7dc12f4aa477c731 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 19:00:54 +0200 Subject: [PATCH 39/99] subfinder: init at 2018-07-15 --- pkgs/tools/networking/subfinder/default.nix | 29 +++++++++++ pkgs/tools/networking/subfinder/deps.nix | 57 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/tools/networking/subfinder/default.nix create mode 100644 pkgs/tools/networking/subfinder/deps.nix diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix new file mode 100644 index 00000000000..2a4cf3506df --- /dev/null +++ b/pkgs/tools/networking/subfinder/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "subfinder-git-${version}"; + version = "2018-07-15"; + + goPackagePath = "github.com/subfinder/subfinder"; + + src = fetchFromGitHub { + owner = "subfinder"; + repo = "subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Subdomain discovery tool"; + longDescription = '' + SubFinder is a subdomain discovery tool that discovers valid + subdomains for websites. Designed as a passive framework to be + useful for bug bounties and safe for penetration testing. + ''; + homepage = https://github.com/subfinder/subfinder; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix new file mode 100644 index 00000000000..8d8a1a571d6 --- /dev/null +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -0,0 +1,57 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/bogdanovich/dns_resolver"; + fetch = { + type = "git"; + url = "https://github.com/bogdanovich/dns_resolver"; + rev = "a8e42bc6a5b6c9a93be01ca204be7e17f7ba4cd2"; + sha256 = "0l1hgxxqafappw0y18sbkkk2vijclvf1b8x73b0nhi4r74wyib49"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "3e6e47bc11bc7f93f9e2f1c7bd6481ba4802808b"; + sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; + }; + } + { + goPackagePath = "github.com/subfinder/subfinder"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + } + { + goPackagePath = "github.com/subfinder/urlx"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/urlx"; + rev = "8e731c8be06edbae81cab15937cd3c291c2a7680"; + sha256 = "11vrx1c0mq1h6lwpsvibd3386wy4kirzmmm8ibrlx2gj0h6pkkcb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"; + sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9880be0eec..0926d01d0bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5246,6 +5246,8 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; + subfinder = callPackage ../tools/networking/subfinder { }; + surfraw = callPackage ../tools/networking/surfraw { }; swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; From c0fd62dab4f454f901b6e654e0f568448ee4c819 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 19:01:59 +0200 Subject: [PATCH 40/99] tpacpi-bat: fix path to cat --- pkgs/os-specific/linux/tpacpi-bat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index fbc1685c577..b4e584f2979 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, kmod }: +{ stdenv, fetchFromGitHub, perl, kmod, coreutils }: # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace tpacpi-bat --replace modprobe ${kmod}/bin/modprobe + substituteInPlace tpacpi-bat \ + --replace modprobe ${kmod}/bin/modprobe \ + --replace cat ${coreutils}/bin/cat ''; meta = { From 6c33223f5f681aba159070a749139c88aecdb0ef Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:11:05 +0200 Subject: [PATCH 41/99] jool: 3.5.4 -> 3.5.7 --- pkgs/os-specific/linux/jool/default.nix | 3 ++- pkgs/os-specific/linux/jool/source.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 37dd4d727ec..84a621e7f12 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.13"; +assert stdenv.lib.versionOlder kernel.version "4.17"; let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -11,6 +11,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; prePatch = '' diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index ace103a92f9..f15b91f9f14 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "3.5.4"; + version = "3.5.7"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5"; + sha256 = "1qxhrchhm4lbyxkp6wm47a85aa4d9wlyy3kdijl8rarngvh8j1yx"; }; } From d856ad7fc4006299d19e137af66ab93d14e4c7b7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:15:36 +0200 Subject: [PATCH 42/99] dnsmasq: 2.78 -> 2.79 --- pkgs/tools/networking/dnsmasq/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 6205934084e..ebbe5a11b52 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,23 +11,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.78"; + name = "dnsmasq-2.79"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; + sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15107.patch"; - url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6"; - sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk"; - # changelog does not apply cleanly but its safe to skip - excludes = [ "CHANGELOG" ]; - }) - ]; - preBuild = '' makeFlagsArray=("COPTS=${copts}") ''; From fb130874fdcb8bc8ac4a67302bb122bff26bb712 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Fri, 13 Jul 2018 12:46:59 -0700 Subject: [PATCH 43/99] clipmenu: init at 5.4.0 clipmenu is a simple tool for managing you clipboard with dmenu. --- pkgs/applications/misc/clipmenu/default.nix | 33 +++++++++++++++++++++ pkgs/tools/misc/clipnotify/default.nix | 26 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 63 insertions(+) create mode 100644 pkgs/applications/misc/clipmenu/default.nix create mode 100644 pkgs/tools/misc/clipnotify/default.nix diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix new file mode 100644 index 00000000000..679724ed062 --- /dev/null +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -0,0 +1,33 @@ +{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +let + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ]; +in +stdenv.mkDerivation rec { + name = "clipmenu-${version}"; + version = "5.4.0"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = "clipmenu"; + rev = version; + sha256 = "1qbpca0wny6i222vbikfl2znn3fynhbl4100qs8v4wn27ra5p0mi"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp clipdel clipmenu clipmenud $out/bin + + for bin in $out/bin/*; do + wrapProgram "$bin" --prefix PATH : "${runtimePath}" + done + ''; + + meta = with stdenv.lib; { + description = "Clipboard management using dmenu"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix new file mode 100644 index 00000000000..6bd0f8be2fa --- /dev/null +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -0,0 +1,26 @@ +{ libX11, libXfixes, stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "clipnotify-${version}"; + version = "git-2018-02-20"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = "clipnotify"; + rev = "9cb223fbe494c5b71678a9eae704c21a97e3bddd"; + sha256 = "1x9avjq0fgw0svcbw6b6873qnsqxbacls9sipmcv86xia4bxh8dn"; + }; + + buildInputs = [ libX11 libXfixes ]; + + installPhase = '' + mkdir -p $out/bin + cp clipnotify $out/bin + ''; + + meta = with stdenv.lib; { + description = "Notify on new X clipboard events"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9880be0eec..589e9180d3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5905,6 +5905,8 @@ with pkgs; gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; }; + clipnotify = callPackage ../tools/misc/clipnotify { }; + xclip = callPackage ../tools/misc/xclip { }; xcwd = callPackage ../tools/X11/xcwd { }; @@ -15469,6 +15471,8 @@ with pkgs; clipgrab = callPackage ../applications/video/clipgrab { }; + clipmenu = callPackage ../applications/misc/clipmenu { }; + clipit = callPackage ../applications/misc/clipit { }; cloud-print-connector = callPackage ../servers/cloud-print-connector { }; From 6c1eb15a3b6c64f01544ce1ccfc866efaf6f40b9 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Fri, 13 Jul 2018 12:47:57 -0700 Subject: [PATCH 44/99] nixos/modules: add clipmenu user service add a clipmenud daemon user service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/clipmenu.nix | 31 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 nixos/modules/services/misc/clipmenu.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 988693d924b..cf30fc693fc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -320,6 +320,7 @@ ./services/misc/canto-daemon.nix ./services/misc/calibre-server.nix ./services/misc/cfdyndns.nix + ./services/misc/clipmenu.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix diff --git a/nixos/modules/services/misc/clipmenu.nix b/nixos/modules/services/misc/clipmenu.nix new file mode 100644 index 00000000000..3ba050044ca --- /dev/null +++ b/nixos/modules/services/misc/clipmenu.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.clipmenu; +in { + + options.services.clipmenu = { + enable = mkEnableOption "clipmenu, the clipboard management daemon"; + + package = mkOption { + type = types.package; + default = pkgs.clipmenu; + defaultText = "pkgs.clipmenu"; + description = "clipmenu derivation to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.clipmenu = { + enable = true; + description = "Clipboard management daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${cfg.package}/bin/clipmenud"; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} From b68155de84fc5516e931d79194366590902a9789 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:38:36 +0200 Subject: [PATCH 45/99] batman_adv: 2018.0 -> 2018.1 --- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8f835b6d7ed..29db64ab48f 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2018.0"; in +let base = "batman-adv-2018.1"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0v2pyy9lxyy71nr9600k9935qcpn2wpyl9fsf2a4m4d2x0wgh9j8"; + sha256 = "12q48dw02p3dswdlrklqd2jxw9n51z1vnnnzpf527jg5pf6v4rmq"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 27b8072a98923d3732cfa46a738c42e08b7a1bdd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:40:52 +0200 Subject: [PATCH 46/99] prometheus-alertmanager: 0.14.0 -> 0.15.1 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 2f9016b7499..38b78926177 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.14.0"; + version = "0.15.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0f6yi19zffxnp3dlr4zs52b7bllks3kjxkdn9zvvi5lvpkzmba5j"; + sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy"; }; # Tests exist, but seem to clash with the firewall. From 1638d91d7a804953714985f9b93021400b07fb2f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:42:47 +0200 Subject: [PATCH 47/99] matterircd: 0.16.5 -> 0.18.2 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index d489deb5944..6707055eaa6 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.16.5"; + version = "0.18.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2"; + sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r"; }; goPackagePath = "github.com/42wim/matterircd"; From 3239ef84ea79e4d33c6b4ff072dfbbfb06b9f715 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:44:41 +0200 Subject: [PATCH 48/99] nginxMainline: 1.13.12 -> 1.15.1 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 71cb6fc72ab..5afd73c8868 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.13.12"; - sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv"; + version = "1.15.1"; + sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867"; }) From 29da51c8e93df5989eda111e21474404ada72727 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 20:48:11 +0200 Subject: [PATCH 49/99] mpd: 0.20.18 -> 0.20.20 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index fde66a71e2e..35637e7f73a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "18"; + minor = "20"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "020vdn94fwjbldnkgr2h3dk9sm6f5k59qic568mw88yi7cr3mjsh"; + sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; }; patches = [ ./x86.patch ]; From 472ab64e0f8836dfc7c21db389e73507b9e07ffd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 21:14:19 +0200 Subject: [PATCH 50/99] nitrokey-app: 1.2 -> 1.3.1 --- pkgs/tools/security/nitrokey-app/default.nix | 23 +++++++++++++++---- .../security/nitrokey-app/udev-rules.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 4407d5abbfa..67e388d5728 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,29 +1,42 @@ -{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: +{ stdenv, makeWrapper, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig +, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { name = "nitrokey-app-${version}"; - version = "1.2"; + version = "1.3.1"; # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; rev = "v${version}"; - sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; + sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9"; }; + postPatch = '' + substituteInPlace libnitrokey/CMakeLists.txt \ + --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' + ''; + buildInputs = [ bash-completion hidapi libusb1 - qt5.qtbase - qt5.qttranslations + qtbase + qttranslations + qtsvg ]; nativeBuildInputs = [ cmake pkgconfig + makeWrapper ]; cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; + postFixup = '' + wrapProgram $out/bin/nitrokey-app \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" + ''; + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index 33d2dd1c8fa..a89fa723826 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { dontBuild = true; patchPhase = '' - substituteInPlace data/41-nitrokey.rules --replace plugdev "${group}" + substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" ''; installPhase = '' mkdir -p $out/etc/udev/rules.d - cp data/41-nitrokey.rules $out/etc/udev/rules.d + cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af43c4ec8a4..02352e0ff05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21879,7 +21879,7 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; From ddf898006edddea33d09d0d009764d1dfe96a3da Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 21:21:09 +0200 Subject: [PATCH 51/99] kea: 1.3.0 -> 1.4.0 --- pkgs/tools/networking/kea/default.nix | 8 ++++---- pkgs/tools/networking/kea/dont-create-var.patch | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 67428664556..f35ceeae864 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; + sha256 = "0a0inchisrjry59z14w4ha210q2ffl31gjbhp5dgrbap6swyry60"; }; patches = [ ./dont-create-var.patch ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" + "--with-pgsql=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch index 595942673c6..385113d160f 100644 --- a/pkgs/tools/networking/kea/dont-create-var.patch +++ b/pkgs/tools/networking/kea/dont-create-var.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 897be34..b146729 100644 +index 2c0733c..974bb5e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -103,11 +103,6 @@ cppcheck: +@@ -135,11 +135,6 @@ cppcheck: --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src @@ -15,14 +15,12 @@ index 897be34..b146729 100644 EXTRA_DIST += tools/mk_cfgrpt.sh diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 066b410..16d3135 100755 +index 564f623..7cea9f2 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am -@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox - # Specification file - EXTRA_DIST += logging.spec +@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ + parsers/simple_parser6.h + -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) -- -- From 0b2b4b8c4e729535a61db56468809c5c2d3d175c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 21:30:59 +0200 Subject: [PATCH 52/99] charybdis: 3.5.5 -> 4.1 --- pkgs/servers/irc/charybdis/default.nix | 18 ++++++++++-------- pkgs/servers/irc/charybdis/remove-setenv.patch | 12 ------------ 2 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 pkgs/servers/irc/charybdis/remove-setenv.patch diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index befb4039ea0..332372830d6 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, bison, flex, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { - name = "charybdis-3.5.5"; + name = "charybdis-4.1"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0"; + sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw"; }; - patches = [ - ./remove-setenv.patch - ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + ''; + + autoreconfPhase = "sh autogen.sh"; configureFlags = [ "--enable-epoll" "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" - "--sysconfdir=/etc/charybdis" ]; - buildInputs = [ bison flex openssl ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ openssl gnutls ]; meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch deleted file mode 100644 index c53c1ff294e..00000000000 --- a/pkgs/servers/irc/charybdis/remove-setenv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/bandbi.c b/src/bandbi.c -index 03dd907..3698e85 100644 ---- a/src/bandbi.c -+++ b/src/bandbi.c -@@ -82,7 +82,6 @@ start_bandb(void) - const char *suffix = ""; - #endif - -- rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1); - if(bandb_path == NULL) - { - rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix); From c798c33de23fdad0a5ca783a63d349cbf7381640 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 19:12:14 +0200 Subject: [PATCH 53/99] =?UTF-8?q?flatpak:=200.99.2=20=E2=86=92=200.99.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- .../libraries/flatpak/fix-test-paths.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9a7acc287cc..a229beb5ccb 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.99.2"; + version = "0.99.3"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; + sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk"; }; patches = [ diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 0c2b7da79eb..3f4bc56721e 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,6 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -324,7 +324,7 @@ +@@ -315,7 +315,7 @@ # running installed-tests: assume we know what we're doing : elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +9,7 @@ sed -e 's/^/# /' < bwrap-result echo "1..0 # SKIP Cannot run bwrap" exit 0 -@@ -332,7 +332,7 @@ +@@ -323,7 +323,7 @@ } skip_without_python2 () { @@ -18,7 +18,7 @@ echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi -@@ -352,12 +352,12 @@ +@@ -335,12 +335,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -135,12 +135,12 @@ collection_args=--collection-id=${COLLECTION_ID} --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -610,7 +610,7 @@ +@@ -584,7 +584,7 @@ { gint exit_code = 0; - char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net", -- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; -+ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; + char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", +- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; ++ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; 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); From 5b1f6b59596fd48ec0b366d8ad6f9a27bdd8449c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jul 2018 19:20:20 +0200 Subject: [PATCH 54/99] nixos/flatpak: slim down test enviroment a bit --- nixos/tests/flatpak.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix index d1c7cf84314..9a5bdf07021 100644 --- a/nixos/tests/flatpak.nix +++ b/nixos/tests/flatpak.nix @@ -10,6 +10,7 @@ import ./make-test.nix ({ pkgs, ... }: machine = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work + environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ]; virtualisation.memorySize = 2047; From 11653f8e6b6b1c1b5fb99cf4ef99e4f31c2dec04 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 23:29:57 +0300 Subject: [PATCH 55/99] nginxModules.sla: init at 7778f01 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 869551ef03a..0ef79aed5a9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -120,6 +120,15 @@ }; }; + sla = { + src = fetchFromGitHub { + owner = "goldenclone"; + repo = "nginx-sla"; + rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; + sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; + }; + }; + fluentd = { src = fetchFromGitHub { owner = "fluent"; From d9d74223e21733c25879edeb0cca1aa609f9d51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Jul 2018 17:06:49 -0400 Subject: [PATCH 56/99] lmms: 1.2.0-rc4 -> 1.2.0-rc6 This fixes compilation --- pkgs/applications/audio/lmms/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 25d7f2ed015..0ff864c0048 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 , fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null -, qtbase, qttools, SDL ? null }: +, qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.2.0-rc4"; + version = "1.2.0-rc6"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5"; + sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake qttools pkgconfig ]; @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { libvorbis portaudio qtbase + qtx11extras SDL # TODO: switch to SDL2 in the next version ]; From a16eee878f2f2e2a62dc3bedeedc2b57f60961c8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 21:57:10 +0300 Subject: [PATCH 57/99] nginxModules.ipscrub: update to v1.0.1 --- pkgs/servers/http/nginx/modules.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1919cfddf62..84f97113fd1 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -19,9 +19,10 @@ src = fetchFromGitHub { owner = "masonicboom"; repo = "ipscrub"; - rev = "99230f66d5afe1f929cf4ed217901acb6206f620"; - sha256 = "0mfrwkg4srql38w713pg6qxi0h4hgy8inkvgc9cm80bwlv2ng9s1"; + rev = "v1.0.1"; + sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; } + "/ipscrub"; + inputs = [ pkgs.libbsd ]; }; rtmp ={ From 8584845aa10d19f3417120f6a78759565ec3f6db Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:00:36 +0300 Subject: [PATCH 58/99] nginxModules.moreheaders: update to v0.33 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 84f97113fd1..2283205b3f2 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -48,8 +48,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "headers-more-nginx-module"; - rev = "v0.26"; - sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g"; + rev = "v0.33"; + sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53"; }; }; From ea52907348dd8ef0aea472135deb0e1eae7ffaea Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:06:30 +0300 Subject: [PATCH 59/99] nginxModules.lua: update to v0.10.13 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 2283205b3f2..d126bf09e0a 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -93,8 +93,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.10.10"; - sha256 = "1dlqnlkpn3pnhk2m09jdx3iw3m6xk31pw2m5xrpcmqk3bll68mw6"; + rev = "v0.10.13"; + sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822"; }; inputs = [ pkgs.luajit ]; preConfigure = '' From eff0def7dc9d7de030fbed6665d33c4b9e824a03 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:10:48 +0300 Subject: [PATCH 60/99] nginxModules.set-misc: update to v0.32 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index d126bf09e0a..2749831f6c3 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -107,8 +107,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "set-misc-nginx-module"; - rev = "v0.28"; - sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96"; + rev = "v0.32"; + sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax"; }; }; From 04eb0731fb7eea305d516c3f453b99f2a0ed3243 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:15:43 +0300 Subject: [PATCH 61/99] nginxModules.pam: update to v1.5.1 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 2749831f6c3..ffece820bd0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -125,8 +125,8 @@ src = fetchFromGitHub { owner = "stogh"; repo = "ngx_http_auth_pam_module"; - rev = "v1.4"; - sha256 = "068zwyrc1dji55rlaj2kx6n0v2n5rpj7nz26ipvz26ida712md35"; + rev = "v1.5.1"; + sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; }; inputs = [ pkgs.pam ]; }; From c96d49733a29dd3bd59b2809ece84ebaf210d017 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:19:32 +0300 Subject: [PATCH 62/99] nginxModules.statsd: update to rev b970e40 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ffece820bd0..1301892af75 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -135,8 +135,8 @@ src = fetchFromGitHub { owner = "apcera"; repo = "nginx-statsd"; - rev = "2147d61dc31dd4865604be92349e6192a905d21a"; - sha256 = "19s3kwjgf51jkwknh7cfi82p6kifl8rl146wxc3ijds12776ilsv"; + rev = "b970e40467a624ba710c9a5106879a0554413d15"; + sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; }; }; From 75b2940145a9f5afab091667c0fdec7a0facd5a7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:24:30 +0300 Subject: [PATCH 63/99] nginxModules.upstream-check: update to rev 9aecf15 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1301892af75..edf6ab6a339 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -144,8 +144,8 @@ src = fetchFromGitHub { owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "10782eaff51872a8f44e65eed89bbe286004bcb1"; - sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89"; + rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04"; + sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; }; }; From 3a5d104a33966ccb568c72445921cb81a8a92d99 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 22:37:23 +0300 Subject: [PATCH 64/99] nginxModules.develkit: update to v0.3.1rc1 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index edf6ab6a339..09c1b6bbd27 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -84,8 +84,8 @@ src = fetchFromGitHub { owner = "simpl"; repo = "ngx_devel_kit"; - rev = "v0.3.0"; - sha256 = "1br1997zqsjcb1aqm6h6xmi5yx7akxk0qvk8wxc0fnvmyhgzxgx0"; + rev = "v0.3.1rc1"; + sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; }; }; From b7813f37fc182a1e389445ab76b863f45532f9e6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 21:46:27 +0200 Subject: [PATCH 65/99] subfinder: remove from its own deps --- pkgs/tools/networking/subfinder/deps.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix index 8d8a1a571d6..34095c81428 100644 --- a/pkgs/tools/networking/subfinder/deps.nix +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -18,15 +18,6 @@ sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; }; } - { - goPackagePath = "github.com/subfinder/subfinder"; - fetch = { - type = "git"; - url = "https://github.com/subfinder/subfinder"; - rev = "26596affed961c535676395f443acc5af95ac9e6"; - sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; - }; - } { goPackagePath = "github.com/subfinder/urlx"; fetch = { @@ -54,4 +45,4 @@ sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; }; } -] \ No newline at end of file +] From 4fbc423b77d693fe4d215f3ccd05c2097d5a740a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 21:55:52 +0200 Subject: [PATCH 66/99] caddy: 0.10.12 -> 0.11.0 --- pkgs/servers/caddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d89e59d662e..548d01c249d 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.12"; + version = "0.11.0"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88"; + sha256 = "0lvzvsblw4zpdfigaad4y577wfh7skx1ln5xhiz0k7vaqfj96ijy"; }; buildFlagsArray = '' From 86e27e29c4c223f062f5c0ca0ebe3e3036f4b45f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Jul 2018 22:02:26 +0200 Subject: [PATCH 67/99] clamav: 0.99.4 -> 0.100.1 --- pkgs/tools/security/clamav/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index c3aa92bf4b0..79644d35774 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, fetchpatch, pkgconfig -, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre +, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 +, libmspack, systemd }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99.4"; + version = "0.100.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp"; + sha256 = "17x5b2gh84b167h6ip9hw05w809p009yx13i4gkps92ja5jjdq44"; }; # don't install sample config files into the absolute sysconfdir folder @@ -18,16 +19,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack + systemd ]; configureFlags = [ + "--libdir=$(out)/lib" "--sysconfdir=/etc/clamav" + "--with-systemdsystemunitdir=$(out)/lib/systemd" "--disable-llvm" # enabling breaks the build at the moment "--with-zlib=${zlib.dev}" "--with-xml=${libxml2.dev}" "--with-openssl=${openssl.dev}" "--with-libcurl=${curl.dev}" + "--with-system-libmspack" "--enable-milter" ]; From 9194d147ba7a5f27de297c66058bc34aa55a9645 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 15 Jul 2018 12:57:06 -0500 Subject: [PATCH 68/99] node-packages: update to latest (ran generate.sh) --- .../node-packages/node-packages-v10.nix | 6 +- .../node-packages/node-packages-v6.nix | 1506 +++++++++-------- .../node-packages/node-packages-v8.nix | 551 +++--- 3 files changed, 1071 insertions(+), 992 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 30b63e5ca4d..b06f05ddb3e 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -213,10 +213,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.9.0"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; - sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; + sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index e183feb9972..6d60ca9a783 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -112,193 +112,193 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; - "@types/node-10.5.1" = { + "@types/node-10.5.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; - sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; + sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; }; }; - "@types/node-8.10.20" = { + "@types/node-8.10.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.20"; + version = "8.10.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz"; - sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.21.tgz"; + sha512 = "87XkD9qDXm8fIax+5y7drx84cXsu34ZZqfB7Cial3Q/2lxSoJ/+DRaWckkCbxP41wFSIrrb939VhzaNxj4eY1w=="; }; }; - "@webassemblyjs/ast-1.5.12" = { + "@webassemblyjs/ast-1.5.13" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz"; - sha512 = "bmTBEKuuhSU6dC95QIW250xO769cdYGx9rWn3uBLTw2pUpud0Z5kVuMw9m9fqbNzGeuOU2HpyuZa+yUt2CTEDA=="; + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz"; + sha512 = "49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.5.12" = { + "@webassemblyjs/floating-point-hex-parser-1.5.13" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz"; - sha512 = "epTvkdwOIPpTE9edHS+V+shetYzpTbd91XOzUli1zAS0+NSgSe6ZsNggIqUNzhma1s4bN2f/m8c6B1NMdCERAg=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz"; + sha512 = "vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA=="; }; }; - "@webassemblyjs/helper-api-error-1.5.12" = { + "@webassemblyjs/helper-api-error-1.5.13" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz"; - sha512 = "Goxag86JvLq8ucHLXFNSLYzf9wrR+CJr37DsESTAzSnGoqDTgw5eqiXSQVd/D9Biih7+DIn8UIQCxMs8emRRwg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz"; + sha512 = "dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg=="; }; }; - "@webassemblyjs/helper-buffer-1.5.12" = { + "@webassemblyjs/helper-buffer-1.5.13" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz"; - sha512 = "tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz"; + sha512 = "v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA=="; }; }; - "@webassemblyjs/helper-code-frame-1.5.12" = { + "@webassemblyjs/helper-code-frame-1.5.13" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz"; - sha512 = "0FrJgiST+MQDMvPigzs+UIk1vslLIqGadkEWdn53Lr0NsUC2JbheG9QaO3Zf6ycK2JwsHiUpGaMFcHYXStTPMA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz"; + sha512 = "yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ=="; }; }; - "@webassemblyjs/helper-fsm-1.5.12" = { + "@webassemblyjs/helper-fsm-1.5.13" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz"; - sha512 = "QBHZ45VPUJ7UyYKvUFoaxrSS9H5hbkC9U7tdWgFHmnTMutkXSEgDg2gZg3I/QTsiKOCIwx4qJUJwPd7J4D5CNQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz"; + sha512 = "hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg=="; }; }; - "@webassemblyjs/helper-module-context-1.5.12" = { + "@webassemblyjs/helper-module-context-1.5.13" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz"; - sha512 = "SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz"; + sha512 = "zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.5.12" = { + "@webassemblyjs/helper-wasm-bytecode-1.5.13" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz"; - sha512 = "0Gz5lQcyvElNVbOTKwjEmIxGwdWf+zpAW/WGzGo95B7IgMEzyyfZU+PrGHDwiSH9c0knol9G7smQnY0ljrSA6g=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz"; + sha512 = "0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw=="; }; }; - "@webassemblyjs/helper-wasm-section-1.5.12" = { + "@webassemblyjs/helper-wasm-section-1.5.13" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz"; - sha512 = "ge/CKVKBGpiJhFN9PIOQ7sPtGYJhxm/mW1Y3SpG1L6XBunfRz0YnLjW3TmhcOEFozIVyODPS1HZ9f7VR3GBGow=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz"; + sha512 = "IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw=="; }; }; - "@webassemblyjs/ieee754-1.5.12" = { + "@webassemblyjs/ieee754-1.5.13" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz"; - sha512 = "F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz"; + sha512 = "TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg=="; }; }; - "@webassemblyjs/leb128-1.5.12" = { + "@webassemblyjs/leb128-1.5.13" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz"; - sha512 = "cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz"; + sha512 = "0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg=="; }; }; - "@webassemblyjs/utf8-1.5.12" = { + "@webassemblyjs/utf8-1.5.13" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz"; - sha512 = "FX8NYQMiTRU0TfK/tJVntsi9IEKsedSsna8qtsndWVE0x3zLndugiApxdNMIOoElBV9o4j0BUqR+iwU58QfPxQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz"; + sha512 = "Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng=="; }; }; - "@webassemblyjs/wasm-edit-1.5.12" = { + "@webassemblyjs/wasm-edit-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz"; - sha512 = "r/oZAyC4EZl0ToOYJgvj+b0X6gVEKQMLT34pNNbtvWBehQOnaSXvVUA5FIYlH8ubWjFNAFqYaVGgQTjR1yuJdQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz"; + sha512 = "X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw=="; }; }; - "@webassemblyjs/wasm-gen-1.5.12" = { + "@webassemblyjs/wasm-gen-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz"; - sha512 = "LTu+cr1YRxGGiVIXWhei/35lXXEwTnQU18x4V/gE+qCSJN21QcVTMjJuasTUh8WtmBZtOlqJbOQIeN7fGnHWhg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz"; + sha512 = "yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA=="; }; }; - "@webassemblyjs/wasm-opt-1.5.12" = { + "@webassemblyjs/wasm-opt-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz"; - sha512 = "LBwG5KPA9u/uigZVyTsDpS3CVxx3AePCnTItVL+OPkRCp5LqmLsOp4a3/c5CQE0Lecm0Ss9hjUTDcbYFZkXlfQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz"; + sha512 = "IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg=="; }; }; - "@webassemblyjs/wasm-parser-1.5.12" = { + "@webassemblyjs/wasm-parser-1.5.13" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz"; - sha512 = "xset3+1AtoFYEfMg30nzCGBnhKmTBzbIKvMyLhqJT06TvYV+kA884AOUpUvhSmP6XPF3G+HVZPm/PbCGxH4/VQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz"; + sha512 = "XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg=="; }; }; - "@webassemblyjs/wast-parser-1.5.12" = { + "@webassemblyjs/wast-parser-1.5.13" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz"; - sha512 = "QWUtzhvfY7Ue9GlJ3HeOB6w5g9vNYUUnG+Y96TWPkFHJTxZlcvGfNrUoACCw6eDb9gKaHrjt77aPq41a7y8svg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz"; + sha512 = "Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A=="; }; }; - "@webassemblyjs/wast-printer-1.5.12" = { + "@webassemblyjs/wast-printer-1.5.13" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; - version = "1.5.12"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; - sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz"; + sha512 = "QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ=="; }; }; - "@zeit/schemas-1.2.0" = { + "@zeit/schemas-1.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "1.2.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.2.0.tgz"; - sha512 = "iceEQm4zFjgAVUPAj8Wto62xUJxOxicXULWFD2q9Z2Rwi1pVnz1QlDMfNTuNZUULmV7/0xFpOthf8JK8xpTYZA=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.6.0.tgz"; + sha512 = "fUCDfGPOU2FPOpX8+9ctuHs5+HIvuP3w6Fx+Q0eQLQs8Ow/GFa9zMgkYtVWhHS5S+dtXmBDm4ZpYcXtZgLQq0A=="; }; }; "CSSselect-0.4.1" = { @@ -688,13 +688,13 @@ let sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "agent-base-4.2.0" = { + "agent-base-4.2.1" = { name = "agent-base"; packageName = "agent-base"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; - sha512 = "c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"; + sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; }; }; "aggregate-error-1.0.0" = { @@ -769,15 +769,6 @@ let sha512 = "VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA=="; }; }; - "ajv-6.5.1" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz"; - sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; - }; - }; "ajv-6.5.2" = { name = "ajv"; packageName = "ajv"; @@ -922,13 +913,13 @@ let sha1 = "538ae528af8982f28ae30d86f2f17456d2609873"; }; }; - "ansi-diff-stream-1.2.1" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.1"; + "ansi-diff-1.1.1" = { + name = "ansi-diff"; + packageName = "ansi-diff"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + url = "https://registry.npmjs.org/ansi-diff/-/ansi-diff-1.1.1.tgz"; + sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; "ansi-escapes-1.4.0" = { @@ -1003,6 +994,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-split-1.0.1" = { + name = "ansi-split"; + packageName = "ansi-split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-split/-/ansi-split-1.0.1.tgz"; + sha512 = "RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg=="; + }; + }; "ansi-styles-1.0.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1876,13 +1876,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.266.1" = { + "aws-sdk-2.275.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.266.1"; + version = "2.275.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz"; - sha512 = "b8lisloCETh0Fx0il540i+Hbgf3hyegQ6ezoJFggfc1HIbqzvIjVJYJhOsYl1fL1o+iMUaVU4ZH8cSyoMFR2Tw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.275.1.tgz"; + sha512 = "lcpgoiHLhdcolUT7aJdg/CmlYO5ecf+3A+4dIceO72mFovCWZde1Rvr07QNbQ8gT0paqr5j2rs2b6c23Y/K0RQ=="; }; }; "aws-sign-0.2.0" = { @@ -1948,13 +1948,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-batch-3.1.0" = { + "azure-arm-batch-3.1.1" = { name = "azure-arm-batch"; packageName = "azure-arm-batch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.0.tgz"; - sha512 = "AwRxOn/4718n3N4rlUsnFTavKsQoNHJzcfH9BWpUadiov9mMVxH3vXPhM1sb0KVO21GPqh4s3w9s1RUpJvstkA=="; + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.1.tgz"; + sha512 = "qRv/QB8vTwnO5I8tjdEnrBuRjh4SCD2rdQaHPQatkYmx7Of3gz57JfX4FrNNZXqKIyCoTlWoNWhM/jzCAL3TyA=="; }; }; "azure-arm-cdn-4.0.1" = { @@ -2578,6 +2578,15 @@ let sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + }; + }; "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; @@ -3478,13 +3487,13 @@ let sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.1" = { + "browserify-des-1.0.2" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-incremental-3.1.1" = { @@ -4603,13 +4612,13 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; - "circular-json-0.5.4" = { + "circular-json-0.5.5" = { name = "circular-json"; packageName = "circular-json"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz"; - sha512 = "vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig=="; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz"; + sha512 = "13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA=="; }; }; "clarinet-0.11.0" = { @@ -6224,13 +6233,13 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "cordova-common-2.2.4" = { + "cordova-common-2.2.5" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.4.tgz"; - sha512 = "tL6cfygm2EUU658Id4ROs/BFETvxFKX1gj8rxoXOWR1xxzPtXfgvjiqmMBsUIbBgIZomsq09Xj48qkU7xHBJ1Q=="; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.5.tgz"; + sha1 = "f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32"; }; }; "cordova-create-1.1.2" = { @@ -6368,13 +6377,13 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "crc-3.5.0" = { + "crc-3.7.0" = { name = "crc"; packageName = "crc"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; - sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; + url = "https://registry.npmjs.org/crc/-/crc-3.7.0.tgz"; + sha512 = "ZwmUex488OBjSVOMxnR/dIa1yxisBMJNEi+UxzXpKhax8MPsQtoRQtl5Qgo+W7pcSVkRXa3BEVjaniaWKtvKvw=="; }; }; "crc32-stream-2.0.0" = { @@ -6701,13 +6710,13 @@ let sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; }; }; - "cssom-0.3.3" = { + "cssom-0.3.4" = { name = "cssom"; packageName = "cssom"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz"; - sha512 = "pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg=="; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz"; + sha512 = "+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="; }; }; "cssstyle-0.2.37" = { @@ -6908,13 +6917,13 @@ let sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; }; }; - "dat-doctor-1.4.0" = { + "dat-doctor-2.0.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.0.0.tgz"; + sha512 = "plNNUnBklePVTE5xsQA8gdYZKveT+2VnZ7Us/zY2kw+JF0mLAK+zVl0jEtl7px3jvEEQD+seVMs42uOg59dmAg=="; }; }; "dat-encoding-4.0.2" = { @@ -6962,22 +6971,22 @@ let sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; }; }; - "dat-log-1.1.1" = { + "dat-log-1.2.0" = { name = "dat-log"; packageName = "dat-log"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; - sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.2.0.tgz"; + sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.9" = { + "dat-node-3.5.11" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.9"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; + sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; }; }; "dat-registry-4.0.0" = { @@ -7763,6 +7772,15 @@ let sha1 = "b5e30361a6db023176d562892db85940a718f47e"; }; }; + "diffy-2.0.0" = { + name = "diffy"; + packageName = "diffy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diffy/-/diffy-2.0.0.tgz"; + sha512 = "T1+MF7chaOtNaBeV59td6lYlci6dCTUraySH8LDltafhd+FLTsYpJJbLVpl6S4ih6kPFMaHSIqQ92bRVvoE+3Q=="; + }; + }; "dir-glob-2.0.0" = { name = "dir-glob"; packageName = "dir-glob"; @@ -7799,22 +7817,13 @@ let sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; }; }; - "discovery-swarm-4.4.2" = { + "discovery-swarm-5.1.2" = { name = "discovery-swarm"; packageName = "discovery-swarm"; - version = "4.4.2"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; - sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; - }; - }; - "discovery-swarm-5.1.1" = { - name = "discovery-swarm"; - packageName = "discovery-swarm"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.2.tgz"; + sha512 = "aqNdl4l76PFb301I1hXkHZSakQTOXR0yRbfDtF7XrZKk+9V5gMQBbQ2xPgnQPfDVG0IeErxkQkoWqp4f9EJe5w=="; }; }; "dispensary-0.18.0" = { @@ -7853,15 +7862,6 @@ let sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg=="; }; }; - "dns-discovery-5.6.1" = { - name = "dns-discovery"; - packageName = "dns-discovery"; - version = "5.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; - }; - }; "dns-discovery-6.1.0" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7907,15 +7907,6 @@ let sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; - "dns-socket-1.6.3" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; - }; - }; "dns-socket-3.0.0" = { name = "dns-socket"; packageName = "dns-socket"; @@ -8024,13 +8015,13 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "dom4-2.1.0" = { + "dom4-2.1.3" = { name = "dom4"; packageName = "dom4"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/dom4/-/dom4-2.1.0.tgz"; - sha512 = "18oT+LfQaOT46/HmdB+t8A3+ROaN/sY/P0C9i0PyasmeuDq+iThh09gpI8rmt2ZA5B6KuHpuW2qURAZMjNs+gg=="; + url = "https://registry.npmjs.org/dom4/-/dom4-2.1.3.tgz"; + sha512 = "begvh4z5GV0kyxx+YgJZ7sIo/jsELx/v7MQxoLZpOvT5yFo18X8dfgtUmKAwdGuyMeugncylarLHlO4gIK6YNw=="; }; }; "domain-browser-1.1.7" = { @@ -8303,13 +8294,13 @@ let sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; }; }; - "ecstatic-3.2.0" = { + "ecstatic-3.2.1" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; - sha512 = "Goilx/2cfU9vvfQjgtNgc2VmJAD8CasQ6rZDqCd2u4Hsyd/qFET6nBf60jiHodevR3nl3IGzNKtrzPXWP88utQ=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz"; + sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg=="; }; }; "editions-1.3.4" = { @@ -8952,13 +8943,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.10.0" = { + "escodegen-1.11.0" = { name = "escodegen"; packageName = "escodegen"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz"; - sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; + sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; }; }; "escodegen-1.8.1" = { @@ -8997,13 +8988,13 @@ let sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; }; }; - "eslint-5.0.1" = { + "eslint-5.1.0" = { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; + sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -9015,13 +9006,13 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-scope-3.7.1" = { + "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha512 = "W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA=="; }; }; "eslint-scope-4.0.0" = { @@ -9033,6 +9024,15 @@ let sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA=="; }; }; + "eslint-utils-1.3.1" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz"; + sha512 = "Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q=="; + }; + }; "eslint-visitor-keys-1.0.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -9087,13 +9087,13 @@ let sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "esprima-fb-13001.1001.0-dev-harmony-fb" = { @@ -10446,13 +10446,13 @@ let sha512 = "uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg=="; }; }; - "follow-redirects-1.5.0" = { + "follow-redirects-1.5.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz"; - sha512 = "fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz"; + sha512 = "v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg=="; }; }; "for-each-0.3.3" = { @@ -11076,13 +11076,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "get-caller-file-1.0.2" = { + "get-caller-file-1.0.3" = { name = "get-caller-file"; packageName = "get-caller-file"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; "get-func-name-2.0.0" = { @@ -11527,13 +11527,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "global-tunnel-ng-2.1.1" = { + "global-tunnel-ng-2.4.0" = { name = "global-tunnel-ng"; packageName = "global-tunnel-ng"; - version = "2.1.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz"; - sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880"; + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.4.0.tgz"; + sha1 = "97a1847150e7f22ed30771a35aaa4922327a7957"; }; }; "globals-11.7.0" = { @@ -11635,13 +11635,13 @@ let sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw=="; }; }; - "got-8.3.1" = { + "got-8.3.2" = { name = "got"; packageName = "got"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz"; - sha512 = "tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w=="; + url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; }; }; "graceful-fs-1.2.3" = { @@ -12130,13 +12130,13 @@ let sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; }; }; - "hash.js-1.1.4" = { + "hash.js-1.1.5" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz"; + sha512 = "eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA=="; }; }; "hasha-2.2.0" = { @@ -12337,13 +12337,13 @@ let sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; - "hosted-git-info-2.6.1" = { + "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.6.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; }; }; "hot-shots-4.8.0" = { @@ -12670,13 +12670,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.17.1" = { + "hypercore-6.17.3" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.1"; + version = "6.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; + sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; }; }; "hypercore-crypto-1.0.0" = { @@ -12706,13 +12706,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.2.2" = { + "hyperdrive-http-4.3.2" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.2.2"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; + sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -13291,13 +13291,13 @@ let sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; }; }; - "ipaddr.js-1.7.0" = { + "ipaddr.js-1.8.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.7.0.tgz"; - sha1 = "2206ed334afc32e01fed3ee838b6b2521068b9d2"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; + sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; }; }; "irc-replies-2.0.1" = { @@ -13444,13 +13444,13 @@ let sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; }; }; - "is-callable-1.1.3" = { + "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; "is-ci-1.1.0" = { @@ -14245,13 +14245,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.10.0" = { + "jaeger-client-3.11.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.10.0.tgz"; - sha1 = "ad0e830ead7aabad2601a52a7e463f0d942b0091"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.11.0.tgz"; + sha1 = "4b38b820dd2a8fe355a81f4d84d85bc463c95d20"; }; }; "jed-1.1.1" = { @@ -14344,6 +14344,15 @@ let sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; "js-yaml-0.3.7" = { name = "js-yaml"; packageName = "js-yaml"; @@ -15227,15 +15236,6 @@ let sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; }; }; - "leb-0.3.0" = { - name = "leb"; - packageName = "leb"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz"; - sha1 = "32bee9fad168328d6aea8522d833f4180eed1da3"; - }; - }; "leek-0.0.24" = { name = "leek"; packageName = "leek"; @@ -15299,13 +15299,13 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-6.6.2" = { + "level-sublevel-6.6.5" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.6.2"; + version = "6.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz"; - sha512 = "+hptqmFYPKFju9QG4F6scvx3ZXkhrSmmhYui+hPzRn/jiC3DJ6VNZRKsIhGMpeajVBWfRV7XiysUThrJ/7PgXQ=="; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.5.tgz"; + sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; "leveldown-0.10.6" = { @@ -16289,13 +16289,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.10.0" = { + "log4js-2.11.0" = { name = "log4js"; packageName = "log4js"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz"; - sha512 = "NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz"; + sha512 = "z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ=="; }; }; "loggly-1.1.1" = { @@ -16334,6 +16334,15 @@ let sha1 = "d821b7138ca1cb581c172990ef14db200b5c474b"; }; }; + "long-4.0.0" = { + name = "long"; + packageName = "long"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + }; + }; "longest-1.0.1" = { name = "longest"; packageName = "longest"; @@ -16379,13 +16388,13 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; - "loose-envify-1.3.1" = { + "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; "lossless-json-1.0.2" = { @@ -16982,6 +16991,15 @@ let sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; }; }; + "menu-string-1.2.0" = { + name = "menu-string"; + packageName = "menu-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/menu-string/-/menu-string-1.2.0.tgz"; + sha512 = "b6RTFmSlLjs20Qninl0Wq6dOstjpaPM2pQ63li06pLVTGIIoxjuMRbOmYbGW8l73/AiGNoCK9yXfdfIpLIURPQ=="; + }; + }; "meow-3.7.0" = { name = "meow"; packageName = "meow"; @@ -17234,13 +17252,13 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; - "mime-db-1.34.0" = { + "mime-db-1.35.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.34.0"; + version = "1.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz"; - sha1 = "452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; + sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; }; }; "mime-types-2.0.14" = { @@ -17279,13 +17297,13 @@ let sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; - "mimic-response-1.0.0" = { + "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; "min-document-2.19.0" = { @@ -18170,22 +18188,22 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-3.3.0" = { + "nanobus-4.3.3" = { name = "nanobus"; packageName = "nanobus"; - version = "3.3.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; - sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz"; + sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; - "nanoid-1.0.4" = { + "nanoid-1.1.0" = { name = "nanoid"; packageName = "nanoid"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.4.tgz"; - sha512 = "zWPAK2WibMbVda1DvhYbahj7DAXLMvSI4Ik7553nPyJ2p8I5qJr4/j/6kgHJalrOx4FRbbme2Oa6utdzr6I/tA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.1.0.tgz"; + sha512 = "iOCqgXieGrk8/wDt1n9rZS2KB1dYVssemY0NTWjfzVr+1t1gAmdTp1u2+YHppKro3Bk5S+Gs+xmYCfpuXauYXQ=="; }; }; "nanolru-1.0.0" = { @@ -18206,13 +18224,22 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "nanotiming-1.0.1" = { + "nanoscheduler-1.0.3" = { + name = "nanoscheduler"; + packageName = "nanoscheduler"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoscheduler/-/nanoscheduler-1.0.3.tgz"; + sha512 = "jBbrF3qdU9321r8n9X7yu18DjP31Do2ItJm3mWrt90wJTrnDO+HXpoV7ftaUglAtjgj9s+OaCxGufbvx6pvbEQ=="; + }; + }; + "nanotiming-7.3.1" = { name = "nanotiming"; packageName = "nanotiming"; - version = "1.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; - sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-7.3.1.tgz"; + sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { @@ -18363,13 +18390,40 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "neat-log-1.1.2" = { + "neat-input-1.7.0" = { + name = "neat-input"; + packageName = "neat-input"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; + sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + }; + }; + "neat-log-2.4.0" = { name = "neat-log"; packageName = "neat-log"; - version = "1.1.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + url = "https://registry.npmjs.org/neat-log/-/neat-log-2.4.0.tgz"; + sha512 = "5Gb0J17bqRxKBfgetrYCZav7kpFgunDhFq0i+kEq5Kn36Cuw4IskIl3yd+/P8jCcAzaKrQ7mrb+p6r/NP5esWA=="; + }; + }; + "neat-spinner-1.0.0" = { + name = "neat-spinner"; + packageName = "neat-spinner"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-spinner/-/neat-spinner-1.0.0.tgz"; + sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; + }; + }; + "neat-tasks-1.1.1" = { + name = "neat-tasks"; + packageName = "neat-tasks"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-tasks/-/neat-tasks-1.1.1.tgz"; + sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; "needle-0.10.0" = { @@ -20886,13 +20940,13 @@ let sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; - "please-upgrade-node-3.0.2" = { + "please-upgrade-node-3.1.1" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz"; - sha512 = "bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug=="; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz"; + sha512 = "KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ=="; }; }; "plist-1.2.0" = { @@ -20913,6 +20967,15 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; + "plist-2.1.0" = { + name = "plist"; + packageName = "plist"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; + sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + }; + }; "plist-3.0.1" = { name = "plist"; packageName = "plist"; @@ -21471,13 +21534,13 @@ let sha512 = "jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ=="; }; }; - "proxy-agent-3.0.0" = { + "proxy-agent-3.0.1" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz"; - sha512 = "g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.1.tgz"; + sha512 = "mAZexaz9ZxQhYPWfAjzlrloEjW+JHiBFryE4AJXFDTnaXfmH/FKqC1swTRKuEPbHWz02flQNXFOyDUF7zfEG6A=="; }; }; "proxy-from-env-1.0.0" = { @@ -22083,15 +22146,6 @@ let sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; }; }; - "random-access-memory-2.4.0" = { - name = "random-access-memory"; - packageName = "random-access-memory"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; - sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; - }; - }; "random-access-memory-3.0.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -22767,6 +22821,15 @@ let sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; }; }; + "remove-array-items-1.0.0" = { + name = "remove-array-items"; + packageName = "remove-array-items"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.0.0.tgz"; + sha1 = "07bf42cb332f4cf6e85ead83b5e4e896d2326b21"; + }; + }; "remove-bom-buffer-3.0.0" = { name = "remove-bom-buffer"; packageName = "remove-bom-buffer"; @@ -23316,13 +23379,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "router-1.3.2" = { + "router-1.3.3" = { name = "router"; packageName = "router"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; - sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; + url = "https://registry.npmjs.org/router/-/router-1.3.3.tgz"; + sha1 = "c142f6b5ea4d6b3359022ca95b6580bd217f89cf"; }; }; "rsvp-3.6.2" = { @@ -23451,13 +23514,13 @@ let sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA=="; }; }; - "rxjs-6.2.1" = { + "rxjs-6.2.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; + sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; }; }; "safe-buffer-5.0.1" = { @@ -23883,13 +23946,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-3.2.1" = { + "serve-handler-3.3.0" = { name = "serve-handler"; packageName = "serve-handler"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; - sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.3.0.tgz"; + sha512 = "cJi7lLmrYEOLdz8sWCSNwrYJaxdhgWGQKFLPUXS4swpm/CXbQ5QRtuvIESSXQF4/iheYRNcQ+M6maH9UhTp0LA=="; }; }; "serve-index-1.7.3" = { @@ -24468,6 +24531,15 @@ let sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; }; }; + "smart-buffer-4.0.1" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz"; + sha512 = "RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg=="; + }; + }; "smartdc-auth-2.3.1" = { name = "smartdc-auth"; packageName = "smartdc-auth"; @@ -24558,13 +24630,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.88.0" = { + "snyk-1.88.2" = { name = "snyk"; packageName = "snyk"; - version = "1.88.0"; + version = "1.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz"; - sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.88.2.tgz"; + sha1 = "fff27ebbaa4f624398bd6d31b76c008912efd6b7"; }; }; "snyk-config-2.1.0" = { @@ -24882,6 +24954,15 @@ let sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; }; }; + "socks-2.2.1" = { + name = "socks"; + packageName = "socks"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.2.1.tgz"; + sha512 = "0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w=="; + }; + }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -24891,6 +24972,15 @@ let sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; }; }; + "socks-proxy-agent-4.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz"; + sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -25431,15 +25521,6 @@ let sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; }; }; - "status-logger-3.1.1" = { - name = "status-logger"; - packageName = "status-logger"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; - }; - }; "statuses-1.2.1" = { name = "statuses"; packageName = "statuses"; @@ -27241,15 +27322,6 @@ let sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; }; }; - "tunnel-0.0.4" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; - sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; - }; - }; "tunnel-0.0.5" = { name = "tunnel"; packageName = "tunnel"; @@ -27511,13 +27583,13 @@ let sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA=="; }; }; - "uglify-js-3.4.2" = { + "uglify-js-3.4.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; + sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -28195,13 +28267,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "use-3.1.0" = { + "use-3.1.1" = { name = "use"; packageName = "use"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "user-home-1.1.1" = { @@ -28366,13 +28438,13 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.7.1" = { + "utp-native-1.7.2" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.2.tgz"; + sha512 = "jxNZIa49OXRCFbbqlp0SWsTCasvD9QjumUW85++KMaT21PKMDn6dLl2GsSsf1OsWRI8yKdzXg1OxhNsifPjyEA=="; }; }; "uue-3.1.2" = { @@ -28825,13 +28897,13 @@ let sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; }; }; - "vscode-languageserver-4.2.1" = { + "vscode-languageserver-4.3.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.2.1.tgz"; - sha512 = "5WAxaK1nEpe52ZaWNMqmd6rO5CIE72J/7UkGKPUTdGa0l0haWHS69tpRz+LetBlgTpP7PYacl4xhDaLZv82a+g=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.3.0.tgz"; + sha512 = "4dTpnyTB6Q0HmMhxaG60rrpQthbTBlMtFX5cwJpPxcPzLZIFDWB3msR6TxGCzWpdYF11REIJihWByobpGkljdQ=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -28843,22 +28915,22 @@ let sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; }; }; - "vscode-languageserver-protocol-3.8.1" = { + "vscode-languageserver-protocol-3.9.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.8.1"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz"; - sha512 = "KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.9.0.tgz"; + sha512 = "i1sG5iU88Mocc7egTeh6dAow/yRWpPK5PLJaxsWsKiA+dspq1Yzr/R1bNLPc+6P/ab010lXhzdUHQY0CuIUyDw=="; }; }; - "vscode-languageserver-types-3.8.2" = { + "vscode-languageserver-types-3.9.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.2.tgz"; - sha512 = "2RMkyt1O1czGPCnkjKZWSio2D8oh3XlQ4zi4W2xL8q2Dvi4hB3/DEt+wYyzo4hmE2ZFP0RB8PXyzHyed7p1hbw=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.9.0.tgz"; + sha512 = "Qzh3VsU3t0zhKtYl1revyax+4gGHl2ejNzYXeiZYQMF3i0vX4dtPohxGDFoZYfGFQI738aXYbSUQmhLeBckDlQ=="; }; }; "vscode-uri-1.0.3" = { @@ -28879,13 +28951,13 @@ let sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; }; }; - "walk-2.3.13" = { + "walk-2.3.14" = { name = "walk"; packageName = "walk"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; - sha512 = "78SMe7To9U7kqVhSoGho3GfspA089ZDBIj2f8jElg2hi6lUCoagtDJ8sSMFNlpAh5Ib8Jt1gQ6Y7gh9mzHtFng=="; + url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz"; + sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg=="; }; }; "walk-sync-0.3.2" = { @@ -29473,13 +29545,13 @@ let sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA=="; }; }; - "ws-5.2.1" = { + "ws-5.2.2" = { name = "ws"; packageName = "ws"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz"; - sha512 = "2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "wtf-8-1.0.0" = { @@ -29599,15 +29671,6 @@ let sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; }; }; - "xml2js-0.4.17" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; - sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; - }; - }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -29653,15 +29716,6 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; - "xmlbuilder-4.2.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; - sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; - }; - }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -30023,6 +30077,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yauzl-2.10.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + }; "yauzl-2.4.1" = { name = "yauzl"; packageName = "yauzl"; @@ -30041,15 +30104,6 @@ let sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; }; }; - "yauzl-2.9.2" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; - }; - }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -30068,13 +30122,13 @@ let sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7"; }; }; - "yeoman-doctor-3.0.1" = { + "yeoman-doctor-3.0.2" = { name = "yeoman-doctor"; packageName = "yeoman-doctor"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.1.tgz"; - sha512 = "ccV0Yf7nL9dTCIY+H+7gp/qtRegf8C6CGcUIr95FEc+UBR1Y17CxPvrvH72FQ4zmDv0VM/egiMavamtVIkhEgw=="; + url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.2.tgz"; + sha512 = "/KbouQdKgnqxG6K3Tc8VBPAQLPbruQ7KkbinwR+ah507oOFobHnGs8kqj8oMfafY6rXInHdh7nC5YzicCR4Z0g=="; }; }; "yeoman-environment-2.3.0" = { @@ -30239,7 +30293,7 @@ in sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" sources."lodash-4.17.10" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30413,7 +30467,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.20" + sources."@types/node-8.10.21" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -30429,7 +30483,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."azure-arm-authorization-2.0.0" - sources."azure-arm-batch-3.1.0" + sources."azure-arm-batch-3.1.1" sources."azure-arm-cdn-4.0.1" sources."azure-arm-commerce-2.0.0" sources."azure-arm-compute-3.0.0-preview" @@ -30880,7 +30934,7 @@ in sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.11" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -30909,7 +30963,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -31011,7 +31065,7 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -31053,7 +31107,7 @@ in sources."glob-7.1.2" sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -31272,7 +31326,7 @@ in sources."hat-0.0.3" sources."hawk-0.10.2" sources."hoek-0.7.6" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -31282,7 +31336,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -31315,7 +31369,7 @@ in ]; }) sources."mime-1.6.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.3.5" @@ -31580,7 +31634,7 @@ in sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.0" + sources."follow-redirects-1.5.1" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -31679,7 +31733,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" + sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.32" sources."block-stream-0.0.9" @@ -31703,7 +31757,7 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" @@ -31727,7 +31781,7 @@ in sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) (sources."compression-1.7.2" // { @@ -31752,7 +31806,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-3.12.0" - sources."cordova-common-2.2.4" + sources."cordova-common-2.2.5" (sources."cordova-create-1.1.2" // { dependencies = [ sources."q-1.0.1" @@ -31775,7 +31829,6 @@ in sources."q-1.0.1" sources."shelljs-0.3.0" sources."underscore-1.8.3" - sources."xmlbuilder-8.2.2" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -31867,11 +31920,11 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hawk-3.1.3" sources."hmac-drbg-1.0.1" sources."hoek-2.16.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."htmlescape-1.1.1" sources."http-errors-1.6.3" sources."http-signature-1.1.1" @@ -32003,7 +32056,7 @@ in sources."pegjs-0.10.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-3.0.1" + sources."plist-2.1.0" sources."prepend-http-1.0.4" sources."process-0.11.10" sources."process-nextick-args-1.0.7" @@ -32087,7 +32140,6 @@ in dependencies = [ sources."base64-js-1.1.2" sources."plist-2.0.1" - sources."xmlbuilder-8.2.2" ]; }) sources."slash-1.0.0" @@ -32173,7 +32225,7 @@ in ]; }) sources."xdg-basedir-2.0.0" - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."xtend-4.0.1" ]; @@ -32350,20 +32402,18 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.10.0"; + version = "13.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + url = "https://registry.npmjs.org/dat/-/dat-13.11.3.tgz"; + sha512 = "YOp0II25xNPlD06/RGB5q1x244em2Sh2FdhWECnikZalmOBaujeRRJFfjbd0f5buQfapmebvTT4FVRZTZLB2HQ=="; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-align-2.0.0" + sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" + sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" @@ -32396,6 +32446,7 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."buffer-alloc-1.2.0" @@ -32403,13 +32454,17 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" - sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" + sources."ci-info-1.1.3" sources."circular-append-file-1.0.1" + sources."cli-boxes-1.0.0" + sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -32420,10 +32475,14 @@ in sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" (sources."dat-dns-3.0.1" // { @@ -32431,12 +32490,7 @@ in sources."debug-2.6.9" ]; }) - (sources."dat-doctor-1.4.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) + sources."dat-doctor-2.0.0" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.1" (sources."dat-json-1.0.2" // { @@ -32445,58 +32499,41 @@ in ]; }) sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" - (sources."dat-node-3.5.9" // { - dependencies = [ - (sources."discovery-swarm-5.1.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."pump-1.0.3" - sources."random-access-memory-3.0.0" - ]; - }) + sources."dat-log-1.2.0" + sources."dat-node-3.5.11" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" + sources."diffy-2.0.0" sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" - sources."pump-3.0.0" sources."thunky-0.1.0" ]; }) - (sources."discovery-swarm-4.4.2" // { + sources."discovery-swarm-5.1.2" + (sources."dns-discovery-6.1.0" // { dependencies = [ sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" sources."lru-2.0.1" - sources."multicast-dns-6.2.3" ]; }) sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" - sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" @@ -32506,6 +32543,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" + sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" @@ -32516,17 +32554,21 @@ in sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."global-4.3.2" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.1" // { + (sources."hypercore-6.17.3" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -32539,20 +32581,19 @@ in ]; }) sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."hyperdrive-http-4.3.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" + sources."is-ci-1.1.0" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -32560,13 +32601,21 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" sources."is-glob-2.0.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" sources."is-number-2.1.0" + sources."is-obj-1.0.1" sources."is-options-1.0.1" + sources."is-path-inside-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isobject-2.1.0" sources."isstream-0.1.2" sources."iterators-0.1.0" @@ -32586,17 +32635,22 @@ in sources."bencode-2.0.0" ]; }) + sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" + sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" - sources."lodash.flattendeep-4.4.0" sources."lodash.throttle-4.1.1" + sources."lowercase-keys-1.0.1" sources."lru-3.1.0" + sources."lru-cache-4.1.3" + sources."make-dir-1.3.0" sources."math-random-1.0.1" sources."memory-pager-1.1.0" + sources."menu-string-1.2.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."min-document-2.19.0" @@ -32617,23 +32671,34 @@ in sources."mutexify-1.2.0" sources."nan-2.10.0" sources."nanoassert-1.1.0" - sources."nanobus-3.3.0" - sources."nanotiming-1.0.1" + sources."nanobus-4.3.3" + sources."nanoscheduler-1.0.3" + sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + sources."neat-input-1.7.0" + sources."neat-log-2.4.0" + sources."neat-spinner-1.0.0" + sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."performance-now-2.1.0" + sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."prepend-http-1.0.4" sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" @@ -32646,15 +32711,12 @@ in sources."varint-5.0.0" ]; }) - sources."pump-2.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) + sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -32664,10 +32726,14 @@ in }) sources."randombytes-2.0.6" sources."range-parser-1.2.0" + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-array-items-1.0.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" @@ -32677,6 +32743,11 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.0" @@ -32694,7 +32765,6 @@ in sources."speedometer-1.1.0" sources."sshpk-1.14.2" sources."stack-trace-0.0.10" - sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" (sources."stream-parser-0.3.1" // { @@ -32706,15 +32776,18 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" (sources."subcommand-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."supports-color-5.4.0" + sources."term-size-1.2.0" sources."throttle-1.0.3" - sources."through2-2.0.3" sources."thunky-1.0.2" + sources."timed-out-4.0.1" sources."to-buffer-1.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ @@ -32729,16 +32802,22 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.1" + sources."utp-native-1.7.2" sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" + sources."which-1.3.1" + sources."widest-line-2.0.0" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -32746,11 +32825,13 @@ in sources."pkginfo-0.3.1" ]; }) - sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -32764,10 +32845,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.15.tgz"; - sha512 = "oIuRtSWj6UEU6zNEddKyE4P+fFrbZOMIaTWF8VS76hqzAln1myOtaG5zvTwF0UiD+bCmlJVFh8kcWf/kq7pksg=="; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.16.tgz"; + sha512 = "OEqRYUN/9WskTRRvOJyP3mTPa0HQecfUk+c9YgH1MUkGSDdArnIvoJcUvALBlgrezZvqyO2weQwFSBfORAU8Pw=="; }; dependencies = [ sources."minimist-1.2.0" @@ -32978,7 +33059,7 @@ in sources."level-0.18.0" sources."level-packager-0.18.0" sources."level-post-1.0.7" - (sources."level-sublevel-6.6.2" // { + (sources."level-sublevel-6.6.5" // { dependencies = [ (sources."levelup-0.19.1" // { dependencies = [ @@ -33105,7 +33186,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.266.1" + sources."aws-sdk-2.275.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -33170,8 +33251,8 @@ in sources."uuid-3.1.0" sources."verror-1.10.0" sources."wordwrap-0.0.3" - sources."xml2js-0.4.17" - sources."xmlbuilder-4.2.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -33501,7 +33582,7 @@ in 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.6.1" + sources."hosted-git-info-2.7.1" sources."import-jsx-1.3.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -33540,7 +33621,7 @@ in sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" sources."log-update-2.3.0" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" @@ -33553,7 +33634,7 @@ in ]; }) sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -33661,10 +33742,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; + sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; }; dependencies = [ sources."acorn-5.7.1" @@ -33711,9 +33792,10 @@ in sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-4.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" @@ -33743,7 +33825,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-5.2.0" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" @@ -33832,10 +33914,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz"; - sha512 = "NRn6C7G0HzA2hEFlLzD+M/m1eIeTtmxxO45n7Pp+Nk/gBp8mfIXlE8wSLdePt/g0Sl7BhuU/hY/E+kD/8P5LeQ=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.1.tgz"; + sha512 = "27O0P4SaTm7RDrykMyLTIX964VhXxmyGEXur6Er1V3qZ1YL1kWvL74pzdPonWOb6N/ghYFZY4a23L7vZDRHjMg=="; }; dependencies = [ sources."acorn-5.7.1" @@ -33849,14 +33931,20 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - sources."babel-code-frame-6.26.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-1.1.3" // { + (sources."chalk-2.4.1" // { dependencies = [ - sources."supports-color-2.0.0" + sources."ansi-styles-3.2.1" ]; }) sources."chardet-0.4.2" @@ -33875,19 +33963,12 @@ in sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-5.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" - ]; - }) + sources."eslint-5.1.0" sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-4.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" @@ -33916,16 +33997,8 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-5.2.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" - ]; - }) - sources."is-callable-1.1.3" + sources."inquirer-5.2.0" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" @@ -33984,28 +34057,17 @@ in sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" - (sources."string-width-2.1.1" // { + sources."string-width-2.1.1" + sources."string.prototype.matchall-2.0.0" + (sources."strip-ansi-4.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.matchall-2.0.0" - sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."supports-color-3.2.3" // { - dependencies = [ - sources."has-flag-1.0.0" - ]; - }) + sources."supports-color-5.4.0" sources."symbol-observable-1.0.1" - (sources."table-4.0.3" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -34028,10 +34090,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.6.tgz"; - sha1 = "ab09c530c3a5165986b7db1909f349a4a6106b50"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz"; + sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e"; }; buildInputs = globalBuildInputs; meta = { @@ -34103,7 +34165,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" sources."indent-string-2.1.0" sources."inherits-2.0.3" @@ -34946,7 +35008,7 @@ in ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" @@ -35074,22 +35136,22 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.17"; + version = "3.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.17.tgz"; - sha512 = "O+StuKL0UWfwX5Zv4rFxd60DPcT5DVjGq1AlnP6VQ8wzudft/W4hx5Wl98aSYNwFBHY6XWJreRw/BehX4l+diQ=="; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz"; + sha512 = "Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA=="; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.11" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."he-1.1.1" sources."lower-case-1.1.4" sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.4.2" // { + (sources."uglify-js-3.4.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -35099,7 +35161,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = http://kangax.github.io/html-minifier/; + homepage = https://kangax.github.io/html-minifier/; license = "MIT"; }; production = true; @@ -35133,6 +35195,7 @@ in sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" + sources."base64-js-1.3.0" sources."basic-auth-1.1.0" sources."binary-extensions-1.11.0" sources."bl-1.2.2" @@ -35150,6 +35213,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-1.8.5" + sources."buffer-5.1.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -35175,7 +35239,7 @@ in sources."cookie-signature-1.0.6" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."crc-3.5.0" + sources."crc-3.7.0" sources."crc32-stream-2.0.0" sources."cross-spawn-5.1.0" sources."dargs-5.1.0" @@ -35225,7 +35289,7 @@ in sources."statuses-1.4.0" ]; }) - sources."follow-redirects-1.5.0" + sources."follow-redirects-1.5.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" @@ -35251,6 +35315,7 @@ in ]; }) sources."iconv-lite-0.4.23" + sources."ieee754-1.1.12" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-3.3.0" @@ -35487,7 +35552,7 @@ in sources."isexe-2.0.0" (sources."js-yaml-3.12.0" // { dependencies = [ - sources."esprima-4.0.0" + sources."esprima-4.0.1" ]; }) sources."kind-of-3.2.2" @@ -35637,7 +35702,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-0.0.8" - (sources."jaeger-client-3.10.0" // { + (sources."jaeger-client-3.11.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -35664,10 +35729,11 @@ in sources."thriftrw-3.11.2" sources."type-detect-4.0.8" sources."typescript-2.8.3" + sources."uuid-3.3.2" sources."vscode-jsonrpc-3.6.2" - sources."vscode-languageserver-4.2.1" - sources."vscode-languageserver-protocol-3.8.1" - sources."vscode-languageserver-types-3.8.2" + sources."vscode-languageserver-4.3.0" + sources."vscode-languageserver-protocol-3.9.0" + sources."vscode-languageserver-types-3.9.0" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -35914,10 +35980,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; - sha512 = "UFnB5j1C7XrUWQIlFGrjerFVuc04TZAyoEavfb0VofdjguWWN97aCtWsv1uX6pXylJiLw+agsyTPCnNjL6W4ag=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.5.tgz"; + sha512 = "PxRt8e2ktX3ktNSGqfH+6ghfwXUjQ9pS/asLBSS4CSf1Jl4811WCvZL2YPvmdaWzi7LBAd/Y6lVg1BMnph51nw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -35929,7 +35995,7 @@ in sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -36005,7 +36071,7 @@ in sources."combined-stream-1.0.6" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.7.2" @@ -36071,7 +36137,7 @@ in sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."global-dirs-0.1.1" @@ -36131,7 +36197,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.0.4" + sources."nanoid-1.1.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -36152,7 +36218,7 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."please-upgrade-node-3.0.2" + sources."please-upgrade-node-3.1.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" sources."proxy-addr-2.0.3" @@ -36244,7 +36310,7 @@ in }; dependencies = [ sources."argparse-1.0.10" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -36268,7 +36334,7 @@ in sources."accepts-1.3.5" sources."addressparser-1.0.1" sources."after-0.8.2" - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ajv-5.5.2" (sources."amqplib-0.5.2" // { dependencies = [ @@ -36341,7 +36407,7 @@ in sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chokidar-2.0.4" - sources."circular-json-0.5.4" + sources."circular-json-0.5.5" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -36409,7 +36475,7 @@ in sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.10.0" + sources."escodegen-1.11.0" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -36470,7 +36536,7 @@ in sources."statuses-1.3.1" ]; }) - (sources."follow-redirects-1.5.0" // { + (sources."follow-redirects-1.5.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36580,7 +36646,7 @@ in sources."libqp-1.1.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" - (sources."log4js-2.10.0" // { + (sources."log4js-2.11.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36663,6 +36729,7 @@ in (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.1.0" + sources."socks-proxy-agent-3.0.1" ]; }) sources."pac-resolver-3.0.0" @@ -36684,7 +36751,7 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" sources."promisify-call-2.0.4" - (sources."proxy-agent-3.0.0" // { + (sources."proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36767,7 +36834,12 @@ in ]; }) sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + (sources."socks-proxy-agent-4.0.1" // { + dependencies = [ + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + ]; + }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -36839,7 +36911,7 @@ in }) sources."upath-1.1.0" sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" (sources."useragent-2.2.1" // { dependencies = [ sources."lru-cache-2.2.4" @@ -36891,7 +36963,7 @@ in sources."commander-2.6.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.5.2" @@ -37036,10 +37108,10 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; - sha512 = "6Yb98XarLXKNjGvVX9LNdZNeE22VsTCUZixtAqrO5WLjM9Mtyybn6fSI2m3A4drSMvSh8WYALuT6S5c/XnBbqA=="; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.1.0.tgz"; + sha512 = "vGXaMNGZRr4cYvW+xMVg+rg7qd5DX9SbGXl+0S3k85+gRZVK4K7UvxPWzKb/qiMwe+4bx3EOrW2o4mbdb1WnsA=="; }; dependencies = [ sources."append-buffer-1.0.2" @@ -37182,7 +37254,7 @@ in }) sources."css-select-1.2.0" sources."css-what-2.1.0" - sources."cssom-0.3.3" + sources."cssom-0.3.4" sources."cssstyle-0.2.37" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -37201,7 +37273,7 @@ in sources."ecc-jsbn-0.1.1" sources."entities-1.1.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.10.0" + sources."escodegen-1.11.0" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -37216,7 +37288,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fs.realpath-1.0.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" @@ -37502,7 +37574,7 @@ in sources."string-width-1.0.2" ]; }) - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."meow-3.7.0" @@ -37524,7 +37596,7 @@ in sources."handlebars-4.0.11" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."iconv-lite-0.4.23" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" @@ -37796,10 +37868,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.4"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + url = "https://registry.npmjs.org/less/-/less-3.7.1.tgz"; + sha512 = "Cmf5XJlzNklkBC8eAa+Ef16AHUBAkApHNAw3x9Vmn84h2BvGrri5Id7kf6H1n6SN74Fc0WdHIRPlFMxsl0eJkA=="; }; dependencies = [ sources."ajv-5.5.2" @@ -38470,7 +38542,7 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" @@ -38505,7 +38577,7 @@ in sources."deprecated-0.0.1" sources."detect-file-1.0.0" sources."detect-newline-2.1.0" - sources."dom4-2.1.0" + sources."dom4-2.1.3" (sources."duplexer2-0.0.2" // { dependencies = [ sources."isarray-0.0.1" @@ -39013,7 +39085,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.2" // { + (sources."uglify-js-3.4.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -39038,7 +39110,7 @@ in ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" @@ -39142,7 +39214,7 @@ in sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -39260,7 +39332,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -39339,7 +39411,7 @@ in sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."walk-2.3.13" + sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -39608,7 +39680,7 @@ in sources."hawk-3.1.3" sources."headless-0.1.7" sources."hoek-2.16.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."iconv-lite-0.4.19" @@ -39809,10 +39881,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz"; + sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -39896,10 +39968,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.5"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; + sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -40233,7 +40305,7 @@ in sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.0" @@ -40356,7 +40428,7 @@ in sources."entities-1.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ @@ -40798,10 +40870,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; + sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; }; buildInputs = globalBuildInputs; meta = { @@ -40963,7 +41035,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."walk-2.3.13" + sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; @@ -41016,7 +41088,7 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."execa-0.7.0" sources."fast-diff-1.1.2" sources."find-up-1.1.2" @@ -41131,7 +41203,7 @@ in sha512 = "dLmGi7IGixJEHKetErIH460MYiYIzAoxuVsloZFu9e1p9U8K0yULx7YQ1+VzrjZbB+wqq67ES1SfOvKVb/qMDQ=="; }; dependencies = [ - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -41160,12 +41232,12 @@ in sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."hoek-4.2.1" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.23" (sources."inquirer-3.3.0" // { @@ -41289,7 +41361,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.8.2" + sources."vscode-languageserver-types-3.9.0" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -41363,7 +41435,7 @@ in sources."combined-stream-1.0.6" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.7.2" @@ -41394,7 +41466,7 @@ in sources."entities-1.1.1" sources."error-ex-1.3.2" sources."escape-html-1.0.3" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ @@ -41431,7 +41503,7 @@ in sources."function-bind-1.1.1" sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."getpass-0.1.7" sources."glob-6.0.4" sources."graceful-fs-4.1.11" @@ -41444,7 +41516,7 @@ in sources."har-validator-5.0.3" sources."has-symbols-1.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."hot-shots-4.8.0" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -41745,7 +41817,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-headers-3.0.2" sources."iconv-lite-0.4.23" sources."immediate-chunk-store-1.0.8" @@ -41768,7 +41840,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -41793,7 +41865,7 @@ in sources."meow-3.7.0" sources."mime-2.3.1" sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.3.5" @@ -42004,7 +42076,7 @@ in sources."component-inherit-0.0.3" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) sources."compression-1.5.2" @@ -42133,7 +42205,7 @@ in sources."mime-1.3.4" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -42542,7 +42614,7 @@ in sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" (sources."browserify-incremental-3.1.1" // { dependencies = [ sources."JSONStream-0.10.0" @@ -42663,7 +42735,7 @@ in ]; }) sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" @@ -42919,7 +42991,7 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" + sources."use-3.1.1" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" @@ -43527,14 +43599,14 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; - sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw=="; + url = "https://registry.npmjs.org/serve/-/serve-9.2.0.tgz"; + sha512 = "Of6n6QupoV+ybolrWS1e18Truux7VeYUa52XAo8no2dYKDAT+pWZZmrxf4RdCqoVTMfNWhvv8pjDnf8y1m3HkQ=="; }; dependencies = [ - sources."@zeit/schemas-1.2.0" - sources."ajv-6.5.1" + sources."@zeit/schemas-1.6.0" + sources."ajv-6.5.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -43595,7 +43667,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - sources."serve-handler-3.2.1" + sources."serve-handler-3.3.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -43889,7 +43961,7 @@ in sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ - sources."mime-db-1.34.0" + sources."mime-db-1.35.0" ]; }) (sources."compression-1.7.2" // { @@ -43926,7 +43998,7 @@ in sources."es6-shim-0.21.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" sources."express-5.0.0-alpha.6" sources."express-json5-0.1.0" @@ -44038,7 +44110,7 @@ in ]; }) sources."rimraf-2.4.5" - (sources."router-1.3.2" // { + (sources."router-1.3.3" // { dependencies = [ sources."setprototypeof-1.1.0" sources."utils-merge-1.0.1" @@ -44487,11 +44559,11 @@ in sources."entities-1.1.1" sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."foreach-2.0.5" sources."function-bind-1.1.1" sources."has-1.0.3" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.1" @@ -44866,13 +44938,13 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."jspm-config-0.3.4" sources."latest-version-3.1.0" sources."listify-1.0.0" sources."lockfile-1.0.4" sources."log-update-1.0.2" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" @@ -44986,13 +45058,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; + sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; }; dependencies = [ - sources."commander-2.15.1" + sources."commander-2.16.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -45007,10 +45079,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.28"; + version = "1.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.28.tgz"; - sha512 = "rXb0l9jqiIWeKvrlUnK0/SYOmOKHe3nw1AV/VWqJERMkaoI5XJ1Pfu4pDnqWEtbSLVLE9dvffeleqISO6qK4BQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.29.tgz"; + sha512 = "0aahbSMJj2FX4rpU6Rkp0eeW7SGKvWA8zGECRCJdfZ5wMAxFRzwddincC/8FOAIReM2jng6d75XeNrNsQdMB7w=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -45164,7 +45236,7 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getmac-1.4.3" sources."getpass-0.1.7" @@ -45185,7 +45257,7 @@ in sources."mkdirp-0.3.0" ]; }) - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" @@ -45535,7 +45607,7 @@ in sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" @@ -45668,7 +45740,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -45728,7 +45800,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -45906,30 +45978,34 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.14.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz"; - sha512 = "CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.16.0.tgz"; + sha512 = "oNx9djAd6uAcccyfqN3hyXLNMjZHiRySZmBQ4c8FNmf1SNJGhx7n9TSvHNyXxgToRdH65g/Q97s94Ip9N6F7xg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.5.12" - sources."@webassemblyjs/floating-point-hex-parser-1.5.12" - sources."@webassemblyjs/helper-api-error-1.5.12" - sources."@webassemblyjs/helper-buffer-1.5.12" - sources."@webassemblyjs/helper-code-frame-1.5.12" - sources."@webassemblyjs/helper-fsm-1.5.12" - sources."@webassemblyjs/helper-module-context-1.5.12" - sources."@webassemblyjs/helper-wasm-bytecode-1.5.12" - sources."@webassemblyjs/helper-wasm-section-1.5.12" - sources."@webassemblyjs/ieee754-1.5.12" - sources."@webassemblyjs/leb128-1.5.12" - sources."@webassemblyjs/utf8-1.5.12" - sources."@webassemblyjs/wasm-edit-1.5.12" - sources."@webassemblyjs/wasm-gen-1.5.12" - sources."@webassemblyjs/wasm-opt-1.5.12" - sources."@webassemblyjs/wasm-parser-1.5.12" - sources."@webassemblyjs/wast-parser-1.5.12" - sources."@webassemblyjs/wast-printer-1.5.12" + sources."@webassemblyjs/ast-1.5.13" + sources."@webassemblyjs/floating-point-hex-parser-1.5.13" + sources."@webassemblyjs/helper-api-error-1.5.13" + sources."@webassemblyjs/helper-buffer-1.5.13" + sources."@webassemblyjs/helper-code-frame-1.5.13" + sources."@webassemblyjs/helper-fsm-1.5.13" + sources."@webassemblyjs/helper-module-context-1.5.13" + sources."@webassemblyjs/helper-wasm-bytecode-1.5.13" + sources."@webassemblyjs/helper-wasm-section-1.5.13" + sources."@webassemblyjs/ieee754-1.5.13" + (sources."@webassemblyjs/leb128-1.5.13" // { + dependencies = [ + sources."long-4.0.0" + ]; + }) + sources."@webassemblyjs/utf8-1.5.13" + sources."@webassemblyjs/wasm-edit-1.5.13" + sources."@webassemblyjs/wasm-gen-1.5.13" + sources."@webassemblyjs/wasm-opt-1.5.13" + sources."@webassemblyjs/wasm-parser-1.5.13" + sources."@webassemblyjs/wast-parser-1.5.13" + sources."@webassemblyjs/wast-printer-1.5.13" sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.2" @@ -45970,7 +46046,7 @@ in sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -46030,7 +46106,7 @@ in sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" - sources."eslint-scope-3.7.1" + sources."eslint-scope-3.7.3" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."events-1.1.1" @@ -46096,7 +46172,7 @@ in ]; }) sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.5" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.12" @@ -46126,7 +46202,6 @@ in sources."json-schema-traverse-0.4.1" sources."json5-0.5.1" sources."kind-of-6.0.2" - sources."leb-0.3.0" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" @@ -46338,7 +46413,7 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" + sources."use-3.1.1" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" @@ -46448,7 +46523,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.2.0" // { + (sources."ecstatic-3.2.1" // { dependencies = [ sources."mime-1.6.0" ]; @@ -46479,7 +46554,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.7.0" + sources."ipaddr.js-1.8.0" sources."is-ascii-1.0.0" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" @@ -46503,7 +46578,7 @@ in sources."mediasource-2.2.1" sources."memory-chunk-store-1.3.0" sources."mime-2.3.1" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -46658,7 +46733,7 @@ in sources."wide-align-1.1.3" sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-5.2.1" + sources."ws-5.2.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -46685,7 +46760,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.1" + sources."@types/node-10.5.2" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -46706,7 +46781,7 @@ in ]; }) sources."adm-zip-0.4.11" - sources."agent-base-4.2.0" + sources."agent-base-4.2.1" sources."ajv-6.5.0" sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" @@ -46795,6 +46870,11 @@ in sources."extend-shallow-2.0.1" ]; }) + (sources."buffer-5.1.0" // { + dependencies = [ + sources."base64-js-1.3.0" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -46873,7 +46953,7 @@ in sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" - sources."crc-3.5.0" + sources."crc-3.7.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -46953,7 +47033,7 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.10.0" // { + (sources."escodegen-1.11.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -46998,7 +47078,7 @@ in }) ]; }) - sources."eslint-scope-3.7.1" + sources."eslint-scope-3.7.3" sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.4" sources."esprima-3.1.3" @@ -47095,7 +47175,7 @@ in }) sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."get-caller-file-1.0.2" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-uri-2.0.2" sources."get-value-2.0.6" @@ -47145,7 +47225,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."htmlparser2-3.9.2" sources."http-errors-1.6.3" (sources."http-proxy-agent-2.1.0" // { @@ -47160,6 +47240,7 @@ in ]; }) sources."iconv-lite-0.4.23" + sources."ieee754-1.1.12" sources."ignore-3.3.10" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -47237,7 +47318,7 @@ in sources."js-tokens-3.0.2" (sources."js-yaml-3.12.0" // { dependencies = [ - sources."esprima-4.0.0" + sources."esprima-4.0.1" ]; }) sources."jsbn-0.1.1" @@ -47292,7 +47373,7 @@ in sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" sources."longest-streak-1.0.0" - sources."loose-envify-1.3.1" + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."macos-release-1.1.0" @@ -47416,6 +47497,7 @@ in (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.1.0" + sources."socks-proxy-agent-3.0.1" ]; }) sources."pac-resolver-3.0.0" @@ -47458,7 +47540,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" - (sources."proxy-agent-3.0.0" // { + (sources."proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -47587,7 +47669,7 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.88.0" // { + (sources."snyk-1.88.2" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -47649,7 +47731,12 @@ in ]; }) sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + (sources."socks-proxy-agent-4.0.1" // { + dependencies = [ + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + ]; + }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" (sources."source-map-support-0.5.3" // { @@ -47787,11 +47874,7 @@ in sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - (sources."use-3.1.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."use-3.1.1" sources."user-home-2.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" @@ -47895,10 +47978,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.3.tgz"; - sha512 = "v1z5HW9oZF82ntIx9janKzn/6KS+YXe+dYwCtA/TVCWafr+bTVE914uDkmcJTMbqS1enzoZ3Dy7mveRYQUZ3dg=="; + url = "https://registry.npmjs.org/yo/-/yo-2.0.4.tgz"; + sha512 = "IFqP6MBVbyN/EG1jPqBdzV9HNmnOFyC6u/CVN7KcQpxejulspdvY1IdxX0Aj0fMSFkoZGO3HX94e8rcxLHZN7A=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -48005,6 +48088,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" + sources."config-chain-1.1.11" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -48114,9 +48198,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."global-tunnel-ng-2.1.1" + sources."global-tunnel-ng-2.4.0" sources."globby-8.0.1" - sources."got-8.3.1" + sources."got-8.3.2" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -48136,7 +48220,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.6.1" + sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" @@ -48252,7 +48336,7 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mixin-deep-1.3.1" // { @@ -48271,6 +48355,7 @@ in sources."nice-try-1.0.4" sources."normalize-package-data-2.4.0" sources."normalize-url-2.0.1" + sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ sources."got-7.1.0" @@ -48348,6 +48433,7 @@ in sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."psl-1.1.28" sources."punycode-1.4.1" @@ -48394,7 +48480,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -48534,7 +48620,7 @@ in sources."tough-cookie-2.4.3" sources."trim-newlines-1.0.0" sources."tslib-1.9.3" - sources."tunnel-0.0.4" + sources."tunnel-0.0.5" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twig-1.12.0" @@ -48562,7 +48648,7 @@ in sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."use-3.1.0" + sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" @@ -48574,7 +48660,7 @@ in sources."pify-2.3.0" ]; }) - sources."walk-2.3.13" + sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.0" sources."win-release-1.1.1" @@ -48597,7 +48683,7 @@ in sources."supports-color-3.2.3" ]; }) - sources."yeoman-doctor-3.0.1" + sources."yeoman-doctor-3.0.2" (sources."yeoman-environment-2.3.0" // { dependencies = [ sources."chardet-0.4.2" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index bcd5d2fa86e..241679e0b3b 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.1" = { + "@types/node-10.5.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; - sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; + sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; }; }; "@types/superagent-3.5.6" = { @@ -148,13 +148,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "ansi-diff-stream-1.2.1" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.1"; + "ansi-diff-1.1.1" = { + name = "ansi-diff"; + packageName = "ansi-diff"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + url = "https://registry.npmjs.org/ansi-diff/-/ansi-diff-1.1.1.tgz"; + sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; "ansi-escapes-1.4.0" = { @@ -202,6 +202,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-split-1.0.1" = { + name = "ansi-split"; + packageName = "ansi-split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-split/-/ansi-split-1.0.1.tgz"; + sha512 = "RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg=="; + }; + }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -805,15 +814,6 @@ let sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; }; }; - "buffer-indexof-1.1.1" = { - name = "buffer-indexof"; - packageName = "buffer-indexof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; - }; - }; "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; @@ -1588,13 +1588,13 @@ let sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; }; }; - "dat-doctor-1.4.0" = { + "dat-doctor-2.0.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.0.0.tgz"; + sha512 = "plNNUnBklePVTE5xsQA8gdYZKveT+2VnZ7Us/zY2kw+JF0mLAK+zVl0jEtl7px3jvEEQD+seVMs42uOg59dmAg=="; }; }; "dat-encoding-4.0.2" = { @@ -1642,22 +1642,22 @@ let sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; }; }; - "dat-log-1.1.1" = { + "dat-log-1.2.0" = { name = "dat-log"; packageName = "dat-log"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-log/-/dat-log-1.1.1.tgz"; - sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; + url = "https://registry.npmjs.org/dat-log/-/dat-log-1.2.0.tgz"; + sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.9" = { + "dat-node-3.5.11" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.9"; + version = "3.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.11.tgz"; + sha512 = "8vDc4XwOtOdZgtw/YSb5k/8KIu0+jByaZCsWv5gY5RbrnCouh0Qa7CvIWezZyl0FFke5LIvHuzme2iRiEYIdOw=="; }; }; "dat-registry-4.0.0" = { @@ -1912,6 +1912,15 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; + "diffy-2.0.0" = { + name = "diffy"; + packageName = "diffy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diffy/-/diffy-2.0.0.tgz"; + sha512 = "T1+MF7chaOtNaBeV59td6lYlci6dCTUraySH8LDltafhd+FLTsYpJJbLVpl6S4ih6kPFMaHSIqQ92bRVvoE+3Q=="; + }; + }; "directory-index-html-2.1.0" = { name = "directory-index-html"; packageName = "directory-index-html"; @@ -1930,31 +1939,13 @@ let sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; }; }; - "discovery-swarm-4.4.2" = { + "discovery-swarm-5.1.2" = { name = "discovery-swarm"; packageName = "discovery-swarm"; - version = "4.4.2"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-4.4.2.tgz"; - sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; - }; - }; - "discovery-swarm-5.1.1" = { - name = "discovery-swarm"; - packageName = "discovery-swarm"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; - }; - }; - "dns-discovery-5.6.1" = { - name = "dns-discovery"; - packageName = "dns-discovery"; - version = "5.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.2.tgz"; + sha512 = "aqNdl4l76PFb301I1hXkHZSakQTOXR0yRbfDtF7XrZKk+9V5gMQBbQ2xPgnQPfDVG0IeErxkQkoWqp4f9EJe5w=="; }; }; "dns-discovery-6.1.0" = { @@ -1966,15 +1957,6 @@ let sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ=="; }; }; - "dns-packet-1.3.1" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; - }; - }; "dns-packet-4.2.0" = { name = "dns-packet"; packageName = "dns-packet"; @@ -1984,15 +1966,6 @@ let sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; - "dns-socket-1.6.3" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; - }; - }; "dns-socket-3.0.0" = { name = "dns-socket"; packageName = "dns-socket"; @@ -2002,15 +1975,6 @@ let sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q=="; }; }; - "dns-txt-2.0.2" = { - name = "dns-txt"; - packageName = "dns-txt"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; - }; - }; "dom-walk-0.1.1" = { name = "dom-walk"; packageName = "dom-walk"; @@ -2200,13 +2164,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "etag-1.8.1" = { @@ -3109,13 +3073,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.17.1" = { + "hypercore-6.17.3" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.1"; + version = "6.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; + sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; }; }; "hypercore-crypto-1.0.0" = { @@ -3145,13 +3109,13 @@ let sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; }; }; - "hyperdrive-http-4.2.2" = { + "hyperdrive-http-4.3.2" = { name = "hyperdrive-http"; packageName = "hyperdrive-http"; - version = "4.2.2"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.3.2.tgz"; + sha512 = "dVEtiPiaoR0BNtO8SBvBqRJQMVMV1zzXLIWBBGjVefhISfybfyOBuGi7xzhGnHj+4oK7E8Wwt2Bo5W/J5ecpIg=="; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -3352,13 +3316,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.3" = { + "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; "is-ci-1.1.0" = { @@ -3937,6 +3901,15 @@ let sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; }; }; + "keypress-0.2.1" = { + name = "keypress"; + packageName = "keypress"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; + sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; + }; + }; "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -4270,15 +4243,6 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; - }; - }; "lodash.foreach-2.4.1" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -4540,6 +4504,15 @@ let sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg=="; }; }; + "menu-string-1.2.0" = { + name = "menu-string"; + packageName = "menu-string"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/menu-string/-/menu-string-1.2.0.tgz"; + sha512 = "b6RTFmSlLjs20Qninl0Wq6dOstjpaPM2pQ63li06pLVTGIIoxjuMRbOmYbGW8l73/AiGNoCK9yXfdfIpLIURPQ=="; + }; + }; "merkle-tree-stream-3.0.3" = { name = "merkle-tree-stream"; packageName = "merkle-tree-stream"; @@ -4612,6 +4585,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.3.1" = { + name = "mime"; + packageName = "mime"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz"; + sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="; + }; + }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -4792,15 +4774,6 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multicast-dns-6.2.3" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; - }; - }; "multicast-dns-7.0.0" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -4882,13 +4855,13 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-3.3.0" = { + "nanobus-4.3.3" = { name = "nanobus"; packageName = "nanobus"; - version = "3.3.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-3.3.0.tgz"; - sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz"; + sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; "nanomatch-1.2.13" = { @@ -4900,13 +4873,22 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "nanotiming-1.0.1" = { + "nanoscheduler-1.0.3" = { + name = "nanoscheduler"; + packageName = "nanoscheduler"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoscheduler/-/nanoscheduler-1.0.3.tgz"; + sha512 = "jBbrF3qdU9321r8n9X7yu18DjP31Do2ItJm3mWrt90wJTrnDO+HXpoV7ftaUglAtjgj9s+OaCxGufbvx6pvbEQ=="; + }; + }; + "nanotiming-7.3.1" = { name = "nanotiming"; packageName = "nanotiming"; - version = "1.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanotiming/-/nanotiming-1.0.1.tgz"; - sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; + url = "https://registry.npmjs.org/nanotiming/-/nanotiming-7.3.1.tgz"; + sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; "native-promise-only-0.8.1" = { @@ -4927,13 +4909,40 @@ let sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; - "neat-log-1.1.2" = { + "neat-input-1.7.0" = { + name = "neat-input"; + packageName = "neat-input"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.7.0.tgz"; + sha512 = "oPAF9Js5IVPL6eYxn4vE4mwSuqEKTODnlcWHyv7/BW5RXaRs7QOmjp2eOp2KQ/vLuo3UoEsFcezrfHwSrec+2g=="; + }; + }; + "neat-log-2.4.0" = { name = "neat-log"; packageName = "neat-log"; - version = "1.1.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + url = "https://registry.npmjs.org/neat-log/-/neat-log-2.4.0.tgz"; + sha512 = "5Gb0J17bqRxKBfgetrYCZav7kpFgunDhFq0i+kEq5Kn36Cuw4IskIl3yd+/P8jCcAzaKrQ7mrb+p6r/NP5esWA=="; + }; + }; + "neat-spinner-1.0.0" = { + name = "neat-spinner"; + packageName = "neat-spinner"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-spinner/-/neat-spinner-1.0.0.tgz"; + sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; + }; + }; + "neat-tasks-1.1.1" = { + name = "neat-tasks"; + packageName = "neat-tasks"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-tasks/-/neat-tasks-1.1.1.tgz"; + sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; "needle-2.2.1" = { @@ -4981,13 +4990,13 @@ let sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; }; }; - "nodemon-1.17.5" = { + "nodemon-1.18.2" = { name = "nodemon"; packageName = "nodemon"; - version = "1.17.5"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; + sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; }; }; "nopt-1.0.10" = { @@ -5575,24 +5584,6 @@ let sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; }; }; - "pump-1.0.3" = { - name = "pump"; - packageName = "pump"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; - sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw=="; - }; - }; - "pump-2.0.1" = { - name = "pump"; - packageName = "pump"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; - }; - }; "pump-3.0.0" = { name = "pump"; packageName = "pump"; @@ -5683,15 +5674,6 @@ let sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; }; }; - "random-access-memory-2.4.0" = { - name = "random-access-memory"; - packageName = "random-access-memory"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; - sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; - }; - }; "random-access-memory-3.0.0" = { name = "random-access-memory"; packageName = "random-access-memory"; @@ -5881,6 +5863,15 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "remove-array-items-1.0.0" = { + name = "remove-array-items"; + packageName = "remove-array-items"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.0.0.tgz"; + sha1 = "07bf42cb332f4cf6e85ead83b5e4e896d2326b21"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -6052,13 +6043,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-6.2.1" = { + "rxjs-6.2.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; + sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; }; }; "safe-buffer-5.1.2" = { @@ -6538,15 +6529,6 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "status-logger-3.1.1" = { - name = "status-logger"; - packageName = "status-logger"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; - }; - }; "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; @@ -6907,15 +6889,6 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; "thunkify-2.1.2" = { name = "thunkify"; packageName = "thunkify"; @@ -7366,13 +7339,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "use-3.1.0" = { + "use-3.1.1" = { name = "use"; packageName = "use"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "user-home-2.0.0" = { @@ -7420,13 +7393,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "utp-native-1.7.1" = { + "utp-native-1.7.2" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.2.tgz"; + sha512 = "jxNZIa49OXRCFbbqlp0SWsTCasvD9QjumUW85++KMaT21PKMDn6dLl2GsSsf1OsWRI8yKdzXg1OxhNsifPjyEA=="; }; }; "uuid-3.3.2" = { @@ -7591,15 +7564,6 @@ let sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; }; }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; - }; - }; "wrap-fn-0.1.5" = { name = "wrap-fn"; packageName = "wrap-fn"; @@ -7708,13 +7672,13 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "yauzl-2.9.2" = { + "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; }; "z-schema-3.22.0" = { @@ -7777,7 +7741,7 @@ in sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.1" + sources."@types/node-10.5.2" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7907,20 +7871,18 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.10.0"; + version = "13.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + url = "https://registry.npmjs.org/dat/-/dat-13.11.3.tgz"; + sha512 = "YOp0II25xNPlD06/RGB5q1x244em2Sh2FdhWECnikZalmOBaujeRRJFfjbd0f5buQfapmebvTT4FVRZTZLB2HQ=="; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-align-2.0.0" + sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" + sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" @@ -7953,6 +7915,7 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."buffer-alloc-1.2.0" @@ -7960,13 +7923,17 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" - sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" + sources."ci-info-1.1.3" sources."circular-append-file-1.0.1" + sources."cli-boxes-1.0.0" + sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" @@ -7977,10 +7944,14 @@ in sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" (sources."dat-dns-3.0.1" // { @@ -7988,12 +7959,7 @@ in sources."debug-2.6.9" ]; }) - (sources."dat-doctor-1.4.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) + sources."dat-doctor-2.0.0" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.1" (sources."dat-json-1.0.2" // { @@ -8002,58 +7968,41 @@ in ]; }) sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" - (sources."dat-node-3.5.9" // { - dependencies = [ - (sources."discovery-swarm-5.1.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."pump-1.0.3" - sources."random-access-memory-3.0.0" - ]; - }) + sources."dat-log-1.2.0" + sources."dat-node-3.5.11" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" + sources."diffy-2.0.0" sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" - sources."pump-3.0.0" sources."thunky-0.1.0" ]; }) - (sources."discovery-swarm-4.4.2" // { + sources."discovery-swarm-5.1.2" + (sources."dns-discovery-6.1.0" // { dependencies = [ sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" sources."lru-2.0.1" - sources."multicast-dns-6.2.3" ]; }) sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" - sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" + sources."dot-prop-4.2.0" + sources."duplexer3-0.1.4" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" + sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.1" @@ -8063,6 +8012,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fd-read-stream-1.1.0" + sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" @@ -8073,17 +8023,21 @@ in sources."form-data-2.3.2" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."global-4.3.2" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.1" // { + (sources."hypercore-6.17.3" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -8096,20 +8050,19 @@ in ]; }) sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."hyperdrive-http-4.3.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."is-callable-1.1.3" + sources."is-callable-1.1.4" + sources."is-ci-1.1.0" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -8117,13 +8070,21 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" sources."is-glob-2.0.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" sources."is-number-2.1.0" + sources."is-obj-1.0.1" sources."is-options-1.0.1" + sources."is-path-inside-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" sources."is-string-1.0.4" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isobject-2.1.0" sources."isstream-0.1.2" sources."iterators-0.1.0" @@ -8143,17 +8104,22 @@ in sources."bencode-2.0.0" ]; }) + sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" + sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" - sources."lodash.flattendeep-4.4.0" sources."lodash.throttle-4.1.1" + sources."lowercase-keys-1.0.1" sources."lru-3.1.0" + sources."lru-cache-4.1.3" + sources."make-dir-1.3.0" sources."math-random-1.0.1" sources."memory-pager-1.1.0" + sources."menu-string-1.2.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."min-document-2.19.0" @@ -8174,23 +8140,34 @@ in sources."mutexify-1.2.0" sources."nan-2.10.0" sources."nanoassert-1.1.0" - sources."nanobus-3.3.0" - sources."nanotiming-1.0.1" + sources."nanobus-4.3.3" + sources."nanoscheduler-1.0.3" + sources."nanotiming-7.3.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + sources."neat-input-1.7.0" + sources."neat-log-2.4.0" + sources."neat-spinner-1.0.0" + sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" sources."parse-glob-3.0.4" sources."parse-headers-2.0.1" sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."performance-now-2.1.0" + sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."prepend-http-1.0.4" sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" @@ -8203,15 +8180,12 @@ in sources."varint-5.0.0" ]; }) - sources."pump-2.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) + sources."random-access-memory-3.0.0" sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -8221,10 +8195,14 @@ in }) sources."randombytes-2.0.6" sources."range-parser-1.2.0" + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-array-items-1.0.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" @@ -8234,6 +8212,11 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.0" @@ -8251,7 +8234,6 @@ in sources."speedometer-1.1.0" sources."sshpk-1.14.2" sources."stack-trace-0.0.10" - sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" (sources."stream-parser-0.3.1" // { @@ -8263,15 +8245,18 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" (sources."subcommand-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."supports-color-5.4.0" + sources."term-size-1.2.0" sources."throttle-1.0.3" - sources."through2-2.0.3" sources."thunky-1.0.2" + sources."timed-out-4.0.1" sources."to-buffer-1.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ @@ -8286,16 +8271,22 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.1" + sources."utp-native-1.7.2" sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" + sources."which-1.3.1" + sources."widest-line-2.0.0" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -8303,11 +8294,13 @@ in sources."pkginfo-0.3.1" ]; }) - sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -8573,10 +8566,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz"; + sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -8660,10 +8653,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.9.0"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; - sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; + sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; }; buildInputs = globalBuildInputs; meta = { @@ -8830,7 +8823,7 @@ in sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."extend-3.0.1" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" @@ -8963,7 +8956,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.1" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -9023,7 +9016,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -9188,7 +9181,7 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-stream-3.3.4" sources."execa-0.7.0" @@ -9405,7 +9398,7 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.17.5" // { + (sources."nodemon-1.18.2" // { dependencies = [ sources."debug-3.1.0" sources."supports-color-5.4.0" @@ -9657,7 +9650,7 @@ in sources."uri-js-3.0.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + sources."use-3.1.1" sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -9691,10 +9684,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; + sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; }; buildInputs = globalBuildInputs; meta = { From 4626d0b2556a5cab8f6ff7fd7cd9966a7ab5a36b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 15 Jul 2018 13:42:44 -0500 Subject: [PATCH 69/99] gnomecast: init at 1.4.0 also pycaption, required dep. --- pkgs/applications/video/gnomecast/default.nix | 28 +++++++++++++ .../python-modules/pycaption/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 1 + 4 files changed, 72 insertions(+) create mode 100644 pkgs/applications/video/gnomecast/default.nix create mode 100644 pkgs/development/python-modules/pycaption/default.nix diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix new file mode 100644 index 00000000000..a2faaf39f08 --- /dev/null +++ b/pkgs/applications/video/gnomecast/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, gtk3, gobjectIntrospection, ffmpeg, wrapGAppsHook }: + +with python3Packages; +buildPythonApplication rec { + pname = "gnomecast"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = [ + PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + gtk3 gobjectIntrospection + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + ''; + + meta = with lib; { + description = "A native Linux GUI for Chromecasting local files"; + homepage = https://github.com/keredson/gnomecast; + license = with licenses; [ gpl3 ]; + }; +} diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix new file mode 100644 index 00000000000..845630e514f --- /dev/null +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchpatch +, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, beautifulsoup4, lxml, cssutils, future, enum34, six +}: + +buildPythonPackage rec { + pname = "pycaption"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h"; + }; + + disabled = !isPy3k; + + prePatch = '' + substituteInPlace setup.py \ + --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ + 'beautifulsoup4>=4.2.1,<=4.6.0' + ''; + + # don't require enum34 on python >= 3.4 + patches = [ + (fetchpatch { + url = "https://github.com/pbs/pycaption/pull/161.patch"; + sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j"; + }) + ]; + + propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + + # Tests not included in pypi (?) + doCheck = false; + + meta = with lib; { + description = "Closed caption converter"; + homepage = https://github.com/pbs/pycaption; + license = with licenses; [ asl20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc216ac311c..c98815169ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16490,6 +16490,8 @@ with pkgs; gmtp = callPackage ../applications/misc/gmtp {}; + gnomecast = callPackage ../applications/video/gnomecast { }; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f04e149bac9..c7b0e838ae6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10376,6 +10376,7 @@ in { }; }; + pycaption = callPackage ../development/python-modules/pycaption { }; pycdio = buildPythonPackage rec { name = "pycdio-2.0.0"; From 7d1076873c57e862943938677b93ad7db1b41482 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 15 Jul 2018 19:00:51 -0400 Subject: [PATCH 70/99] dbeaver: 5.1.2 -> 5.1.3 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ed08356fdc5..d23b789780b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.2"; + version = "5.1.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2"; + sha256 = "1znkr28pfpclq2gl2prllb3hwq9v9rj5xl7xarq0hsggzfg9n071"; }; installPhase = '' From 3cf0c5d00713ef6686b3f93bdb7db84ea6863b40 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 15 Jul 2018 23:27:18 +0000 Subject: [PATCH 71/99] processing3: fix sandbox build --- pkgs/applications/graphics/processing3/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 87566950bfe..803257d9392 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { rm core/library/*.jar cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + # do not download a file during build + ${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 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf"; + } + } ./java/reference.zip + # suppress "Not fond of this Java VM" message box substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ --replace 'Messages.showWarning' 'if (false) Messages.showWarning' From f5831fb66ba7d9b9b84c133024af6a404d3e3915 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 16 Jul 2018 01:33:57 +0200 Subject: [PATCH 72/99] =?UTF-8?q?xneur:=200.13.0=20=E2=86=92=200.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gxneur/default.nix | 8 +-- pkgs/applications/misc/xneur/default.nix | 53 ++++++++----------- .../misc/xneur/src-for-default.nix | 9 ---- .../misc/xneur/src-info-for-default.nix | 5 -- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 27 insertions(+), 52 deletions(-) delete mode 100644 pkgs/applications/misc/xneur/src-for-default.nix delete mode 100644 pkgs/applications/misc/xneur/src-info-for-default.nix diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 69c91d25755..940b0a7252f 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: +{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur, libglade, GConf, pcre }: stdenv.mkDerivation { name = "gxneur-0.13.0"; - + src = fetchurl { url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 + xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur libglade GConf pcre ]; preConfigure = '' sed -e 's@-Werror@@' -i configure - sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c + sed -e 's@"xneur"@"${xneur}/bin/xneur"@' -i src/misc.c ''; meta = { diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ff7c6a9e976..c6438a21f2c 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,44 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, - gdk_pixbuf}: - -let s = import ./src-for-default.nix; in +{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (s) version name; + name = "xneur-${version}"; + version = "0.20.0"; + src = fetchurl { - inherit(s) url; - sha256 = s.hash; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; + sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr"; }; - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk2 pango enchant gdk_pixbuf - ]; + nativeBuildInputs = [ + pkgconfig intltool wrapGAppsHook + ]; - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure + buildInputs = [ + xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib + xosd xorg.libXext xorg.libXi libnotify + enchant gdk_pixbuf + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + + postPatch = '' sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include" - - export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" ''; - meta = { + meta = with stdenv.lib; { description = "Utility for switching between keyboard layouts"; homepage = https://xneur.ru; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix deleted file mode 100644 index a7db13bd81d..00000000000 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.13.0"; - name="xneur-0.13.0"; - hash="19z8nnfj9paf877k0nrqy6dih69l81svxymqg6llh7ndgkw20hgd"; - url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.13.0/tgz/xneur-0.13.0.tar.bz2"; - - -} diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix deleted file mode 100644 index 0de3e83baf7..00000000000 --- a/pkgs/applications/misc/xneur/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://xneur.ru/downloads"; - baseName = "xneur"; - versionReferenceCreator = "$(replaceAllVersionOccurences)"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e58f106d69..1dc645ff61c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19152,12 +19152,10 @@ with pkgs; xmind = callPackage ../applications/misc/xmind { }; - xneur_0_13 = callPackage ../applications/misc/xneur { }; + xneur = callPackage ../applications/misc/xneur { }; xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; - xneur = xneur_0_13; - gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; }; From c19652a60f9df1c6531ddf84928e1a3dea2db84a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 16 Jul 2018 01:35:28 +0200 Subject: [PATCH 73/99] xneur_0_8: drop --- pkgs/applications/misc/xneur/0.8.nix | 29 ---------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/misc/xneur/0.8.nix diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix deleted file mode 100644 index 897c861e40a..00000000000 --- a/pkgs/applications/misc/xneur/0.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell -, imlib2, xorg, xosd }: - -stdenv.mkDerivation { - name = "xneur-0.8.0"; - - src = fetchurl { - url = https://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; - sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; - }; - - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext - ]; - - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - ''; - - meta = { - description = "Utility for switching between keyboard layouts"; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dc645ff61c..e42ca369cf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19154,8 +19154,6 @@ with pkgs; xneur = callPackage ../applications/misc/xneur { }; - xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; - gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; }; From f4e510302f9282ea66afe55ae6167fd6adf37e73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 16 Jul 2018 01:44:32 +0200 Subject: [PATCH 74/99] =?UTF-8?q?gxneur:=200.13.0=20=E2=86=92=200.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gxneur/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 940b0a7252f..ec041902b25 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur, libglade, GConf, pcre }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { - name = "gxneur-0.13.0"; + name = "gxneur-0.20.0"; src = fetchurl { - url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; - sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; + url = https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz; + sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur - libglade GConf pcre + libglade GConf pcre libappindicator-gtk2 ]; - preConfigure = '' - sed -e 's@-Werror@@' -i configure - sed -e 's@"xneur"@"${xneur}/bin/xneur"@' -i src/misc.c - ''; - meta = { description = "GUI for XNEUR keyboard layout switcher"; platforms = stdenv.lib.platforms.linux; From f1fbf818c4a94c67fcdb171ba00f1fef4a0aef2a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 16 Jul 2018 01:06:43 +0200 Subject: [PATCH 75/99] autoPatchelfHook: Run after patchelf's setup hook So far the runtimeDependencies variable has been rather useless unless you also set dontPatchelf, because the patchelf setup hook ran *after* the autoPatchelfHook and thus stripped off the additional RPATHs added using runtimeDependencies. I did this by moving the autoPatchelfHook to be run in postFixup instead of fixupOutput, however I needed to replicate the for loop that runs the hook on all outputs. Until we have a way to influence order of execution for hooks I've marked this with an XXX so that we can use fixupOutput again. Tested this against all packages that use autoPatchelfHook using the following and checking whether the output contains any errors concerning shared libraries: nix-build -E 'with import ./. { config.allowUnfree = true; }; runCommand "test-executables" { drvs = [ masterpdfeditor franz zoom-us anydesk teamviewer maxx oracle-instantclient cups-kyodialog3 virtlyst powershell ]; } "for i in $drvs; do for b in $i/bin/*; do \"$b\" || :; done; done" ' Signed-off-by: aszlig Fixes: https://github.com/NixOS/nixpkgs/issues/43082 Cc: @Ericson2314 --- pkgs/build-support/setup-hooks/auto-patchelf.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index f40cdcf4cad..32fdb1000e2 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -172,4 +172,14 @@ autoPatchelf() { done } -fixupOutputHooks+=(autoPatchelf) +# XXX: This should ultimately use fixupOutputHooks but we currently don't have +# a way to enforce the order. If we have $runtimeDependencies set, the setup +# hook of patchelf is going to ruin everything and strip out those additional +# RPATHs. +# +# So what we do here is basically run in postFixup and emulate the same +# behaviour as fixupOutputHooks because the setup hook for patchelf is run in +# fixupOutput and the postFixup hook runs later. +postFixupHooks+=( + 'for output in $outputs; do prefix="${!output}" autoPatchelf; done' +) From 682ef85c6fdb19b1e8cd0d0a430ea4ec6dfa3954 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 15 Jul 2018 22:13:52 -0400 Subject: [PATCH 76/99] Make GHCJS 8.4 the default, in line with LTS 12.x --- pkgs/development/compilers/ghcjs-ng/README.md | 6 +++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md index 3e1598c83b0..b75e4331651 100644 --- a/pkgs/development/compilers/ghcjs-ng/README.md +++ b/pkgs/development/compilers/ghcjs-ng/README.md @@ -12,9 +12,9 @@ Updating --- ``` -$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \ +$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \ | jq '{ url, rev, fetchSubmodules, sha256 }' \ - > 8.2/git.json -$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix + > 8.4/git.json +$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix ``` diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cca0b7ba346..5fef4872db2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -84,7 +84,7 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = compiler.ghcjs82; + ghcjs = compiler.ghcjs84; ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; @@ -166,7 +166,7 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs82; + ghcjs = packages.ghcjs84; ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs710; From 8488982ee3863678e5b013100de6cb1b4e4a1c7c Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 15 Jul 2018 22:41:27 -0400 Subject: [PATCH 77/99] Fixed some core packages in GHCJS 8.4 --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index f1a60f5ea87..1e9492f3ec9 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -23,6 +23,11 @@ self: super: }; in stage1 // stage2 // { + # GHCJS does not ship with the same core packages as GHC. + # https://github.com/ghcjs/ghcjs/issues/676 + stm = self.stm_2_4_5_0; + ghc-compact = self.ghc-compact_0_1_0_0; + network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); From e76f382c756eefdcbf16151f427589dcc0a13d2d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 16 Jul 2018 01:36:57 +0300 Subject: [PATCH 78/99] nginxModules: sorting of modules alphabetically --- pkgs/servers/http/nginx/modules.nix | 243 ++++++++++++++-------------- 1 file changed, 121 insertions(+), 122 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index a2b57a594b0..1f6fcc31943 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,6 +15,34 @@ inputs = [ pkgs.brotli ]; }; + dav = { + src = fetchFromGitHub { + owner = "arut"; + repo = "nginx-dav-ext-module"; + rev = "v0.1.0"; + sha256 = "1ifahd69vz715g3zim618jbmxb7kcmzykc696grskxm0svpy294k"; + }; + inputs = [ pkgs.expat ]; + }; + + develkit = { + src = fetchFromGitHub { + owner = "simpl"; + repo = "ngx_devel_kit"; + rev = "v0.3.1rc1"; + sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; + }; + }; + + echo = { + src = fetchFromGitHub { + owner = "openresty"; + repo = "echo-nginx-module"; + rev = "v0.61"; + sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; + }; + }; + fancyindex = { src = fetchFromGitHub { owner = "aperezdc"; @@ -24,6 +52,24 @@ }; }; + fastcgi-cache-purge = { + src = fetchFromGitHub { + owner = "FRiCKLE"; + repo = "ngx_cache_purge"; + rev = "2.3"; + sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; + }; + }; + + fluentd = { + src = fetchFromGitHub { + owner = "fluent"; + repo = "nginx-fluentd-module"; + rev = "8af234043059c857be27879bc547c141eafd5c13"; + sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm"; + }; + }; + ipscrub = { src = fetchFromGitHub { owner = "masonicboom"; @@ -34,32 +80,18 @@ inputs = [ pkgs.libbsd ]; }; - rtmp ={ - src = fetchFromGitHub { - owner = "arut"; - repo = "nginx-rtmp-module"; - rev = "v1.2.1"; - sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn"; - }; - }; - - dav = { - src = fetchFromGitHub { - owner = "arut"; - repo = "nginx-dav-ext-module"; - rev = "v0.1.0"; - sha256 = "1ifahd69vz715g3zim618jbmxb7kcmzykc696grskxm0svpy294k"; - }; - inputs = [ pkgs.expat ]; - }; - - moreheaders = { + lua = { src = fetchFromGitHub { owner = "openresty"; - repo = "headers-more-nginx-module"; - rev = "v0.33"; - sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53"; + repo = "lua-nginx-module"; + rev = "v0.10.13"; + sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822"; }; + inputs = [ pkgs.luajit ]; + preConfigure = '' + export LUAJIT_LIB="${pkgs.luajit}/lib" + export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" + ''; }; modsecurity = { @@ -80,100 +112,12 @@ inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; - echo = { + moreheaders = { src = fetchFromGitHub { owner = "openresty"; - repo = "echo-nginx-module"; - rev = "v0.61"; - sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; - }; - }; - - develkit = { - src = fetchFromGitHub { - owner = "simpl"; - repo = "ngx_devel_kit"; - rev = "v0.3.1rc1"; - sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; - }; - }; - - lua = { - src = fetchFromGitHub { - owner = "openresty"; - repo = "lua-nginx-module"; - rev = "v0.10.13"; - sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822"; - }; - inputs = [ pkgs.luajit ]; - preConfigure = '' - export LUAJIT_LIB="${pkgs.luajit}/lib" - export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" - ''; - }; - - set-misc = { - src = fetchFromGitHub { - owner = "openresty"; - repo = "set-misc-nginx-module"; - rev = "v0.32"; - sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax"; - }; - }; - - sla = { - src = fetchFromGitHub { - owner = "goldenclone"; - repo = "nginx-sla"; - rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; - sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; - }; - }; - - fluentd = { - src = fetchFromGitHub { - owner = "fluent"; - repo = "nginx-fluentd-module"; - rev = "8af234043059c857be27879bc547c141eafd5c13"; - sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm"; - }; - }; - - pam = { - src = fetchFromGitHub { - owner = "stogh"; - repo = "ngx_http_auth_pam_module"; - rev = "v1.5.1"; - sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; - }; - inputs = [ pkgs.pam ]; - }; - - statsd = { - src = fetchFromGitHub { - owner = "apcera"; - repo = "nginx-statsd"; - rev = "b970e40467a624ba710c9a5106879a0554413d15"; - sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; - }; - }; - - upstream-check = { - src = fetchFromGitHub { - owner = "yaoweibin"; - repo = "nginx_upstream_check_module"; - rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04"; - sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; - }; - }; - - # For an example usage, see https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/ - fastcgi-cache-purge = { - src = fetchFromGitHub { - owner = "FRiCKLE"; - repo = "ngx_cache_purge"; - rev = "2.3"; - sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; + repo = "headers-more-nginx-module"; + rev = "v0.33"; + sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53"; }; }; @@ -207,12 +151,67 @@ inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps }; - shibboleth = { - src = fetchFromGitHub { - owner = "nginx-shib"; - repo = "nginx-http-shibboleth"; - rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; - sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; - }; + pam = { + src = fetchFromGitHub { + owner = "stogh"; + repo = "ngx_http_auth_pam_module"; + rev = "v1.5.1"; + sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; }; + inputs = [ pkgs.pam ]; + }; + + rtmp ={ + src = fetchFromGitHub { + owner = "arut"; + repo = "nginx-rtmp-module"; + rev = "v1.2.1"; + sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn"; + }; + }; + + set-misc = { + src = fetchFromGitHub { + owner = "openresty"; + repo = "set-misc-nginx-module"; + rev = "v0.32"; + sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax"; + }; + }; + + shibboleth = { + src = fetchFromGitHub { + owner = "nginx-shib"; + repo = "nginx-http-shibboleth"; + rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; + sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + }; + }; + + sla = { + src = fetchFromGitHub { + owner = "goldenclone"; + repo = "nginx-sla"; + rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; + sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; + }; + }; + + statsd = { + src = fetchFromGitHub { + owner = "apcera"; + repo = "nginx-statsd"; + rev = "b970e40467a624ba710c9a5106879a0554413d15"; + sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; + }; + }; + + upstream-check = { + src = fetchFromGitHub { + owner = "yaoweibin"; + repo = "nginx_upstream_check_module"; + rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04"; + sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; + }; + }; } From 68ea661bb438ec995fc26c0a2a3cc8040421e1b3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 15 Jul 2018 22:53:28 -0400 Subject: [PATCH 79/99] Fix various packages under GHCJS --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 1e9492f3ec9..dfb500f27f8 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -202,4 +202,11 @@ self: super: base-orphans = dontCheck super.base-orphans; distributive = dontCheck super.distributive; + + # https://github.com/glguy/th-abstraction/issues/53 + th-abstraction = dontCheck super.th-abstraction; + # https://github.com/dreixel/syb/issues/21 + syb = dontCheck super.syb; + # https://github.com/ghcjs/ghcjs/issues/677 + hspec-core = dontCheck super.hspec-core; } From ff83aca51139a21a2dc6a2c20a25a0fad12358f6 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 15 Jul 2018 22:53:54 -0400 Subject: [PATCH 80/99] Added ghcjs-base to GHCJS 8.4 / 8.2 --- pkgs/development/compilers/ghcjs-ng/README.md | 1 + .../compilers/ghcjs-ng/default.nix | 7 ++++- .../compilers/ghcjs-ng/ghcjs-base.nix | 29 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md index b75e4331651..6292f0cd4d2 100644 --- a/pkgs/development/compilers/ghcjs-ng/README.md +++ b/pkgs/development/compilers/ghcjs-ng/README.md @@ -16,5 +16,6 @@ $ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \ | jq '{ url, rev, fetchSubmodules, sha256 }' \ > 8.4/git.json $ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix +$ cabal2nix git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix ``` diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 9aa3efe614e..ddabb7ca6bf 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -18,6 +18,7 @@ , lib , nodePackages , ghcjsDepOverrides ? (_:_:{}) +, haskell }: let @@ -48,7 +49,11 @@ let # Relics of the old GHCJS build system stage1Packages = []; - mkStage2 = _: {}; + mkStage2 = { callPackage }: { + # https://github.com/ghcjs/ghcjs-base/issues/110 + # https://github.com/ghcjs/ghcjs-base/pull/111 + ghcjs-base = haskell.lib.dontCheck (haskell.lib.doJailbreak (callPackage ./ghcjs-base.nix {})); + }; haskellCompilerName = "ghcjs-${bootGhcjs.version}"; }; diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix new file mode 100644 index 00000000000..d03843aa336 --- /dev/null +++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix @@ -0,0 +1,29 @@ +{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring +, containers, deepseq, directory, dlist, fetchgit, ghc-prim +, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck +, quickcheck-unicode, random, scientific, stdenv, test-framework +, test-framework-hunit, test-framework-quickcheck2, text, time +, transformers, unordered-containers, vector +}: +mkDerivation { + pname = "ghcjs-base"; + version = "0.2.0.0"; + src = fetchgit { + url = "git://github.com/ghcjs/ghcjs-base"; + sha256 = "0qr05m0djll3x38dhl85pl798arsndmwfhil8yklhb70lxrbvfrs"; + rev = "01014ade3f8f5ae677df192d7c2a208bd795b96c"; + }; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring containers deepseq dlist + ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit + primitive QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://github.com/ghcjs/ghcjs-base"; + description = "base library for GHCJS"; + license = stdenv.lib.licenses.mit; +} From 2781b1fcbc71f1140f715d9c064b92354e5ef5a1 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 15 Jul 2018 22:54:19 -0400 Subject: [PATCH 81/99] Fix ghcjs-dom-jsffi with GHCJS 8.4 --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index dfb500f27f8..c79406a9472 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -126,7 +126,6 @@ self: super: }); ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { - setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ]; libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; isLibrary = true; }); From 7307c35f3092efc753740a0b503663367f13edc1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 23:58:01 +0300 Subject: [PATCH 82/99] mariadb: 10.2.15 -> 10.2.16 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d12621a4608..126a8cf0690 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.15"; + version = "10.2.16"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; + sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1"; name = "mariadb-${version}.tar.gz"; }; From 152f6087b333ea91e358c976e9a1ee3588314d55 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 16 Jul 2018 12:49:38 +1000 Subject: [PATCH 83/99] mpv: add Cocoa support for macOS Only enable X11 Support on Linux by default. Add CoreFoundation first in the list of buildInputs to ensure that it is loaded before CF-osx allowing it to provide . --- pkgs/applications/video/mpv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7880c315087..61e3a7d895d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -3,7 +3,7 @@ , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin -, x11Support ? true, +, x11Support ? stdenv.isLinux, libGLU_combined ? null, libX11 ? null, libXext ? null, @@ -98,7 +98,8 @@ in stdenv.mkDerivation rec { patchShebangs ./TOOLS/ ''; - NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext"; + NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " + + optionalString stdenv.isDarwin "-framework CoreFoundation"; configureFlags = [ "--enable-libmpv-shared" @@ -155,7 +156,7 @@ in stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - libiconv Cocoa CoreAudio + CoreFoundation libiconv Cocoa CoreAudio ]); enableParallelBuilding = true; From f68920176c24bd70cfdf772bab7bd3997a3f25d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Jul 2018 21:07:06 -0700 Subject: [PATCH 84/99] shairport-sync: 3.1.7 -> 3.2 --- pkgs/servers/shairport-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index f7a9fc65835..e880e490a6a 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.1.7"; + version = "3.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1ip8vlyly190fhcd55am5xvqisvch8mnw50xwbm663dapdb1f8ys"; + sha256 = "07b0g5iyjmqyq6zxx5mv72kri66jw6wv6i3gzax6jhkdiag06lwm"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; From 794a60a2fbd76dfdbf6ec0e57dc0726bae3bdc56 Mon Sep 17 00:00:00 2001 From: fragamus Date: Sun, 15 Jul 2018 23:12:07 -0500 Subject: [PATCH 85/99] bliss: fix header location (#43170) --- pkgs/applications/science/math/bliss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index b96aa60da68..1b7a9736007 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include + mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include/bliss mv bliss $out/bin mv html/* COPYING* $out/share/doc/bliss mv *.a $out/lib - mv *.h *.hh $out/include + mv *.h *.hh $out/include/bliss ''; meta = with stdenv.lib; { From fd2448b2e6ec49808bb3a92e7ad99ac8318bb8e5 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Sun, 15 Jul 2018 17:40:53 -0700 Subject: [PATCH 86/99] aerospike: init at 4.2.0.4 Co-authored-by: Volth --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/databases/aerospike.nix | 155 ++++++++++++++++++ pkgs/servers/nosql/aerospike/default.nix | 36 ++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 196 insertions(+) create mode 100644 nixos/modules/services/databases/aerospike.nix create mode 100644 pkgs/servers/nosql/aerospike/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index aac86087f9e..ffe8fbf2c00 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -143,6 +143,7 @@ jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused + aerospike = 111; ngircd = 112; btsync = 113; minecraft = 114; @@ -436,6 +437,7 @@ jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused + aerospike = 111; #ngircd = 112; # unused btsync = 113; #minecraft = 114; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf30fc693fc..7bbf942b6a3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -200,6 +200,7 @@ ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix + ./services/databases/aerospike.nix ./services/databases/clickhouse.nix ./services/databases/couchdb.nix ./services/databases/firebird.nix diff --git a/nixos/modules/services/databases/aerospike.nix b/nixos/modules/services/databases/aerospike.nix new file mode 100644 index 00000000000..5f33164998b --- /dev/null +++ b/nixos/modules/services/databases/aerospike.nix @@ -0,0 +1,155 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.aerospike; + + aerospikeConf = pkgs.writeText "aerospike.conf" '' + # This stanza must come first. + service { + user aerospike + group aerospike + paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1. + proto-fd-max 15000 + work-directory ${cfg.workDir} + } + logging { + console { + context any info + } + } + mod-lua { + system-path ${cfg.package}/share/udf/lua + user-path ${cfg.workDir}/udf/lua + } + network { + ${cfg.networkConfig} + } + ${cfg.extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.aerospike = { + enable = mkEnableOption "Aerospike server"; + + package = mkOption { + default = pkgs.aerospike; + type = types.package; + description = "Which Aerospike derivation to use"; + }; + + workDir = mkOption { + type = types.str; + default = "/var/lib/aerospike"; + description = "Location where Aerospike stores its files"; + }; + + networkConfig = mkOption { + type = types.lines; + default = '' + service { + address any + port 3000 + } + + heartbeat { + address any + mode mesh + port 3002 + interval 150 + timeout 10 + } + + fabric { + address any + port 3001 + } + + info { + address any + port 3003 + } + ''; + description = "network section of configuration file"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + namespace test { + replication-factor 2 + memory-size 4G + default-ttl 30d + storage-engine memory + } + ''; + description = "Extra configuration"; + }; + }; + + }; + + + ###### implementation + + config = mkIf config.services.aerospike.enable { + + users.users.aerospike = { + name = "aerospike"; + group = "aerospike"; + uid = config.ids.uids.aerospike; + description = "Aerospike server user"; + }; + users.groups.aerospike.gid = config.ids.gids.aerospike; + + systemd.services.aerospike = rec { + description = "Aerospike server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/asd --fgdaemon --config-file ${aerospikeConf}"; + User = "aerospike"; + Group = "aerospike"; + LimitNOFILE = 100000; + PermissionsStartOnly = true; + }; + + preStart = '' + if [ $(echo "$(${pkgs.procps}/bin/sysctl -n kernel.shmall) < 4294967296" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "kernel.shmall too low, setting to 4G pages" + ${pkgs.procps}/bin/sysctl -w kernel.shmall=4294967296 + fi + if [ $(echo "$(${pkgs.procps}/bin/sysctl -n kernel.shmmax) < 1073741824" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "kernel.shmmax too low, setting to 1GB" + ${pkgs.procps}/bin/sysctl -w kernel.shmmax=1073741824 + fi + if [ $(echo "$(cat /proc/sys/net/core/rmem_max) < 15728640" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "increasing socket buffer limit (/proc/sys/net/core/rmem_max): $(cat /proc/sys/net/core/rmem_max) -> 15728640" + echo 15728640 > /proc/sys/net/core/rmem_max + fi + if [ $(echo "$(cat /proc/sys/net/core/wmem_max) < 5242880" | ${pkgs.bc}/bin/bc) == "1" ]; then + echo "increasing socket buffer limit (/proc/sys/net/core/wmem_max): $(cat /proc/sys/net/core/wmem_max) -> 5242880" + echo 5242880 > /proc/sys/net/core/wmem_max + fi + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/smd" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/udf" + install -d -m0700 -o ${serviceConfig.User} -g ${serviceConfig.Group} "${cfg.workDir}/udf/lua" + ''; + }; + + }; + +} diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix new file mode 100644 index 00000000000..4426128dafd --- /dev/null +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "aerospike-server-${version}"; + version = "4.2.0.4"; + + src = fetchFromGitHub { + owner = "aerospike"; + repo = "aerospike-server"; + rev = version; + sha256 = "1vqi3xir4l57v62q1ns3713vajxffs6crss8fpvbcs57p7ygx3s7"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ openssl zlib ]; + + preBuild = '' + patchShebangs build/gen_version + substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}' + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/udf + cp target/Linux-x86_64/bin/asd $out/bin/asd + cp -dpR modules/lua-core/src $out/share/udf/lua + ''; + + meta = with stdenv.lib; { + description = "Flash-optimized, in-memory, NoSQL database"; + homepage = http://aerospike.com/; + license = licenses.agpl3; + platforms = [ "x86_64-linux" ]; + maintainer = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e71563ba47..e0e4bfd4043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,6 +429,8 @@ with pkgs; portaudioSupport = config.aegisub.portaudioSupport or false; }; + aerospike = callPackage ../servers/nosql/aerospike { }; + aespipe = callPackage ../tools/security/aespipe { }; aescrypt = callPackage ../tools/misc/aescrypt { }; From 79362be2832b9ed1db72ae057305afb89960b950 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 16 Jul 2018 01:14:55 -0400 Subject: [PATCH 87/99] Update readme with --compiler option for GHCJS --- pkgs/development/compilers/ghcjs-ng/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md index 6292f0cd4d2..99ad980c965 100644 --- a/pkgs/development/compilers/ghcjs-ng/README.md +++ b/pkgs/development/compilers/ghcjs-ng/README.md @@ -16,6 +16,6 @@ $ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \ | jq '{ url, rev, fetchSubmodules, sha256 }' \ > 8.4/git.json $ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix -$ cabal2nix git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix +$ cabal2nix --compiler ghcjs git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix ``` From 8e5dbacd85444892a0588dd6f557d0a14a918c02 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 16 Jul 2018 08:45:31 +0200 Subject: [PATCH 88/99] aerospike: fix ofborg eval platforms = [ "x86_64-linux" ] broke ofborg eval of nixos manual because the aerospike module references this package. Fixed for now by setting platforms to platforms.linux, even if aarch64 isn't really supported. --- pkgs/servers/nosql/aerospike/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 4426128dafd..324513dead9 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { description = "Flash-optimized, in-memory, NoSQL database"; homepage = http://aerospike.com/; license = licenses.agpl3; - platforms = [ "x86_64-linux" ]; + #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64 + platforms = platforms.linux; maintainer = with maintainers; [ kalbasit ]; }; } From 3c3c11031fcef77c729b1f31bb9e722aa60168f4 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Mon, 16 Jul 2018 15:13:26 +0800 Subject: [PATCH 89/99] ghc: 8.6.1-alpha1 -> 8.6.1-alpha2 --- pkgs/development/compilers/ghc/8.6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index fb294d1fdba..522ad32e69f 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -76,12 +76,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180627"; + version = "8.6.0.20180714"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-alpha1/ghc-${version}-src.tar.xz"; - sha256 = "0vmki10ypdhca3nykxz3lgarr14mfanfkif43m1s2p1q0b1z576n"; + url = "https://downloads.haskell.org/~ghc/8.6.1-alpha2/ghc-${version}-src.tar.xz"; + sha256 = "1jrkqrqdv2z9i9s1xaxhci34c9rjvlgr40y34bxsfj0hj1r28409"; }; enableParallelBuilding = true; From 14dc80bc3e4db3af5a9543230f174c626ef2ee36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jul 2018 02:30:42 +0200 Subject: [PATCH 90/99] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.10.0-5-gc7420eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/61ddd81557996ff95253e7029c9fb5825f527955. --- .../haskell-modules/hackage-packages.nix | 1744 ++++++++++++++--- 1 file changed, 1508 insertions(+), 236 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 43bf0faf078..c8ae0ef4236 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2891,6 +2891,7 @@ self: { libraryHaskellDepends = [ base parsec text vector ]; executableHaskellDepends = [ base cmdargs either-unwrap ]; testHaskellDepends = [ base hspec hspec-discover parsec text ]; + testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -5019,8 +5020,8 @@ self: { ({ mkDerivation, base, cudart, hspec, inline-c }: mkDerivation { pname = "FAI"; - version = "0.1.0.10"; - sha256 = "0hg1598cb44p8bk3a70qahxsvfs8qfm08zzp516b6wg54ky26npg"; + version = "0.1.0.17"; + sha256 = "06z0ikx9i8z9hm7mlmlvdhy57k5dn7qayg2cpas767zvvxjiaayy"; libraryHaskellDepends = [ base inline-c ]; librarySystemDepends = [ cudart ]; testHaskellDepends = [ base hspec inline-c ]; @@ -6051,6 +6052,7 @@ self: { array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; + libraryToolDepends = [ hpp ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13386,8 +13388,8 @@ self: { }: mkDerivation { pname = "Octree"; - version = "0.6.0.0"; - sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797"; + version = "0.6.0.1"; + sha256 = "00f4ck5ln8svjjs5by6k82dg9xrjfckg6whccncmd86rql59n74z"; libraryHaskellDepends = [ base deepseq lens linear QuickCheck ]; testHaskellDepends = [ base deepseq lens linear QuickCheck ]; benchmarkHaskellDepends = [ @@ -15599,12 +15601,13 @@ self: { }) {}; "SDL" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, Cabal, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.6.0"; - sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z"; + version = "0.6.7.0"; + sha256 = "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; @@ -15612,12 +15615,13 @@ self: { }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage - ({ mkDerivation, base, SDL, SDL_gfx }: + ({ mkDerivation, base, Cabal, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.0.2"; - sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b"; + version = "0.6.1.0"; + sha256 = "0sicq48cp9j5b5hpa1s53y505ny0snn2k73f15a4gwh1n5abdxzm"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; @@ -15625,14 +15629,13 @@ self: { }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage - ({ mkDerivation, base, SDL, SDL_image }: + ({ mkDerivation, base, Cabal, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1.2"; - sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281"; - revision = "1"; - editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy"; + version = "0.6.2.0"; + sha256 = "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -15640,14 +15643,13 @@ self: { }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage - ({ mkDerivation, base, SDL, SDL_mixer }: + ({ mkDerivation, base, Cabal, SDL, SDL_mixer }: mkDerivation { pname = "SDL-mixer"; - version = "0.6.2.0"; - sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r"; - revision = "1"; - editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz"; + version = "0.6.3.0"; + sha256 = "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -15668,12 +15670,13 @@ self: { }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage - ({ mkDerivation, base, SDL, SDL_ttf }: + ({ mkDerivation, base, Cabal, SDL, SDL_ttf }: mkDerivation { pname = "SDL-ttf"; - version = "0.6.2.2"; - sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n"; + version = "0.6.3.0"; + sha256 = "1hh5v1b5b8yyv1vhgbymn6rwpjpdccmqz2wy1wmjqzcfffdszmag"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -16791,6 +16794,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spintax_0_3_3" = callPackage + ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.3.3"; + sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1"; + libraryHaskellDepends = [ + attoparsec base extra mtl mwc-random text + ]; + description = "Random text generation based on spintax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -20906,8 +20923,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "5"; - editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv"; + revision = "6"; + editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -23005,6 +23022,7 @@ self: { testHaskellDepends = [ aeson base tasty tasty-discover tasty-hunit ]; + testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -29044,6 +29062,7 @@ self: { base hedgehog HUnit safe-exceptions tasty tasty-discover tasty-hedgehog tasty-hunit universum ]; + testToolDepends = [ tasty-discover ]; description = "Async combinators"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -29919,6 +29938,7 @@ self: { testHaskellDepends = [ attoparsec base hspec markdown-unlit QuickCheck text ]; + testToolDepends = [ markdown-unlit ]; description = "An Attoparsec compatibility layer for Parsec"; license = stdenv.lib.licenses.mit; }) {}; @@ -30310,6 +30330,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoexporter_1_1_10" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "1.1.10"; + sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -32680,8 +32715,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.5"; - sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9"; + version = "0.1.0.6"; + sha256 = "01w1im8p4mxbbq8h12kbqzqzr8db41hjprcjlfs1x6wz263ipg1v"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -32694,8 +32729,8 @@ self: { ({ mkDerivation, base, battleplace, servant, servant-client }: mkDerivation { pname = "battleplace-api"; - version = "0.1.0.1"; - sha256 = "1pi1vcniyrpq1xfrizhvgw7xbrc332649zg4jl1fjbqn4l4xqrlg"; + version = "0.1.0.2"; + sha256 = "148bl4r7fhqrbr8fr4hsgqbyykb7w8q2hi1d8pzk20nkvsrh62ss"; libraryHaskellDepends = [ base battleplace servant servant-client ]; @@ -33232,16 +33267,15 @@ self: { }) {}; "bench-graph" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv - , directory, filepath, split, text, transformers, Unique + ({ mkDerivation, base, Chart, Chart-diagrams, csv, directory + , filepath, split, text, transformers }: mkDerivation { pname = "bench-graph"; - version = "0.1.0"; - sha256 = "0cmb15q4yrgi8f78ijgn8h51g2f183maslffh4l4dxmi2aqn7z8q"; + version = "0.1.2"; + sha256 = "055g038zp8px22dwb5h113fxms5m9g46b5x81h249nyybp258fyk"; libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams csv directory filepath - transformers Unique + base Chart Chart-diagrams csv directory filepath transformers ]; testHaskellDepends = [ base split text ]; description = "Plot and compare benchmarks"; @@ -33545,8 +33579,8 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.2.9"; - sha256 = "0cgvwmk9ck9xvpa11vvdd703bx2wd1czcin3g68zyy416v6xwyki"; + version = "0.1.3.1"; + sha256 = "1v1g1lq86zsr6qf3c48pblrqz8g321dzn7v5gh3ddm6fpd5sdbp4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35717,6 +35751,7 @@ self: { scientific semigroups string-conversions tagged test-framework test-framework-quickcheck2 text tf-random time transformers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ aeson base base16-bytestring blockchain-restful-address-index-api bytestring cereal criterion data-default-class deepseq either @@ -38145,7 +38180,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_37_2" = callPackage + "brick_0_38" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -38153,8 +38188,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.37.2"; - sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; + version = "0.38"; + sha256 = "03jczlp361al1vjqd6pi88plmzh83w4jjbzlx80d3m5n9lqpzx56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38945,6 +38980,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) bullet;}; + "bulletproofs" = callPackage + ({ mkDerivation, arithmoi, base, containers, cryptonite, memory + , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "bulletproofs"; + version = "0.1.0"; + sha256 = "1axm943r0hx5g8a36s4166sf1ifppbd8m6nx25xn7lf27fvsbw9q"; + revision = "1"; + editedCabalFile = "08wgmhrlfv99zcgwd7mqjaz5hnhz4h3a3afzdxnclvzmmqd30njv"; + libraryHaskellDepends = [ + arithmoi base containers cryptonite memory protolude text + ]; + testHaskellDepends = [ + arithmoi base containers cryptonite memory protolude QuickCheck + tasty tasty-discover tasty-hunit tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "bumper" = callPackage ({ mkDerivation, base, Cabal, containers, fclabels, process , regex-compat, split, strict @@ -39785,8 +39842,8 @@ self: { ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.4.0.1"; - sha256 = "012n5gry1a3x4qwqbndgzrq0f90hvgkal48c8s9dylh1n6pi871l"; + version = "0.4.0.2"; + sha256 = "1mdkpmqwszllz2yyhssic02k5g7m8hwnd5wghi4vf970g6m6skpp"; libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; @@ -40918,8 +40975,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.9.3"; - sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj"; + version = "2.10.0"; + sha256 = "1ry2zk81x7jd14ayi49vh8nan10sbphkbj6s5y15a6w0vs4wznn1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42359,6 +42416,8 @@ self: { pname = "casr-logbook"; version = "0.3.0"; sha256 = "1hbrvwpr5crrnqwsi9i2pcw89rpy5fy3dg40al1318lmxp6miznh"; + revision = "1"; + editedCabalFile = "03llwc37nhb4syw8a7wsp8n1135x57q9xacakfzw2rm5gby7hywm"; libraryHaskellDepends = [ base containers digit lens lucid text time ]; @@ -42518,6 +42577,8 @@ self: { pname = "casr-logbook-types"; version = "0.0.2"; sha256 = "1dnbmxgfpx953sk9rmpxqzs9mgzgmyp2r55ll9knrfijavfr3arv"; + revision = "1"; + editedCabalFile = "1klq48y2wis4zaqs3lbs3bm8whqaglcayasf9qfrqjjzddjd20ms"; libraryHaskellDepends = [ base containers digit lens time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -45685,6 +45746,7 @@ self: { sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; + testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45719,6 +45781,7 @@ self: { web-routes-happstack web-routes-hsp web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; + libraryToolDepends = [ hsx2hs ]; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -45885,6 +45948,7 @@ self: { uuid-orphans web-plugins web-routes web-routes-happstack web-routes-th ]; + libraryToolDepends = [ hsx2hs ]; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -45903,6 +45967,7 @@ self: { base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; + libraryToolDepends = [ hsx2hs ]; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -46403,6 +46468,7 @@ self: { aeson base cassava deepseq hashable hspec markdown-unlit persistent QuickCheck text vector ]; + testToolDepends = [ markdown-unlit ]; description = "Integers bounded by a closed interval"; license = stdenv.lib.licenses.mit; }) {}; @@ -48948,6 +49014,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude_1_5_0_8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "1.5.0.8"; + sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc"; + libraryHaskellDepends = [ base ]; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -50292,6 +50370,7 @@ self: { pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50477,6 +50556,7 @@ self: { testHaskellDepends = [ base data-default doctest markdown-unlit pretty-show ]; + testToolDepends = [ markdown-unlit ]; description = "Tools for functors from Hask^k to Hask"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -50845,8 +50925,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.1.0"; - sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2"; + version = "2.1.2.0"; + sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -52799,6 +52879,7 @@ self: { hspec-discover HTTP http-types lens lifted-async lifted-base monad-control mtl text transformers transformers-base ]; + testToolDepends = [ hspec-discover ]; description = "HTTP Racing Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -58610,8 +58691,8 @@ self: { }: mkDerivation { pname = "decimal-arithmetic"; - version = "0.5.0.0"; - sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j"; + version = "0.5.1.0"; + sha256 = "0ig25l60ix79v4yl2kix8wkhfvsdniaxrzk49hfwqiblwz17kxla"; libraryHaskellDepends = [ base binary binary-bits deepseq mtl ]; testHaskellDepends = [ base binary doctest hspec QuickCheck ]; description = "An implementation of the General Decimal Arithmetic Specification"; @@ -58874,8 +58955,8 @@ self: { ({ mkDerivation, base, containers, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.5.1"; - sha256 = "0fyfm59fyz30mn5w7y47l2vx6d0ap5vijadlfff1j07ak6lnq1x3"; + version = "0.6"; + sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir"; libraryHaskellDepends = [ base containers foldl ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -59030,14 +59111,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_11_0_2" = callPackage + "dejafu_1_11_0_3" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.11.0.2"; - sha256 = "0v4vbka3s8hmxvhf7kpfbncv4fr0mks01xd8phg3sqw07qyc871l"; + version = "1.11.0.3"; + sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -59597,6 +59678,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_1" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.1"; + sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -59635,6 +59740,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "derulo_1_0_3" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "derulo"; + version = "1.0.3"; + sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Parse and render JSON simply"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "descrilo" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59876,25 +59997,25 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter , BoundedChan, bytestring, cmdargs, conduit, containers , cryptohash-sha256, data-default-class, deepseq, ghc-prim - , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups - , serialise, text, unordered-containers + , lens-simple, leveldb-haskell, lrucaching, mtl, resourcet + , semigroups, serialise, text, unordered-containers }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.1.0"; - sha256 = "14q9ick40mz5a0bdz1s7ga4fhw27hkidrsf543nmgm14q5w8q2nf"; + version = "0.1.1"; + sha256 = "1s9yqmx1nlj62xn2khr0y6gwdjrbknz6yk2inir76gbklsc9fw4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base16-bytestring bloomfilter BoundedChan bytestring conduit containers cryptohash-sha256 data-default-class deepseq ghc-prim - lens-simple leveldb-haskell lrucaching resourcet semigroups + lens-simple leveldb-haskell lrucaching mtl resourcet semigroups serialise ]; executableHaskellDepends = [ - aeson base base16-bytestring bytestring cmdargs cryptohash-sha256 - data-default-class leveldb-haskell resourcet text - unordered-containers + aeson base base16-bytestring bytestring cmdargs containers + cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet + text unordered-containers ]; description = "A generic data integrity layer"; license = stdenv.lib.licenses.gpl3; @@ -60341,6 +60462,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.3"; sha256 = "1g8anclzfm88nd6z539g5f2h6yfb538hdl59sbiqv0vk1c4sr01s"; + revision = "1"; + editedCabalFile = "0cdnriavw7y0cr12n60vd0hwcyi09vkx5zjr47af3bj00lq1v9hk"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -61354,8 +61477,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.5.2"; - sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0"; + version = "0.6"; + sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8"; libraryHaskellDepends = [ base lens papa parsers scientific semigroupoids semigroups template-haskell @@ -65435,8 +65558,8 @@ self: { ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }: mkDerivation { pname = "easytensor"; - version = "1.0.0.0"; - sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c"; + version = "1.0.0.1"; + sha256 = "0ih92gikf67bq9p599vdb9p9dh4b8p7a687n3xiv3q9qm4pdc8aa"; libraryHaskellDepends = [ base dimensions ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; @@ -65803,6 +65926,7 @@ self: { base comonad doctest QuickCheck tasty tasty-discover tasty-quickcheck uniplate ]; + testToolDepends = [ tasty-discover ]; description = "A monad for rewriting things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65947,6 +66071,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover HUnit QuickCheck ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion ]; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -66013,6 +66138,8 @@ self: { pname = "effects"; version = "0.2.3"; sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0"; + revision = "1"; + editedCabalFile = "1vwywcrvb4qm3z7smxd9snvcwikyifl7fn8pxgiwchihm0ajnbvw"; libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; @@ -69492,6 +69619,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventstore_1_1_5" = callPackage + ({ mkDerivation, aeson, array, async, 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-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec + , tasty-hunit, text, time, transformers-base, unordered-containers + , uuid + }: + mkDerivation { + pname = "eventstore"; + version = "1.1.5"; + sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8"; + 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-exceptions semigroups stm stm-chans text time + transformers-base unordered-containers uuid + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger hashable lifted-async + lifted-base monad-control mono-traversable protobuf safe-exceptions + semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time + transformers-base unordered-containers uuid + ]; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -70547,6 +70709,7 @@ self: { base containers deepseq extensible-effects HUnit lens QuickCheck stm tasty tasty-discover tasty-hunit ]; + testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70602,6 +70765,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_9" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.9"; + sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b"; + libraryHaskellDepends = [ + base clock directory filepath process 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 @@ -72328,8 +72508,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.2.0"; - sha256 = "005q3is5n6lpridfszw3c3la15byc0sbq1b1lwsw59jyffgc587c"; + version = "0.12.2.1"; + sha256 = "1azzm32rvx48vab3i3cnf520nbvcazx18pi36ilgc97nih15lwjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72774,12 +72954,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "filepath_1_4_2" = callPackage + "filepath_1_4_2_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.2"; - sha256 = "0bnryq00xbcsswxmahl42x85bfh23mxsap0gq8q0dm1v67ij7a0q"; + version = "1.4.2.1"; + sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -73164,12 +73344,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "finite-typelits_0_1_4_0" = callPackage + "finite-typelits_0_1_4_2" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.4.0"; - sha256 = "1kq48lq4v2iq4zqyynr2zzps4wgzh4c6aad157r156jlgyn4nkc4"; + version = "0.1.4.2"; + sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj"; libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = stdenv.lib.licenses.bsd3; @@ -73705,6 +73885,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl template-haskell transformers ]; + testToolDepends = [ hspec-discover ]; description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74233,6 +74414,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flow_1_0_14" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.14"; + sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Write more understandable Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -75977,6 +76171,8 @@ self: { pname = "free-functors"; version = "0.8.4"; sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703"; + revision = "1"; + editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -77174,6 +77370,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funcons-simple" = callPackage + ({ mkDerivation, base, funcons-tools, funcons-values }: + mkDerivation { + pname = "funcons-simple"; + version = "0.1.0.3"; + sha256 = "0ar5sxcalbfyhyvm6ijbyrrz2pzqyj5bihngnf187wrc5llq2ydr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base funcons-tools funcons-values ]; + description = "A modular interpreter for executing SIMPLE funcons"; + license = stdenv.lib.licenses.mit; + }) {}; + "funcons-tools" = callPackage ({ mkDerivation, base, bv, containers, directory, funcons-values , gll, mtl, multiset, random-strings, regex-applicative, split @@ -78035,6 +78244,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib text ]; libraryPkgconfigDepends = [ GConf ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) GConf;}; @@ -78894,6 +79104,7 @@ self: { base directory doctest filepath hspec interpolate markdown-unlit mockery QuickCheck shake silently ]; + testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79578,6 +79789,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "geodetic-types" = callPackage + ({ mkDerivation, base, dimensional, lens, semigroups }: + mkDerivation { + pname = "geodetic-types"; + version = "0.0.1"; + sha256 = "0sj82sz20zfys2h4g74wj9gwfyc2c4jkzazw882xrr18g8zx82p8"; + libraryHaskellDepends = [ base dimensional lens semigroups ]; + description = "Types for geodetic operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "geodetics" = callPackage ({ mkDerivation, array, base, checkers, dimensional, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -80069,8 +80291,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.7.3"; - sha256 = "13na5pkmid2jg9ivav62x5dzbcacwl4lcsqd7i7brg4h95iqnmpd"; + version = "0.8.0"; + sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80152,6 +80374,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_5_7_0" = 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.5.7.0"; + sha256 = "0r1cwjz96qrx0ww7snmwdh16xslzaqk6mlz3i9n4q779qf0y1n7m"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -80227,6 +80473,7 @@ self: { monad-journal mtl optparse-applicative parsec process process-streaming safe syb transformers ]; + testToolDepends = [ hspec-discover ]; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82411,6 +82658,7 @@ self: { base megaparsec smallcheck smallcheck-series tasty tasty-discover tasty-hunit tasty-smallcheck tasty-travis text unordered-containers ]; + testToolDepends = [ tasty-discover ]; description = "A simple parser for Git configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82866,6 +83114,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers, uri-templater + }: + mkDerivation { + pname = "github-release"; + version = "1.2.2"; + sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + executableHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + description = "Upload files to GitHub releases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -83689,8 +83961,8 @@ self: { pname = "glirc"; version = "2.26"; sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; - revision = "2"; - editedCabalFile = "0fwyd1xvz11b1433lw0c9rb8md1f87mg9kinq3hrfq8jjmaws478"; + revision = "4"; + editedCabalFile = "1kky984mv59s94xj044wxj47ijy4a4fkrp93mkh47ww53azjw1lw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -86624,6 +86896,7 @@ self: { MissingH mtl process QuickCheck regex-posix scientific servant servant-client text ]; + testToolDepends = [ markdown-unlit ]; description = "A Haskell client for Grakn"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -87296,6 +87569,7 @@ self: { QuickCheck text ]; testSystemDepends = [ graphviz ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -87313,6 +87587,7 @@ self: { aeson base containers process regex-posix scientific text ]; testHaskellDepends = [ base hspec markdown-unlit text ]; + testToolDepends = [ markdown-unlit ]; description = "Execute Graql queries on a Grakn graph"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -88215,6 +88490,7 @@ self: { array base bytestring directory glib mtl ]; libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; @@ -88368,8 +88644,8 @@ self: { }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.4.0"; - sha256 = "1cxs2rgyjkjwz7y2n205pwqnji4c27k6ilx6prv9a5nsd0msr1h2"; + version = "0.1.5.0"; + sha256 = "0vfxskzhcm1a3i7kvqxfvmqdvx7xk6hnbpsnqymrzjaj11w9r9x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88633,6 +88909,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -88690,6 +88967,7 @@ self: { array base containers glib gtk mtl text ]; libraryPkgconfigDepends = [ gtksourceview ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) gtksourceview;}; @@ -88708,6 +88986,7 @@ self: { array base containers glib gtk3 mtl text ]; libraryPkgconfigDepends = [ gtksourceview3 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; @@ -89164,20 +89443,70 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hOpenPGP_2_7_1" = 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.7.1"; + sha256 = "02nws5px5zb9rvsl3hpqr15iw56n0d2pwgdrk3d047l4hx9cbm95"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel , QuickCheck, tagged, template-haskell, text, unordered-containers , vector, zlib }: mkDerivation { pname = "hPDB"; - version = "1.2.0.10"; - sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0"; + version = "1.5.0.0"; + sha256 = "07pc4g0gj56q0nrry6462a8h2v0psp23nbn9sd7fybgz248c39lw"; libraryHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - iterable mmap mtl Octree parallel QuickCheck tagged - template-haskell text unordered-containers vector zlib + base bytestring containers deepseq directory ghc-prim iterable + linear mmap mtl Octree parallel QuickCheck tagged template-haskell + text unordered-containers vector zlib ]; description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; @@ -89185,25 +89514,26 @@ self: { }) {}; "hPDB-examples" = callPackage - ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq - , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree - , OpenGL, process, QuickCheck, template-haskell, text, text-format - , time, vector + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , ghc-prim, GLUT, hPDB, IfElse, iterable, linear, mtl, Octree + , OpenGL, process, QuickCheck, template-haskell, text, time, vector }: mkDerivation { pname = "hPDB-examples"; - version = "1.2.0.8"; - sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6"; + version = "1.5.0.0"; + sha256 = "0hhi6x8m7pngcjmxv5mncw66r5bn67i07g347d85lc6yszhrykdp"; + revision = "1"; + editedCabalFile = "1bk3fmdgqyj0p72049w79y0b9hdzb5knzkxzl9z02qsbdj5f5if0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell - text text-format vector + base bytestring containers deepseq directory ghc-prim GLUT hPDB + iterable linear mtl Octree OpenGL QuickCheck template-haskell text + vector ]; testHaskellDepends = [ - AC-Vector base bytestring containers deepseq directory ghc-prim - hPDB IfElse iterable mtl process template-haskell text time vector + base bytestring containers deepseq directory ghc-prim hPDB IfElse + iterable linear mtl process template-haskell text time vector ]; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; @@ -90101,8 +90431,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.0.2"; - sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3"; + version = "0.1.1"; + sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90584,8 +90914,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.2"; - sha256 = "0x9szi43a4l7ii8qbhpgakln2ddaix5p42n39i08w8h54qbx6c08"; + version = "1.10.3"; + sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91984,6 +92314,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_8" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.8"; + sha256 = "0yg1wgg4mkfjf49xfcnijrwmj747yzbybsvkaq515i618nz5x57z"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -93237,6 +93594,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hash-store" = callPackage + ({ mkDerivation, base, base16-bytestring, blake2, bytestring + , directory, filepath + }: + mkDerivation { + pname = "hash-store"; + version = "0.1.0"; + sha256 = "1lbnywgd3kr7nryw0s6pgpznsx526xvagapsl5sdwwss8ginjh78"; + libraryHaskellDepends = [ + base base16-bytestring blake2 bytestring directory filepath + ]; + description = "Hash as cache"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hash-tree" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck @@ -93709,8 +94081,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.5.1"; - sha256 = "1iilnxw9xq3i5y1fvvjs557xbblfgq992576fpvr405wj6nlhmk3"; + version = "0.5.3"; + sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95101,6 +95473,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-ast_1_1_0_2" = callPackage + ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references + , template-haskell, uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "1.1.0.2"; + sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c"; + libraryHaskellDepends = [ + base classyplate ghc mtl pretty references template-haskell + uniplate + ]; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -95169,6 +95558,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-backend-ghc_1_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "1.1.0.2"; + sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, aeson, base, Cabal, classyplate, containers , deepseq, directory, either, filepath, ghc, ghc-paths @@ -95201,6 +95608,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-builtin-refactorings_1_1_0_2" = callPackage + ({ mkDerivation, aeson, base, Cabal, classyplate, containers + , deepseq, directory, either, filepath, ghc, ghc-paths + , haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-prettyprint, haskell-tools-refactor + , haskell-tools-rewrite, minisat-solver, mtl, portable-lines + , references, split, tasty, tasty-hunit, template-haskell, time + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-builtin-refactorings"; + version = "1.1.0.2"; + sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9"; + libraryHaskellDepends = [ + aeson base Cabal classyplate containers deepseq directory filepath + ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite minisat-solver mtl portable-lines references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split tasty tasty-hunit + template-haskell time transformers uniplate + ]; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob @@ -95210,8 +95649,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.1.0.1"; - sha256 = "1gc20ajz1xzp3343j013w0knqdvhwa5hxwvxr6ydpxgrigjxk18p"; + version = "1.1.0.2"; + sha256 = "0222qiyjncfyvcizsjx8qv4j8pjfrqb1mi18566fg689bhwl8x7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95247,8 +95686,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.1.0.1"; - sha256 = "0vq8d7n8k978d2jv4f3sbvccjj9vqydci33xl1axamslani0k8x2"; + version = "1.1.0.2"; + sha256 = "048k4pa26z3b3m83km8wbhr7nx2z3zmg4gyp1ga15idv73fis3kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95296,6 +95735,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_1_1_0_2" = callPackage + ({ mkDerivation, base, classyplate, criterion, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, mtl, references, split, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "1.1.0.2"; + sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base classyplate criterion filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl references + split template-haskell uniplate + ]; + executableHaskellDepends = [ base ]; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -95327,6 +95791,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_1_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, http-types + , HUnit, mtl, network, references, tasty, tasty-hunit, transformers + , wai, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "1.1.0.2"; + sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-builtin-refactorings haskell-tools-prettyprint + haskell-tools-refactor http-types mtl references transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-experimental-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -95337,8 +95832,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.1.0.1"; - sha256 = "16qdvs68zlzjx5gj8034w5qwc79i640kfdnwc81wi84hch7xwy4p"; + version = "1.1.0.2"; + sha256 = "1kqiblwc0dp3p7yx10jqxflsgybc0vvgrvi0ylxhgkmn6cpmnkqv"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95374,6 +95869,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-prettyprint_1_1_0_2" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "1.1.0.2"; + sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -95404,6 +95916,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-refactor_1_1_0_2" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "1.1.0.2"; + sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq"; + libraryHaskellDepends = [ + aeson base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -95426,6 +95968,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite_1_1_0_2" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "1.1.0.2"; + sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -97786,6 +98350,7 @@ self: { smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit tasty-smallcheck temporary text transformers vector ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base binary bytestring criterion deepseq filepath optparse-applicative parsec primitive text transformers vector @@ -99610,8 +100175,8 @@ self: { }: mkDerivation { pname = "herms"; - version = "1.9.0.2"; - sha256 = "0gl2zwmqcvmkk63xip7zqn37qwpii5b8qbf7h289iyrc46a3z29z"; + version = "1.9.0.3"; + sha256 = "0pb0pzaa5b9hmrscdggvafm6ygr843i02brhs604mkhggyqivf74"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -103859,7 +104424,7 @@ self: { libraryHaskellDepends = [ base cgen ]; librarySystemDepends = [ OgreMain ]; libraryPkgconfigDepends = [ OGRE ]; - libraryToolDepends = [ cgen-hs grgen ]; + libraryToolDepends = [ cgen cgen-hs grgen ]; doHaddock = false; description = "Haskell binding to a subset of OGRE"; license = stdenv.lib.licenses.mit; @@ -105177,6 +105742,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_29_4" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, HUnit, infer-license + , interpolate, mockery, pretty, QuickCheck, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.29.4"; + sha256 = "1d1kn4bzcwqmqkc6y9mp63674hgayx4mprv9fg8mrr29z3fl09hj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -105624,6 +106227,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; + "hpqtypes_1_6_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , data-default-class, directory, exceptions, filepath, HUnit + , lifted-base, monad-control, mtl, postgresql, QuickCheck, random + , resource-pool, scientific, semigroups, test-framework + , test-framework-hunit, text, text-show, time, transformers + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.6.0.0"; + sha256 = "1aydpbkp5if7416dvswiygn7vfhgg7nza9p011gld18pr9mpsf5i"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default-class + exceptions lifted-base monad-control mtl resource-pool semigroups + text text-show time transformers transformers-base vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers vector + ]; + description = "Haskell bindings to libpqtypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, data-default, exceptions, fields-json, hpqtypes @@ -105632,8 +106265,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.6.1.0"; - sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111"; + version = "1.6.2.0"; + sha256 = "095kxfk12bzl7gl44fa7xmwfnx63707s1jz861hqjmi9dv3mm8kp"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash data-default exceptions fields-json hpqtypes lifted-base log-base @@ -106815,6 +107448,7 @@ self: { base bytestring data-default-class hspec hspec-discover temporary text ]; + testToolDepends = [ hspec-discover ]; description = "Integrating Sass into Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -108485,6 +109119,7 @@ self: { hspec-expectations hspec-meta HUnit QuickCheck stringbuilder transformers ]; + testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -108508,6 +109143,7 @@ self: { hspec-expectations hspec-meta HUnit QuickCheck stringbuilder transformers ]; + testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -108833,6 +109469,7 @@ self: { sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j"; libraryHaskellDepends = [ base hspec QuickCheck ]; testHaskellDepends = [ base hspec markdown-unlit QuickCheck ]; + testToolDepends = [ markdown-unlit ]; description = "Document and test laws for standard type classes"; license = stdenv.lib.licenses.mit; }) {}; @@ -110326,6 +110963,7 @@ self: { base containers hspec hspec-discover QuickCheck quickcheck-instances string-conversions text ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text ]; @@ -112543,34 +113181,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json-lens" = callPackage + "hw-json_0_8_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, conduit, containers, criterion, dlist, hspec - , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json - , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable - , parsec, QuickCheck, resourcet, scientific, text, transformers - , unordered-containers, vector, word8 + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8 + }: + mkDerivation { + pname = "hw-json"; + version = "0.8.1.0"; + sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint array attoparsec base bytestring containers dlist + hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect + hw-rankselect-base mmap text vector word8 + ]; + executableHaskellDepends = [ + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base mmap vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers hspec hw-balancedparens + hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory hw-balancedparens hw-bits + hw-prim hw-rankselect hw-rankselect-base mmap vector + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hw-json-lens" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, hw-json + , lens, scientific, word8 }: mkDerivation { pname = "hw-json-lens"; - version = "0.0.0.1"; - sha256 = "1r0g22271avmvqfl4sph4c6rnqwchbah5ixccksp7p2xa9g5j52z"; + version = "0.1.0.0"; + sha256 = "1dbgxdbm8xp83hmdygi0y4h5lysacvdhms5g6i7p5i2w6prwqvid"; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json - hw-parser hw-prim hw-rankselect lens mmap mono-traversable - resourcet scientific text unordered-containers vector word8 - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit containers hspec - hw-balancedparens hw-bits hw-conduit hw-json hw-prim hw-rankselect - lens mmap parsec QuickCheck resourcet scientific transformers - unordered-containers vector + base bytestring containers hw-json lens scientific word8 ]; benchmarkHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-conduit hw-prim - hw-rankselect lens mmap resourcet scientific unordered-containers - vector + base bytestring criterion hw-json lens ]; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; @@ -112695,6 +113352,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-parser_0_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }: + mkDerivation { + pname = "hw-parser"; + version = "0.1.0.0"; + sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x"; + libraryHaskellDepends = [ + attoparsec base bytestring hw-prim text + ]; + description = "Simple parser support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector @@ -116181,6 +116852,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "infer-license" = callPackage + ({ mkDerivation, base, directory, filepath, hspec, text + , text-metrics + }: + mkDerivation { + pname = "infer-license"; + version = "0.2.0"; + sha256 = "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj"; + libraryHaskellDepends = [ + base directory filepath text text-metrics + ]; + testHaskellDepends = [ + base directory filepath hspec text text-metrics + ]; + description = "Infer software license from a given license file"; + license = stdenv.lib.licenses.mit; + }) {}; + "infer-upstream" = callPackage ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative , parsec, process, text @@ -116409,8 +117098,8 @@ self: { ({ mkDerivation, base, inj }: mkDerivation { pname = "inj-base"; - version = "0.1.0.0"; - sha256 = "1mxpx2lw7vxjr3mynxx90a49qavsmkf71afqshd2h4xz1kxnjnjh"; + version = "0.2.0.0"; + sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d"; libraryHaskellDepends = [ base inj ]; description = "'Inj' instances for 'base'"; license = stdenv.lib.licenses.bsd3; @@ -116550,8 +117239,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.8.3"; - sha256 = "01xg2ml1khdns5w30n83ibl3k0lc2ym7n0dgvkxgy17b5m8r6kbb"; + version = "0.8.4"; + sha256 = "1ddgwhk40g23lc71f8wbbfck9pqymil0syi14wsawc25sx6zb52v"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -117380,8 +118069,8 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.3.0.0"; - sha256 = "18xvpdip1zdgylqcngvk8hz6dsnl3bp681pc31nb562vg2crqzz6"; + version = "0.4.0.0"; + sha256 = "1lnb1sp77fdszz3d4qxgyynla037vn2a4c9wkv2fjjaghbsb1csi"; libraryHaskellDepends = [ base containers haskell-src-meta mtl template-haskell ]; @@ -117504,6 +118193,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_5_1" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5.1"; + sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors semigroups StateVar stm tagged template-haskell + th-abstraction transformers transformers-compat + unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -118922,8 +119635,8 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.7"; - sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s"; + version = "0.1.0.8"; + sha256 = "0nwn5h1fnnh9a6fkznscix50yvzqpw50hai7rslfzgizpbnzckrk"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-abstraction th-lift @@ -119923,8 +120636,8 @@ self: { }: mkDerivation { pname = "jni"; - version = "0.6.0"; - sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; + version = "0.6.1"; + sha256 = "1z71vp8qskymgd4bjv8wxxjn34n49m28vnph0p0wbxgpz2wpn4hz"; libraryHaskellDepends = [ base bytestring choice constraints containers deepseq inline-c singletons @@ -120017,6 +120730,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jord" = callPackage + ({ mkDerivation, base, haskeline, hspec, HUnit }: + mkDerivation { + pname = "jord"; + version = "0.1.0.0"; + sha256 = "1dnjxlyclk1a1bghkg1c6wash37pq88grqpv8pr3gr6in3wkibc5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base haskeline ]; + testHaskellDepends = [ base hspec HUnit ]; + description = "Geographic position calculations on Great Circles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jort" = callPackage ({ mkDerivation, array, base, gtk }: mkDerivation { @@ -120591,6 +121319,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "json-feed_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "1.0.3"; + sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -120959,6 +121707,7 @@ self: { aeson aeson-pretty base bytestring containers hspec hspec-core hspec-discover hspec-expectations microlens mtl time ]; + testToolDepends = [ hspec-discover ]; description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121467,6 +122216,7 @@ self: { hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover tasty-hspec tasty-quickcheck template-haskell text vector ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ attoparsec base binary bytestring containers criterion data-binary-ieee754 deepseq deriving-compat mtl template-haskell @@ -121609,6 +122359,7 @@ self: { testHaskellDepends = [ base bytestring cereal hspec hspec-discover QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -122343,18 +123094,23 @@ self: { }) {}; "keccak" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text }: mkDerivation { pname = "keccak"; - version = "0.1.0"; - sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz"; + version = "0.1.1"; + sha256 = "1mps3w7d9yq262anpw8zdrhni2xw0idfw9364jh5rjs3fv41h4l1"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + base base16-bytestring bytestring cryptonite HUnit memory parsec + QuickCheck quickcheck-instances test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring cryptonite gauge memory ]; description = "haskell keccak functions"; license = stdenv.lib.licenses.mit; @@ -123642,6 +124398,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_5" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.5"; + sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -124689,6 +125458,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_6_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process + , QuickCheck, split, template-haskell, text, th-lift, time + }: + mkDerivation { + pname = "language-docker"; + version = "6.0.4"; + sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; + libraryHaskellDepends = [ + base bytestring containers free megaparsec mtl prettyprinter split + template-haskell text th-lift time + ]; + testHaskellDepends = [ + base bytestring containers directory filepath free Glob hspec HUnit + megaparsec mtl prettyprinter process QuickCheck split + template-haskell text th-lift time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -125517,6 +126309,7 @@ self: { ansi-wl-pprint base containers hspec hspec-discover megaparsec QuickCheck scientific semigroups text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125811,6 +126604,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "latex-live-snippets" = callPackage + ({ mkDerivation, base, directory, filepath, lens, MissingH }: + mkDerivation { + pname = "latex-live-snippets"; + version = "0.1.0.0"; + sha256 = "0nvw0lf2fdr437ddfdlgba1dh6l50pksgl81zkhg65j0zp9fjp6s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath lens MissingH + ]; + description = "Automatically inline Haskell snippets into LaTeX documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty @@ -127034,8 +127842,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "lenses"; - version = "0.1.7"; - sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4"; + version = "0.1.8"; + sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple Functional Lenses"; license = stdenv.lib.licenses.bsd3; @@ -130812,6 +131620,7 @@ self: { base markdown-unlit microlens monad-control mtl o-clock text universum yaml ]; + executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit microlens-mtl QuickCheck universum unordered-containers @@ -134414,6 +135223,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_3_0_0" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.0.0"; + sha256 = "19kbc0kyxfjb7lhs2kkla59gqj7ag96r2z8ba2rfhl2104n3709k"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base data-default-class deepseq erf HUnit primitive QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-th-unbox + ]; + description = "Collection of tools for numeric computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -137768,8 +138599,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "4"; - editedCabalFile = "0jc342mpqp1s6s9al7dyky54wpvbx6a1jl8yljmwgmhafrbg1kdk"; + revision = "5"; + editedCabalFile = "1m4l42g519hnzjaafsnbjcfr0nrf28x1lmc1kjh5swrg6qd3kf29"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139860,6 +140691,8 @@ self: { pname = "monoid-extras"; version = "0.5"; sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6"; + revision = "1"; + editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -140307,6 +141140,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover motor motor-reflection text ]; + testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -140324,6 +141158,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover indexed motor row-types ]; + testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -142236,6 +143071,8 @@ self: { 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; @@ -142274,6 +143111,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_14_0_0" = callPackage + ({ mkDerivation, base, math-functions, primitive, time, vector }: + mkDerivation { + pname = "mwc-random"; + version = "0.14.0.0"; + sha256 = "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0"; + libraryHaskellDepends = [ + base math-functions primitive time vector + ]; + doCheck = false; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-accelerate" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -142926,6 +143778,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "named_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.2.0.0"; + sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -147393,6 +148258,7 @@ self: { template-haskell text time time-locale-compat transformers transformers-base unliftio unliftio-core utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; }) {}; @@ -147415,6 +148281,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover nvim-hs QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; }) {}; @@ -147521,6 +148388,7 @@ self: { base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec type-spec ]; + testToolDepends = [ doctest markdown-unlit ]; benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; description = "Type-safe time library"; license = stdenv.lib.licenses.mit; @@ -148379,6 +149247,8 @@ self: { pname = "one-liner"; version = "1.0"; sha256 = "1diigbl8l0m8q1sl0kxjjqbhl3vkpf0rrzxlbqaamp3ahpmgpx67"; + revision = "1"; + editedCabalFile = "1ijc5mj93zyfj7hh12aw3xh30kc1xsp7wf6rbbfal36yllnl2xhs"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -148531,6 +149401,7 @@ self: { multiset postgresql-simple product-profunctors profunctors QuickCheck semigroups text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150994,6 +151865,7 @@ self: { base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit unordered-containers ]; + testToolDepends = [ tasty-discover ]; description = "A Pandoc filter for emphasizing code in fenced blocks"; license = stdenv.lib.licenses.mpl20; }) {}; @@ -151129,6 +152001,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl pandoc-types SHA utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -151840,6 +152713,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parallel_3_2_2_0" = callPackage + ({ mkDerivation, array, base, containers, deepseq, ghc-prim }: + mkDerivation { + pname = "parallel"; + version = "3.2.2.0"; + sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; + libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; + description = "Parallel programming library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parallel-io" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, random }: mkDerivation { @@ -152715,6 +153600,8 @@ self: { pname = "passman-core"; version = "0.2.0.0"; sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7"; + revision = "1"; + editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x"; libraryHaskellDepends = [ aeson base bcrypt bytestring conduit conduit-extra containers cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast @@ -155131,6 +156018,7 @@ self: { base bytestring exceptions hspec hspec-discover postgresql-simple tmp-postgres ]; + testToolDepends = [ hspec-discover ]; description = "Another postgresql-simple transaction monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155869,6 +156757,7 @@ self: { base bytestring containers hspec hspec-discover QuickCheck semigroups text unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -156806,8 +157695,8 @@ self: { pname = "pipes-random"; version = "1.0.0.4"; sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; - revision = "1"; - editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h"; + revision = "2"; + editedCabalFile = "0czw2qfi05d5kbnwzhzr75j1ag6hfbn9nvbjyifdjradfzjxl2s9"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; @@ -157922,6 +158811,7 @@ self: { AC-Vector base hspec markdown-unlit QuickCheck random random-shuffle ]; + testToolDepends = [ markdown-unlit ]; description = "Point octree, with bounding boxes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157999,22 +158889,16 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.7"; - sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; - revision = "1"; - editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2"; + version = "1.1.1.8"; + sha256 = "16n1yzjnfhwkdps8lcjhpnrmbbrvw2n6qsi90vzjxswkwsvp4hi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers haskell-src-exts transformers ]; - executableHaskellDepends = [ - array base containers haskell-src-exts transformers - ]; - testHaskellDepends = [ - array base containers haskell-src-exts HUnit QuickCheck - transformers - ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + doHaddock = false; description = "Tool for refactoring expressions into pointfree form"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158718,6 +159602,7 @@ self: { array base bytestring cairo containers glib gtk mtl ]; libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; @@ -159459,6 +160344,7 @@ self: { pg-transact postgresql-simple random split stm text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "A PostgreSQL backed queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -159754,8 +160640,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.1.1"; - sha256 = "1mn3wqk0n4ny8b0m891ndqswxr9zafl4hvb20i12q1d6mxirczlf"; + version = "2.0.2"; + sha256 = "00z7al5kk3ry3npghc71vlwba5wmxrlps3lmwllpw8sgf8x288r5"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -159788,8 +160674,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.2.1.1"; - sha256 = "18szi60ngxj69y5xpiwfhvp51ggb81kv6kphd3ghjjai7as42nmk"; + version = "2.2.2.1"; + sha256 = "0bnmqw0jk8p7bfhy165w5ha3pl0966z5bxzfacbyiqvhmj68xx6j"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable profunctors ptr stm text transformers unagi-chan @@ -159992,6 +160878,7 @@ self: { base boxes containers HUnit markdown-unlit QuickCheck tasty tasty-hunit tasty-quickcheck vector ]; + testToolDepends = [ markdown-unlit ]; description = "Pretty Print containers in a tabular format"; license = stdenv.lib.licenses.mit; }) {}; @@ -161107,6 +161994,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "primitive-extras" = callPackage + ({ mkDerivation, base, cereal, deferred-folds, foldl, primitive + , profunctors, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.3"; + sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz"; + libraryHaskellDepends = [ + base cereal deferred-folds foldl primitive profunctors vector + ]; + description = "Extras for the \"primitive\" library"; + license = stdenv.lib.licenses.mit; + }) {}; + "primitive-indexed" = callPackage ({ mkDerivation, base, doctest, primitive, QuickCheck }: mkDerivation { @@ -161457,14 +162359,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_3_0" = callPackage + "process_1_6_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.3.0"; - sha256 = "0lxkl0gmyy2sn3r9c7dyz8vz1cm6nvygmgrizilliir5bp42m8cc"; + version = "1.6.4.0"; + sha256 = "1w12ssmwpz5glmm964rxdc3fgi2w5sq9lac17rxs8p626r5p6rkn"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -163082,6 +163984,7 @@ self: { sha256 = "12130fpdskml0mdgbr38zki48n5ffid0diiixyn89kzcq948vvmn"; libraryHaskellDepends = [ base generic-deriving ]; testHaskellDepends = [ base hspec hspec-discover ]; + testToolDepends = [ hspec-discover ]; description = "Bindings for the pthread library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163611,6 +164514,7 @@ self: { tasty tasty-hspec text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; + testToolDepends = [ hspec-discover ]; doCheck = false; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; @@ -165680,6 +166584,7 @@ self: { base bytestring hspec hspec-discover HUnit QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base blaze-builder bytestring criterion pretty ]; @@ -165976,16 +166881,15 @@ self: { }: mkDerivation { pname = "raketka"; - version = "1.1.1"; - sha256 = "0whm7jzmcq30zg7rb29m50dyx6ikjk1xjxi74w8qsmjy2hyj3ph0"; - revision = "1"; - editedCabalFile = "1adyzp0wc4lajgbs4h6rgliw0qqs13bnq1rhzmqacwji39rx0qsz"; + version = "1.1.2"; + sha256 = "1zyqgldryci4cbwqcbjlkm4k1dfps36x4rk03pi9gf901zw0k38p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary conf-json containers distributed-process - distributed-process-simplelocalnet network network-transport - network-transport-tcp random stm tagged template-haskell + aeson async base binary bytestring conf-json containers + distributed-process distributed-process-simplelocalnet network + network-transport network-transport-tcp random stm tagged + template-haskell ]; executableHaskellDepends = [ aeson async base binary bytestring conf-json containers @@ -166894,6 +167798,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_1_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "1.0.5"; + sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types text uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -166909,6 +167835,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "1.0.3"; + sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -166961,6 +167903,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rattletrap_4_1_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "4.1.2"; + sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2"; + 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 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; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -170744,6 +171717,7 @@ self: { hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text time transformers transformers-base transformers-compat ]; + testToolDepends = [ hspec-discover ]; description = "Blogging module using blaze html for markup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -172112,13 +173086,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rhine_0_4_0_2" = callPackage + "rhine_0_4_0_3" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.4.0.2"; - sha256 = "1lsa9sgfrxdwz1jgjd314n7g4a8q97gq990nqdsxrrq2bmvdhpv1"; + version = "0.4.0.3"; + sha256 = "1s88dga75c835ixw1j59chswiv512sdwwg09p0r5jgsl8lqjp6h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174677,6 +175651,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "salve_1_0_4" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "salve"; + version = "1.0.4"; + sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Semantic version numbers and constraints"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -174826,6 +175813,8 @@ self: { pname = "sampling"; version = "0.3.3"; sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8"; + revision = "1"; + editedCabalFile = "168k8ykppa8pikfxy1gmby63kfzr833vswh8wcchz8li9vkd4w2h"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -175669,6 +176658,7 @@ self: { regex-tdfa-text singletons smallcheck tagged text unordered-containers validationt vinyl ]; + testToolDepends = [ hspec-discover ]; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -176021,7 +177011,7 @@ self: { async base bytestring data-default-class directory hpc-coveralls hspec hspec-wai http-types lifted-base network text wai ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hpc-coveralls hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -178322,7 +179312,7 @@ self: { jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth servant-server time transformers wai warp wreq ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178582,7 +179572,7 @@ self: { servant servant-client-core servant-server text transformers transformers-compat wai warp ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -179890,8 +180880,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "20"; - editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw"; + revision = "21"; + editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -180022,6 +181012,34 @@ self: { http-types iproute lens raw-strings-qq text time unix unordered-containers ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "serverless-haskell_0_7_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq + , text, time, unix, unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.7.0"; + sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive http-types iproute + lens text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive hspec hspec-discover + http-types iproute lens raw-strings-qq text time unix + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -180464,6 +181482,7 @@ self: { base containers mtl smallcheck tasty tasty-discover tasty-hunit tasty-quickcheck tasty-smallcheck ]; + testToolDepends = [ tasty-discover ]; description = "A Haskell implementation of setoid"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183372,8 +184391,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singleton-typelits"; - version = "0.0.0.0"; - sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig"; + version = "0.1.0.0"; + sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08"; libraryHaskellDepends = [ base ]; description = "Singletons and induction over GHC TypeLits"; license = stdenv.lib.licenses.bsd3; @@ -183627,6 +184646,7 @@ self: { generics-sop hedgehog HUnit lens markdown-unlit tasty tasty-hedgehog tasty-hunit vector-space ]; + testToolDepends = [ markdown-unlit ]; description = "Multidimensional grids with sized specified at compile time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -183741,6 +184761,7 @@ self: { base containers mtl smallcheck tasty tasty-discover tasty-hunit tasty-quickcheck tasty-smallcheck ]; + testToolDepends = [ tasty-discover ]; description = "Skeletal set - a set with equivalence relation different from equality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -186721,14 +187742,18 @@ self: { }) {}; "sort-by-pinyin" = callPackage - ({ mkDerivation, air, base, bytestring, containers, text }: + ({ mkDerivation, air, base, bytestring, containers, here + , template-haskell, text + }: mkDerivation { pname = "sort-by-pinyin"; - version = "2017.10.18"; - sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34"; + version = "2018.4.9"; + sha256 = "0r7fnsb4wcmhabybggzfbi1v2qcl7jzsmvwc43v7pwg5fl217nm8"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ air base bytestring containers text ]; - description = "Sort Simplified Chinese by PinYin"; + libraryHaskellDepends = [ + air base bytestring containers here template-haskell text + ]; + description = "sort by pinyin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -187459,18 +188484,19 @@ self: { ({ mkDerivation, aeson, base, bytestring, heavy-logger, HsOpenSSL , hspec, http-client, http-client-openssl, http-types , json-autotype, lens, mime-types, monad-control, mtl - , neat-interpolation, options, SHA, text, text-format-heavy, wreq + , neat-interpolation, options, SHA, split, text, text-format-heavy + , wreq }: mkDerivation { pname = "speechmatics"; - version = "0.7.1.0"; - sha256 = "1sx4q4l1rx6xss6xp1qqdb1nscclaszpkn78cs47rxpa19lcnsd2"; + version = "0.7.2.0"; + sha256 = "0i8xmlk0czqkshkdmnskqp7xpy45ads1x7yzdjn9p5mn0z46h7vb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring heavy-logger HsOpenSSL http-client http-client-openssl http-types json-autotype lens mime-types - monad-control mtl text text-format-heavy wreq + monad-control mtl split text text-format-heavy wreq ]; executableHaskellDepends = [ aeson base bytestring heavy-logger mime-types mtl options SHA text @@ -188787,8 +189813,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "6"; - editedCabalFile = "1h4llrsmd270vnw7fxzvw1a22bdkm3srdf5f3v19pbcgm2ahadsj"; + revision = "7"; + editedCabalFile = "08i636hsi0znrm3ma7z2wknma06aa4xzfqwy0z4x9d7vn7fscm48"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -188828,8 +189854,8 @@ self: { pname = "stack"; version = "1.7.1"; sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; - revision = "5"; - editedCabalFile = "1pfvn5xc3yq2i2qxml4ww3mm2lidkz1v4f76j0x08g37p37d2lbz"; + revision = "8"; + editedCabalFile = "0l6fnradzx4wf5q5zm1yv3zj8mragvzjk472pz3jsvk6iam6ss2c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -189903,8 +190929,8 @@ self: { pname = "statistics"; version = "0.14.0.2"; sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; - revision = "1"; - editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0"; + revision = "2"; + editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3"; libraryHaskellDepends = [ aeson base base-orphans binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms @@ -190986,10 +192012,36 @@ self: { aeson aeson-pretty base bytestring containers hashable hspec hspec-discover lens template-haskell text unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_24_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.24.3"; + sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -191623,6 +192675,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streamly_0_4_1" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue + , monad-control, mtl, QuickCheck, random, transformers + , transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.4.1"; + sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base 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 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192303,10 +193384,35 @@ self: { http-client-tls http-types markdown-unlit template-haskell text time transformers ]; + testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; }) {}; + "strive_5_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "5.0.6"; + sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types markdown-unlit template-haskell text + time transformers + ]; + testToolDepends = [ markdown-unlit ]; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -192380,8 +193486,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "0.9.3.0"; - sha256 = "107kyi11634r7iqx0n6ry60byjab3xigl0xf3waq0lrv7jgrmhbz"; + version = "0.9.3.1"; + sha256 = "0cw358jcdmlvgxsl2cjpb6gfyjizhxhsvlwqh52cwrs87sg9vpsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193467,6 +194573,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.gnome3) librsvg;}; @@ -195051,8 +196158,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.1"; - sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh"; + version = "0.8.0.2"; + sha256 = "0dxdk1yjbk0f648q59dfkgx9asc24f733ww3cs98p799n7jnfl1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197887,6 +198994,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover mtl template-haskell transformers ]; + testToolDepends = [ hspec-discover ]; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -198249,6 +199357,7 @@ self: { sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base hspec hspec-discover silently ]; + testToolDepends = [ hspec-discover ]; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -198493,16 +199602,16 @@ self: { "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath - , HUnit, io-streams, lens, mtl, process, temporary, test-framework - , test-framework-hunit + , HUnit, io-streams, lens, mtl, process, semigroups, temporary + , test-framework, test-framework-hunit }: mkDerivation { pname = "texrunner"; - version = "0.0.1.1"; - sha256 = "0qsx47jml91ndnlln7nmw4p0rh3vf07br29fqsxg831f7xd190v2"; + version = "0.0.1.2"; + sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl - process temporary + process semigroups temporary ]; testHaskellDepends = [ base bytestring HUnit lens test-framework test-framework-hunit @@ -198634,6 +199743,7 @@ self: { base base16-bytestring base64-bytestring bytestring errors text ]; testHaskellDepends = [ base bytestring hspec hspec-discover text ]; + testToolDepends = [ hspec-discover ]; description = "Safe conversions between textual types"; license = stdenv.lib.licenses.isc; }) {}; @@ -199813,6 +200923,7 @@ self: { sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1"; libraryHaskellDepends = [ base template-haskell time ]; testHaskellDepends = [ base markdown-unlit ]; + testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to current time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -200359,8 +201470,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.11"; - sha256 = "07v9szpjx4hd01rk1wq5a3bcpkxnm317f6xj3mi2klxrdwrhdyav"; + version = "0.2.11.1"; + sha256 = "18s1k3c3013zsvw3midzpwlh7mn2lmz6ryyrh98rhjccz5nl0qvh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -200564,6 +201675,7 @@ self: { base doctest either safe-exceptions silently tasty tasty-discover tasty-hunit text ]; + testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; }) {}; @@ -201748,9 +202860,11 @@ self: { base clay containers data-has directory frontmatter inliterate lucid process require temporary text universum yaml ]; + libraryToolDepends = [ require ]; executableHaskellDepends = [ base optparse-generic require universum ]; + executableToolDepends = [ require ]; testHaskellDepends = [ base require ]; description = "A softer alternative to Haddock"; license = stdenv.lib.licenses.asl20; @@ -202154,6 +203268,7 @@ self: { 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; }) {}; @@ -202875,8 +203990,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.1.0"; - sha256 = "155vpz1l2qdxnyp87qmkyphdrab7jryqjdlvddb55ii7cdjdm6d7"; + version = "2.1.1"; + sha256 = "0hk592dki8hp15a84pnqnjdwql2zczfask71gxf833i0vrph38yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206313,6 +207428,7 @@ self: { base ghc-typelits-knownnat hedgehog tasty tasty-discover tasty-hedgehog tasty-hspec ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion deepseq dependent-map dependent-sum ghc-typelits-knownnat @@ -206354,8 +207470,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.2.1"; - sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2"; + version = "0.6.3.1"; + sha256 = "16jysdh7v8336xkhl6vzni5zj301jsgawwxy8fcrd74p87am2k05"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -207098,6 +208214,8 @@ self: { pname = "unfoldable"; version = "0.9.6"; sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d"; + revision = "1"; + editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -208500,6 +209618,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unwrapped-functors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unwrapped-functors"; + version = "0.1.0.0"; + sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2"; + libraryHaskellDepends = [ base ]; + description = "Unwrapping sums/products lifted to functors"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "uom-plugin" = callPackage ({ mkDerivation, base, containers, deepseq, ghc , ghc-tcplugins-extra, hlint, tasty, tasty-hunit, template-haskell @@ -210586,8 +211715,8 @@ self: { pname = "vector"; version = "0.12.0.1"; sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i"; - revision = "2"; - editedCabalFile = "0vzr8kra73anchp86knkmkq2afkd1hw6hirldn9vn69frynb1n6y"; + revision = "3"; + editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -210884,14 +212013,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_3_1" = callPackage + "vector-sized_1_0_4_0" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.3.1"; - sha256 = "0dzf3cg7zfg4k5jiq7h6dw2ihczs42as9cxn8dkswx5v6nahnnxx"; + version = "1.0.4.0"; + sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4"; libraryHaskellDepends = [ adjunctions base deepseq distributive finite-typelits indexed-list-literals primitive vector @@ -211319,6 +212448,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_19" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.19"; + sha256 = "1v8lnc3naklznwrla34zgx4hf5vzb2762f9p1cxkb5fdnwslbmlc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -211908,6 +213056,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -211925,6 +213074,7 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -211964,6 +213114,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_22" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.22"; + sha256 = "0x9kz6pvky1cmbhcf3bs5m3hnhrqj8cm510m4d4a2hf9ish55wvz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -212379,6 +213564,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_23_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.23.0"; + sha256 = "10chij5jy057q1c4zybmb6jq5kff9i9iqijz31q51s6l0fh1zkw8"; + 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 iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -213859,6 +215075,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_23" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.23"; + sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -214522,6 +215773,7 @@ self: { hspec-discover hspec-expectations memory split stm tagged text time transformers ]; + testToolDepends = [ hspec-discover ]; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -214914,6 +216166,7 @@ self: { base bytestring cairo glib gtk mtl pango text transformers ]; libraryPkgconfigDepends = [ webkit ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -214961,6 +216214,7 @@ self: { base bytestring cairo glib gtk3 mtl pango text transformers ]; libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -217151,6 +218405,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_10" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.10"; + sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -218871,14 +220140,14 @@ self: { ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring , containers, dbus, directory, filepath, hinotify, hspec, HTTP , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr - , libXrender, mtl, old-locale, parsec, process, regex-compat, stm - , time, timezone-olson, timezone-series, transformers, unix - , utf8-string, wirelesstools, X11, X11-xft + , libXrender, mtl, old-locale, parsec, parsec-numbers, process + , regex-compat, stm, time, timezone-olson, timezone-series + , transformers, unix, utf8-string, wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.26"; - sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz"; + version = "0.27"; + sha256 = "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -218890,15 +220159,17 @@ self: { executableHaskellDepends = [ alsa-core alsa-mixer base bytestring containers dbus directory filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl - old-locale parsec process regex-compat stm time timezone-olson - timezone-series transformers unix utf8-string X11 X11-xft + old-locale parsec parsec-numbers process regex-compat stm time + timezone-olson timezone-series transformers unix utf8-string X11 + X11-xft ]; executableSystemDepends = [ libXpm libXrandr libXrender wirelesstools ]; testHaskellDepends = [ base bytestring containers directory filepath hspec mtl old-locale - parsec process regex-compat stm time transformers unix X11 + parsec parsec-numbers process regex-compat stm time transformers + unix X11 ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; @@ -224684,6 +225955,7 @@ self: { tasty-discover tasty-hunit template-haskell text text-show throwable-exceptions transformers ]; + testToolDepends = [ tasty-discover ]; description = "A lisp processor, An inline-lisp, in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; From 2b9deeb0a9a6f8eab4f6a73f1d11d055d3cac4fe Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Mon, 16 Jul 2018 10:08:55 +0200 Subject: [PATCH 91/99] aerospike: fix ofborg eval (#43603) s/maintainer/maintainers/ --- pkgs/servers/nosql/aerospike/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 324513dead9..124daa4a5cc 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64 platforms = platforms.linux; - maintainer = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit ]; }; } From b00b4010ba4e85f893b032b7f40abf5ea27ee663 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2018 10:00:26 +0200 Subject: [PATCH 92/99] all-cabal-hashes: update to Hackage at 2018-07-15T21:54:52Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 7e7813b4650..8d9ba54c950 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/0986b1ed62a71528e09a660493955d79f0bf2fbf.tar.gz"; - sha256 = "1s8xffqpkwv1x038mi1vw0rk6k3scwpp2l1phq9zs2vxrhblriaw"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz"; + sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3"; } From 55af91d4aaaa2dbd66adf3367bd22b2227adcc77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2018 10:10:08 +0200 Subject: [PATCH 93/99] haskell-xmobar: the new release handles recent haskell-dbus version --- .../haskell-modules/configuration-ghc-8.4.x.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 881771a3a4c..7b83d260d90 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -55,11 +55,8 @@ self: super: { # package's version constraints. xmonad-extras = doJailbreak super.xmonad-extras; - # This package desperately needs a maintainer. - xmobar = super.xmobar.overrideScope (self: super: { - hinotify = self.hinotify_0_3_9; # https://github.com/jaor/xmobar/issues/356 - dbus = self.dbus_0_10_15; # https://github.com/jaor/xmobar/issues/346 - }); + # https://github.com/jaor/xmobar/issues/356 + xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; }); hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x } From c9a1e46085eb3c1786d8c95b985340ac4839d1b2 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 16 Jul 2018 11:41:07 +0300 Subject: [PATCH 94/99] xkbcomp: 1.4.0 -> 1.4.2 (#43589) --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6d2a92dd78b..a1b458986e5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2420,11 +2420,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.4.0"; + name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; - sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; + url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; + sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; From 705b807c7c4fb7495c1729e89c389728587f02b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Jul 2018 01:54:30 -0700 Subject: [PATCH 95/99] jackett: 0.8.1209 -> 0.9.1 (#43467) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 52c19d819d7..ec825f856ce 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.8.1209"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0vql7h6diswvvh1a0rcisc541bk4ilp0ab1nn4z4dq16hcy0fv61"; + sha256 = "1hj6ilhv98yzhfjvrgqrsgaz7bd1yqaayifir8ivsvqq8085nlf6"; }; buildInputs = [ makeWrapper ]; From f3341e233051293dcc944020c43d83f84508a4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Jul 2018 09:55:06 +0100 Subject: [PATCH 96/99] xz: enable optional static compilation --- pkgs/tools/compression/xz/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 37c0c6d1c7e..0ff349e96e8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, enableStatic ? false }: stdenv.mkDerivation rec { name = "xz-5.2.4"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; + configureFlags = stdenv.lib.optional enableStatic "--disable-shared"; + doCheck = true; preCheck = '' From c661f96968d5ba8c2ef6af99bd4099fd968fc7f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2018 10:55:17 +0200 Subject: [PATCH 97/99] Consistently pass versioned llvmPackages_x attributes to GHC. Otherwise, these configurations are going to break when Nixpkgs updates to llvm 6.x. --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 7b83d260d90..39c5a177b92 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.4.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bc540cbe36d..b2e9d43ef08 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.6.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 93a39beb8a9..99f4cd87ce5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.7.x core libraries. array = null; From 9475c75895e3a6fc4a0f92b8612f9bceeec775c0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Jul 2018 09:22:54 -0400 Subject: [PATCH 98/99] linux: 4.18-rc4 -> 4.18-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index cc82e146abd..1408f0f1f44 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc4"; - modDirVersion = "4.18.0-rc4"; + version = "4.18-rc5"; + modDirVersion = "4.18.0-rc5"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj"; + sha256 = "1r7ia0dc4p8xvyrl5kx9v7ii1m25ly0hg6xyz3zwhaailg1y4jzk"; }; # Should the testing kernels ever be built on Hydra? From 862e4e4fdb665981b140fda9dcf7298f09fbc061 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 16 Jul 2018 15:58:22 +0100 Subject: [PATCH 99/99] cvc4: fix homepage url --- pkgs/applications/science/logic/cvc4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 222021bb1c9..cddcbef7a03 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = http://cvc4.cs.nyu.edu/web/; + homepage = http://cvc4.cs.stanford.edu/web/; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl thoughtpolice gebner ];