From 7ec5348c9c830a6e9fac8b791cd790d711ca218c Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Mon, 27 Dec 2021 11:43:41 +0100 Subject: [PATCH 01/38] bookstack: 21.10.3 -> 21.12 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 406 +++++++++++------- 2 files changed, 255 insertions(+), 155 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index d8ec99a81415..a1d89f1f8259 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "21.10.3"; + version = "21.12"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "1lg5hwnnb2m8gq6yjfh7jqfnilx06cvdind2n43giy9bnhnpa0wl"; + sha256 = "1bfwpvawa3pxpdsdbi3nxpjpdv2z1jmv7nk6cs9gs0210jlairsz"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index a17c84f5b5e5..24220da93581 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-fda176884d2952cffc7e67209470bff49609339c"; + name = "aws-aws-sdk-php-58fa9d8b522b0afa260299179ff950c783ff0ee1"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c"; - sha256 = "07cjzhbw4qv7jvi7lly5zg15dcvpgd1py604pas68al7k1lg4343"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/58fa9d8b522b0afa260299179ff950c783ff0ee1"; + sha256 = "1d0v1q2c206jfdkci9d5b5sf94a0nbdh472n3hqlh11pb1lzp3fz"; }; }; }; @@ -52,6 +52,26 @@ let }; }; }; + "brick/math" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "brick-math-ca57d18f028f84f777b2168cd1911b0dee2343ae"; + src = fetchurl { + url = "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae"; + sha256 = "1nr1grrb9g5g3ihx94yk0amp8zx8prkkvg2934ygfc3rrv03cq9w"; + }; + }; + }; + "composer/package-versions-deprecated" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "composer-package-versions-deprecated-b174585d1fe49ceed21928a945138948cb394600"; + src = fetchurl { + url = "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600"; + sha256 = "0m5hd3wfaka53n51b9aavyifwc2bdyr3jwywpkmpyrlmmn67c8ax"; + }; + }; + }; "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -75,10 +95,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-2411a55a2a628e6d8dd598388ab13474802c7b6e"; + name = "doctrine-dbal-5d54f63541d7bed1156cb5c9b79274ced61890e4"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e"; - sha256 = "19vyv64ikbzk0pm9nn67a2kidhfvfcm9s5d91h0hk6kbq85f292v"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/5d54f63541d7bed1156cb5c9b79274ced61890e4"; + sha256 = "1mqrijv0rrrcil2wcb5jvryfcl9phskbk4llj5gsf1hmrj0pfsgq"; }; }; }; @@ -125,20 +145,20 @@ let "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-8768448244967a46d6e67b891d30878e0e15d25c"; + name = "dompdf-dompdf-de4aad040737a89fae2129cdeb0f79c45513128d"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c"; - sha256 = "0mgsry4mq5bx6b74h3akay1bp03rnsl8ppcjxjkfjlq4svq7m5yf"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/de4aad040737a89fae2129cdeb0f79c45513128d"; + sha256 = "1isjhijd3lxsl0k9lzgp7rzqcak3hb7w04cy4pn62wpxckhcc30i"; }; }; }; "dragonmantank/cron-expression" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2"; + name = "dragonmantank-cron-expression-7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"; src = fetchurl { - url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2"; - sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl"; + url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"; + sha256 = "0pl9zrj9254qbwr7vyiilzhmb7bq2ss631iwvlq1mqky2bwinj2l"; }; }; }; @@ -152,16 +172,6 @@ let }; }; }; - "fideloper/proxy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; - src = fetchurl { - url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; - sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; - }; - }; - }; "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -172,13 +182,23 @@ let }; }; }; + "graham-campbell/result-type" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca"; + src = fetchurl { + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca"; + sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83"; + }; + }; + }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-868b3571a039f0ebc11ac8f344f4080babe2cb94"; + name = "guzzlehttp-guzzle-ee0a041b1760e6a53d2a39c8c34115adc2af2c79"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94"; - sha256 = "1n8kng76v4gb51z1qq7wx63pwlyiz3pa44shfla4mcxl2js0r6r0"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79"; + sha256 = "0wa63kw5fr5jhy2cv1g28qy9rsgwhn902447mzmgz17qjx72lzrb"; }; }; }; @@ -225,20 +245,50 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; + name = "laravel-framework-83fe447ae964dc5f1f829d25fa2f6042d9099834"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; - sha256 = "1r04396755jixbhbw1zzmyz74ng8np0ysv7g7mgcvv01s6wxw66l"; + url = "https://api.github.com/repos/laravel/framework/zipball/83fe447ae964dc5f1f829d25fa2f6042d9099834"; + sha256 = "0843j6am2fmnyvgydd9fkc7fnjbj63ii25mnrbi6xnzqniq2lrrz"; + }; + }; + }; + "laravel/serializable-closure" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-serializable-closure-25de3be1bca1b17d52ff0dc02b646c667ac7266c"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/25de3be1bca1b17d52ff0dc02b646c667ac7266c"; + sha256 = "1fk4zbvlc3qcw50pbs1qw5hgc8a3xgv4hn185ghq5kmmxm3q84p6"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-fd0f6a3dd963ca480b598649b54f92d81a43617f"; + name = "laravel-socialite-b5c67f187ddcf15529ff7217fa735b132620dfac"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/fd0f6a3dd963ca480b598649b54f92d81a43617f"; - sha256 = "08x0pn4ib5nhh9jkkb5brf8yj0fq6v6gn1qg97hss3mvnhazk5wx"; + url = "https://api.github.com/repos/laravel/socialite/zipball/b5c67f187ddcf15529ff7217fa735b132620dfac"; + sha256 = "0sryq8a6sr7n1b1cajdnd4xkwhfygkb6a7s4b176vvh64lps3nn9"; + }; + }; + }; + "laravel/tinker" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-tinker-a9ddee4761ec8453c584e393b393caff189a3e42"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/tinker/zipball/a9ddee4761ec8453c584e393b393caff189a3e42"; + sha256 = "1kzwwkxx1lzx6x85z29dd8a35jz3qw416p797s203vidayynn731"; + }; + }; + }; + "laravel/ui" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-ui-b3e804559bf3973ecca160a4ae1068e6c7c167c6"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/ui/zipball/b3e804559bf3973ecca160a4ae1068e6c7c167c6"; + sha256 = "1mf6f7508b3943bsb75x6myh62ry6r5n2iqicdiw3kv5f87c1c5a"; }; }; }; @@ -255,10 +305,10 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-18634df356bfd4119fe3d6156bdb990c414c14ea"; + name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea"; - sha256 = "1cy0xmnl3ck7cb6ibl9jjw5pmbw15mww5q06vacgq5lnx8r5w700"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99"; + sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva"; }; }; }; @@ -275,20 +325,20 @@ let "league/html-to-markdown" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-html-to-markdown-e5600a2c5ce7b7571b16732c7086940f56f7abec"; + name = "league-html-to-markdown-4d0394e120dc14b0d5c52fd1755fd48656da2ec9"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec"; - sha256 = "1a46ki1lbhnc9gqddrka2hypw0h8zcd8dhi8gc1jf5bflhb1wmqk"; + url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/4d0394e120dc14b0d5c52fd1755fd48656da2ec9"; + sha256 = "0my5k4cf5m3qb6bgq07dyq3347xm64sd1f83nr14ny3w31vb43cm"; }; }; }; "league/mime-type-detection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-b38b25d7b372e9fddb00335400467b223349fd7e"; + name = "league-mime-type-detection-aa70e813a6ad3d1558fc927863d47309b4c23e69"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e"; - sha256 = "02ywmarr58z5w9pf5qvk6hyrnykdh6v7n5jdkgb4ykdn2plinmlz"; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69"; + sha256 = "0k2kccf1v0002bb083p1ncmm8fbyflnkjx45808sxlkrxggzqcy3"; }; }; }; @@ -335,20 +385,20 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-f4655858a784988f880c1b8c7feabbf02dfdf045"; + name = "nesbot-carbon-8c2a18ce3e67c34efc1b29f64fe61304368259a2"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045"; - sha256 = "18px9mynqabrhgss5nyhadncdcf7aq1mzbbyrxfqbvyv54zq4zjh"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/8c2a18ce3e67c34efc1b29f64fe61304368259a2"; + sha256 = "0ld6pm7sj7myqs1xa9c2bh9l0v2qcr7lcv590sy0mqn0fcx2gqr5"; }; }; }; - "nunomaduro/collision" = { + "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; + name = "nikic-php-parser-210577fe3cf7badcc5814d99455df46564f3c077"; src = fetchurl { - url = "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; - sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077"; + sha256 = "191ijb7bybqnl1jayx6bipqh91dc9acg9zsbh89fk4h1ff87b1qp"; }; }; }; @@ -412,43 +462,23 @@ let }; }; }; - "php-parallel-lint/php-console-color" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e"; - src = fetchurl { - url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e"; - sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k"; - }; - }; - }; - "php-parallel-lint/php-console-highlighter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8"; - src = fetchurl { - url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8"; - sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4"; - }; - }; - }; "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-5455cb38aed4523f99977c4a12ef19da4bfe2a28"; + name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28"; - sha256 = "009q2afjkjl8psisr8jsw9k08qnkb0f4hgd6izrjmm06bd7bk9ah"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; + sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-6e794226a35159eb06f355efe59a0075a16551dd"; + name = "phpseclib-phpseclib-89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/6e794226a35159eb06f355efe59a0075a16551dd"; - sha256 = "1jjgzckgpr6myf4lcngsgmmqib5x2rv93yj7syg1xyawls4qj3yb"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"; + sha256 = "1ahr00g5bpvgjw36ps32aadyvnrsar94p06kar4pxvls4cmixldl"; }; }; }; @@ -472,6 +502,16 @@ let }; }; }; + "psr/cache" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; + sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; + }; + }; + }; "psr/container" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -482,6 +522,16 @@ let }; }; }; + "psr/event-dispatcher" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-event-dispatcher-dbefd12671e8a14ec7f180cab83036ed26714bb0"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0"; + sha256 = "05nicsd9lwl467bsv4sn44fjnnvqvzj1xqw2mmz9bac9zm66fsjd"; + }; + }; + }; "psr/http-client" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -532,6 +582,16 @@ let }; }; }; + "psy/psysh" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psy-psysh-a0d9981aa07ecfcbea28e4bfa868031cca121e7d"; + src = fetchurl { + url = "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d"; + sha256 = "1gsmnqshrc97phlinhiina9465lw0ir3xcfl4lbn4f9lm7nxzzs2"; + }; + }; + }; "ralouphie/getallheaders" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -542,13 +602,23 @@ let }; }; }; + "ramsey/collection" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; + src = fetchurl { + url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; + sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; + }; + }; + }; "ramsey/uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-uuid-ffa80ab953edd85d5b6c004f96181a538aad35a3"; + name = "ramsey-uuid-fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3"; - sha256 = "043g1nwpbvqrvq6ri2517254d72538h5jfzv9miafnws4ajwfpzg"; + url = "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; + sha256 = "1fhjsyidsj95x5dd42z3hi5qhzii0hhhxa7xvc5jj7spqjdbqln4"; }; }; }; @@ -565,10 +635,10 @@ let "sabberworm/php-css-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796"; + name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796"; - sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9"; + url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; + sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; }; }; }; @@ -665,120 +735,100 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-8dbd23ef7a8884051482183ddee8d9061b5feed0"; + name = "symfony-console-9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0"; - sha256 = "1p03ls8djpyhplf1irbg5ym3rjqviknwvg1mz9v6kdvnr694vzxn"; + url = "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4"; + sha256 = "19b1457cnn8ijbwd4mha6nxhvcsd4kh7dn72klixykj2kvqh0hvg"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-7fb120adc7f600a59027775b224c13a33530dd90"; + name = "symfony-css-selector-44b933f98bb4b5220d10bed9ce5662f8c2d13dcc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90"; - sha256 = "03jblgg300imj7s731ynxm579a6qj87lhd4lnhahbf4m7y65vj7w"; - }; - }; - }; - "symfony/debug" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-debug-43ede438d4cb52cd589ae5dc070e9323866ba8e0"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0"; - sha256 = "1min1v940rrv83w4fan9ypw4zj62wmi5nwn76pq618pdi8z00kpn"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/44b933f98bb4b5220d10bed9ce5662f8c2d13dcc"; + sha256 = "0h05a4jfv64vgbw40r7f0ndz617hmml5kn7wck38fb31mmrprbak"; }; }; }; "symfony/deprecation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-deprecation-contracts-5f38c8804a9e97d23e0c8d63341088cd8a22d627"; + name = "symfony-deprecation-contracts-6f981ee24cf69ee7ce9736146d1c57c2780598a8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627"; - sha256 = "11k6a8v9b6p0j788fgykq6s55baba29lg37fwvmn4igxxkfwmbp3"; + url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8"; + sha256 = "05jws1g4kcs297bwf5d72z47m2263i2jqpivi3yv8kf50kdjjzba"; }; }; }; "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; + name = "symfony-error-handler-1e3cb3565af49cd5f93e5787500134500a29f0d9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; - sha256 = "1qy8j16crb271pz6frjxyy2b41f1ap8w2mwb2n5zr3gmg0iqm487"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/1e3cb3565af49cd5f93e5787500134500a29f0d9"; + sha256 = "1qqgn6ksg7bimcvf5f821zmfhp9zd5x9c9bibvg3qzfzd22zmk11"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-2fe81680070043c4c80e7cedceb797e34f377bac"; + name = "symfony-event-dispatcher-27d39ae126352b9fa3be5e196ccf4617897be3eb"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac"; - sha256 = "0qf59l1a1h25hl6bp1wwfl5s825f8ybw2jiwhalw7gfnrx8x68fb"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb"; + sha256 = "01gl3av34p4jk71xjw6bjfsycb0fh02ll1bn3h3jdknzgkg2lsg4"; }; }; }; "symfony/event-dispatcher-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7"; + name = "symfony-event-dispatcher-contracts-66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7"; - sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw"; + url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"; + sha256 = "03bx5j7xh5bv1v17nlaw9wnbad66bzwp5w7npg8w2b01my49phfy"; }; }; }; "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-70362f1e112280d75b30087c7598b837c1b468b6"; + name = "symfony-finder-d2f29dac98e96a98be467627bd49c2efb1bc2590"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6"; - sha256 = "0f75c5mjig5ypigb4s1av3w67xizx6pl15wrqbyxa39a9qq58x6v"; - }; - }; - }; - "symfony/http-client-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-http-client-contracts-7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; - sha256 = "04mszmb94y0xjs0cwqxzhpf65kfqhhqznldifbxvrrlxb9nn23qc"; + url = "https://api.github.com/repos/symfony/finder/zipball/d2f29dac98e96a98be467627bd49c2efb1bc2590"; + sha256 = "10ham5wrdsmxp8mrzwmxc87dw33fpacrbcaynm5w4v0z1sbvwkpb"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-b9a91102f548e0111f4996e8c622fb1d1d479850"; + name = "symfony-http-foundation-5dad3780023a707f4c24beac7d57aead85c1ce3c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/b9a91102f548e0111f4996e8c622fb1d1d479850"; - sha256 = "0f6hxzrcijpjiwfjlw0bgn17a6d7bdfr7bc8nlmhfig7v945rbwq"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/5dad3780023a707f4c24beac7d57aead85c1ce3c"; + sha256 = "0szcq1x9zil11axgjlhcnw3vw48md5k02k3h01sxd8ywlzkjyaz0"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-6f1fcca1154f782796549f4f4e5090bae9525c0e"; + name = "symfony-http-kernel-2bdace75c9d6a6eec7e318801b7dc87a72375052"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/6f1fcca1154f782796549f4f4e5090bae9525c0e"; - sha256 = "1i9bd9kp1yz55922hf95chdnzxbaavx87hxjzy6dysg81sjw89fw"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/2bdace75c9d6a6eec7e318801b7dc87a72375052"; + sha256 = "1gwpzi97ih9gzddlw8ihyndkyi137r3hyycyb55l01yfq1wl7la1"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-a756033d0a7e53db389618653ae991eba5a19a11"; + name = "symfony-mime-d4365000217b67c01acff407573906ff91bcfb34"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11"; - sha256 = "06awwbkbg6fkkbls4rk4qkdzrigik3zm68cwa8bazsy7izqrh3nj"; + url = "https://api.github.com/repos/symfony/mime/zipball/d4365000217b67c01acff407573906ff91bcfb34"; + sha256 = "12q2b5xbc0pyhfn0wyfnjf5sklnsrkafy2yg7d4fb3d8vliv4zzf"; }; }; }; @@ -802,6 +852,16 @@ let }; }; }; + "symfony/polyfill-intl-grapheme" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-intl-grapheme-16880ba9c5ebe3642d1995ab866db29270b36535"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535"; + sha256 = "0pb57756kvdxksqy2nndf8q7c91p2dzhysa52x2rbhba869760fv"; + }; + }; + }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -862,83 +922,123 @@ let }; }; }; + "symfony/polyfill-php81" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-php81-e66119f3de95efc359483f810c4c3e6436279436"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436"; + sha256 = "0hg340da7m0yipj2bj5hxhd3mqidz767ivg7w85r8vwz3mr9k1p3"; + }; + }; + }; "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; + name = "symfony-process-5be20b3830f726e019162b26223110c8f47cf274"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; - sha256 = "1h41y2k100fmrjz90m0vafpfgg2da6byy9m6vf1j9q41bhv6zccl"; + url = "https://api.github.com/repos/symfony/process/zipball/5be20b3830f726e019162b26223110c8f47cf274"; + sha256 = "03pwf12al7mg2sz3waiqxnqliyzszwiyvzb1f51c1hl57zbj9zz4"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; + name = "symfony-routing-9eeae93c32ca86746e5d38f3679e9569981038b1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; - sha256 = "1l3b5z0kn7f9q0whrm2wnxv0l038w3la75bf95pbs74szlnibfhz"; + url = "https://api.github.com/repos/symfony/routing/zipball/9eeae93c32ca86746e5d38f3679e9569981038b1"; + sha256 = "193vj08r1v3ghvid6jggqy62ip3n56mbwzpai3ldjhm8v8qdc9bs"; }; }; }; "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; + name = "symfony-service-contracts-1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; - sha256 = "1i573rmajc33a9nrgwgc4k3svg29yp9xv17gp133rd1i705hwv1y"; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; + sha256 = "0c1vq6jv2jc37i9m1ndpbv7g75blgvf1s44vk65nb1jdk3hrbrd1"; + }; + }; + }; + "symfony/string" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-string-9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d"; + sha256 = "1ml6zra6bynqgi0rqfkz65lgmp0wiay93simx7882wxrcxfkljqf"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; + name = "symfony-translation-8c82cd35ed861236138d5ae1c78c0c7ebcd62107"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; - sha256 = "08qxma91sffj8vqzb8dshwsxqf80y9kym3bsxx3gz05ksi01hk1d"; + url = "https://api.github.com/repos/symfony/translation/zipball/8c82cd35ed861236138d5ae1c78c0c7ebcd62107"; + sha256 = "0yh933f222v98bmvni0rxmvhqlhb1pa6ncwrvf06gly36sl6zkij"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-95c812666f3e91db75385749fe219c5e494c7f95"; + name = "symfony-translation-contracts-d28150f0f44ce854e942b671fc2620a98aae1b1e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95"; - sha256 = "073l1pbmwbkaviwwjq9ypb1w7dk366nn2vn1vancbal0zqk0zx7b"; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e"; + sha256 = "0gwqxhrzb9dzsqvqr9lc3whzl8wwlfhwskr0wdwqri4pq5mspb2w"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-50286e2b7189bfb4f419c0731e86632cddf7c5ee"; + name = "symfony-var-dumper-2366ac8d8abe0c077844613c1a4f0c0a9f522dcc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/50286e2b7189bfb4f419c0731e86632cddf7c5ee"; - sha256 = "05yb04dvb5higlbhgdl2hv4wnnmxi6l53xvls5v56wj21ddsk6vf"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/2366ac8d8abe0c077844613c1a4f0c0a9f522dcc"; + sha256 = "0ii4p4rkvrshvdix855p0jwb1snll275286swy95l59m6i76wzy1"; }; }; }; "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5"; + name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5"; - sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w"; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; + sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; }; }; }; "vlucas/phpdotenv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-a1bf4c9853d90ade427b4efe35355fc41b3d6988"; + name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988"; - sha256 = "04cks58khh2rx1ni5p1v8i37k4hy6zwkazlas0jqlrxhznmd50wi"; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f"; + sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl"; + }; + }; + }; + "voku/portable-ascii" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "voku-portable-ascii-80953678b19901e5165c56752d087fc11526017c"; + src = fetchurl { + url = "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c"; + sha256 = "112sz1jl55l3qm3041ijyzxy7qbv0sa6535hx6sp7nk2c76wjq0d"; + }; + }; + }; + "webmozart/assert" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "webmozart-assert-6964c76c7804814a842473e0c8fd15bab0f18e25"; + src = fetchurl { + url = "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25"; + sha256 = "17xqhb2wkwr7cgbl4xdjf7g1vkal17y79rpp6xjpf1xgl5vypc64"; }; }; }; From 5ca1d45da35a6c564fb69e29ba584fe9d8681530 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Wed, 29 Dec 2021 17:52:11 +0100 Subject: [PATCH 02/38] speedcrunch: use proper fetcher --- .../science/math/speedcrunch/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 4bb39ab73f5f..a4745c9ab922 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,13 +1,13 @@ -{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }: +{ mkDerivation, lib, fetchFromBitbucket, cmake, qtbase, qttools }: mkDerivation rec { pname = "speedcrunch"; version = "0.12.0"; - src = fetchgit { - # the tagging is not standard, so you probably need to check this when updating - rev = "refs/tags/release-${version}"; - url = "https://bitbucket.org/heldercorreia/speedcrunch"; + src = fetchFromBitbucket { + owner = "heldercorreia"; + repo = pname; + rev = "release-${version}"; sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; }; @@ -29,7 +29,7 @@ mkDerivation rec { precisions, unlimited variable storage, intelligent automatic completion full keyboard-friendly and more than 15 built-in math function. ''; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; # works with qt 5.6 and qt 5.8 broken = builtins.compareVersions qtbase.version "5.7.0" == 0; From 56bb783aec4038b62380a1fc63f53440e3191eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 14:33:45 +0000 Subject: [PATCH 03/38] goreleaser: 1.1.0 -> 1.2.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index f6c03edfe53d..fb8253919181 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1rk2n1c2ia8kwqvbfnhsf3jbbi1qzndniq7cxs8iy9drn4adl7gv"; + sha256 = "sha256-p+QLZ0G75Mk0Z9G+u+qcxTTWzPZnuM+inLO0Lkojs84="; }; - vendorSha256 = "1hm5ya240vpfmgc8y6qv4gp4gbcqydk7hg05fwr7nzc2apj5fv6a"; + vendorSha256 = "sha256-mAJrUGgO0iprQnYOa3TMENNJbJcgM1eiV/AG+TYP0Mg="; ldflags = [ "-s" From e7a7fdcb1d3a083aa23710d7df32e33d60e0e5b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Dec 2021 21:21:52 +0100 Subject: [PATCH 04/38] python3Packages.hahomematic: 0.7.0 -> 0.9.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 124afa297a04..6f4e456d11bc 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.7.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-3qdA/s03mVek4KH+6wAvbPmpp3pSUWCmeOByNs48+MU="; + sha256 = "sha256-Tp8m5Kw+mubJXKgov+CbfwtzWYzmqyjK1Q9gRkivTxk="; }; propagatedBuildInputs = [ From a5ec9dbe80706e5e68da6833ecb9db05f961604f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 00:38:03 +0000 Subject: [PATCH 05/38] python38Packages.pyenvisalink: 4.1 -> 4.2 --- pkgs/development/python-modules/pyenvisalink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index 54a552f88fe7..cfef4ee879aa 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.1"; + version = "4.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1h30gmmynihmjkd107skk2gpi210b6gfdahwqmydyj5isxrvzmq2"; + sha256 = "64f128212ba0257ae8e47612891a2dae7de2c155c81326257582d565f53778ad"; }; propagatedBuildInputs = [ From 7346c5b7d85cb699765aada20d7e916cff0aaab1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 01:58:10 +0000 Subject: [PATCH 06/38] python38Packages.deemix: 3.6.3 -> 3.6.4 --- pkgs/development/python-modules/deemix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index e0a082e23b4a..cf54f6facf82 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.6.3"; + version = "3.6.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mzQ5bqVBMkfBQmedO8+qh7r1OwWQxg1oMHGaYWBlBWo="; + sha256 = "268617b3ff9346ae51a063cbdb820c1f591cbadc1cf2fafd201dc671e721c1dd"; }; propagatedBuildInputs = [ From abe52c2dad7d473ebd5fad6a5629c55342dbb4bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 02:40:22 +0000 Subject: [PATCH 07/38] goaccess: 1.5.3 -> 1.5.4 --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 70c1dab5c6e2..fd1c80a35a09 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.5.3"; + version = "1.5.4"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TgreyBlV86K6P0W9WeLUW6RbcHpuOFW2fj2cCe7nWHE="; + sha256 = "sha256-KDA5R3up37DLS9YIur4IOacwOq0zed5tj58jEmE0vpE="; }; nativeBuildInputs = [ From 9815c51bce4fa92bd0623d7db77b5df5f09231ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 05:10:33 +0000 Subject: [PATCH 08/38] gopls: 0.7.3 -> 0.7.4 --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index d3eab38627c5..efbe65799f52 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-aaRaStQ35a/SK4YIR5rjvp8gPxvoNuhLh2AGbr0c6p4="; + sha256 = "sha256-tpJkEq3TuEiJ4bChlWXi2241WMcZjChEt1hV1G+h8f8="; }; modRoot = "gopls"; - vendorSha256 = "sha256-8+sWd48w+ghQzznobBPcCQMuc9HLgOuAZPwD6lbbfj8="; + vendorSha256 = "sha256-MEL3VRHPSf1Im09Hw+GX+3J3UGt7j29V4kxzoiWhqfk="; doCheck = false; From ec85d2458efb0c8d07df37fcabcd810cf2439faf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 06:03:24 +0000 Subject: [PATCH 09/38] gcompris: 1.1 -> 2.0 --- pkgs/games/gcompris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index a930b1682d4c..2b3ff2b5c2e5 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "1.1"; + version = "2.0"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-8Kj5R/7WwOuew7e9qgx2HWS8mnHX+cv8mhHmgXbm8q4="; + sha256 = "sha256-mrVGYI9IPyXqlXZN2MEDGTjIPUmlLwfaAo+zW4HjqMc="; }; cmakeFlags = [ From f745c59ea3e43e33a4a3bf9ce72d74bdb3442dd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 02:03:34 +0000 Subject: [PATCH 10/38] cariddi: 1.1.4 -> 1.1.5 --- pkgs/tools/security/cariddi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 1912b0b1acc0..670a03c88810 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/LGiGNvnZGyq9r+Tl6PI0SIKShkESz+XMWWKA5htczY="; + sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU="; }; - vendorSha256 = "sha256-ZIlOPOrAWdwHwgUR/9eBEXaIcNfWh7yEQ/c9iE8sLiY="; + vendorSha256 = "sha256-yVfRjUlw90oUsbF2P6pW6FhMXok9ZwcKmAWyTFLI/cY="; meta = with lib; { description = "Crawler for URLs and endpoints"; From 30ca6a218012292a2058bc4adf6b70655b2370f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 05:26:57 +0000 Subject: [PATCH 11/38] python38Packages.fontparts: 0.9.11 -> 0.10.1 --- pkgs/development/python-modules/fontparts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 158806f1be86..9b9cc129c63b 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.11"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "558a5f681fcf7ca0bb5a1c68917b5d9b61c77d517833a01ea1667773d13f4012"; + sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218"; extension = "zip"; }; From c6f9590b234933aeb22fa6f99a169ec630a6842a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 01:53:22 +0000 Subject: [PATCH 12/38] deno: 1.17.0 -> 1.17.1 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 0c4f2a353725..31a8ef404d9a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fkgsMPSmJVp62sVKuuHOsOUczFfBoooKNEY3w5f9zbE="; + sha256 = "sha256-XzpOJTLTiF4GrECC7ObFzoPusFM8mvhUGH9F52o88MY="; }; - cargoSha256 = "sha256-wzQf5Wb0kxAg5sNxom9qltdkpJbNatA7IK4oVstQXME="; + cargoSha256 = "sha256-7uTxDkAyViNidSDH6bdUrtP96vQgyz+p2OlK+/FUJvc="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 1eca804d2819a6f50909c491e9c358ae42c006e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Dec 2021 10:17:00 +0000 Subject: [PATCH 13/38] petsc: 3.16.1 -> 3.16.2 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 4ac72013eb37..e9ca9b849462 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-kJz3vOe2oN2yWAoayVAqoBYx7EEFxxZZTBgE8O4eoGo="; + sha256 = "sha256-erJXrhUNSDesjThyodIGmXliV4eF7CQnY5zqxG0TG7w="; }; mpiSupport = !withp4est || p4est.mpiSupport; From a23c6f10f3bf806cd40c7540e6bef1c0411de945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 09:26:40 +0000 Subject: [PATCH 14/38] dnsproxy: 0.39.12 -> 0.40.1 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 57863a10529c..8a98600f0dcf 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.12"; + version = "0.40.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gtakdKnkzAU1yKtKnlkS+n8CbgftV64zLoENJKYjIAo="; + sha256 = "sha256-tvYurE+/ZPJeV/ZKMIC0yrwzomxd/3y0KtChei/HO6c="; }; vendorSha256 = null; From 9385a2ea199d1b2bf2b785cfea7137ef37fa5432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Dec 2021 05:33:08 +0000 Subject: [PATCH 15/38] procs: 0.11.12 -> 0.11.13 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 3d93fb75033f..7f4068afca19 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2jH56l4SCYF+9oNhviJdybKmUo/iuR5mOOugc4Hw6Y="; + sha256 = "sha256-OgV4iqtGpia8l+GCySDD+aRIk1mNnJCB0OqZzITTj2I="; }; - cargoSha256 = "sha256-MrYOOAFj+mVm/EPx4CGQI7YhxPcF0jBgnnJk/DV2ojk="; + cargoSha256 = "sha256-d5GsCzigR5A1pJnvs6rjqMJqUB+H52Gaa1SzkHK5X+Y="; nativeBuildInputs = [ installShellFiles ]; From 2f4af378722d7c39f1d90b425a1914e101f3ae4e Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 31 Dec 2021 15:33:10 +0900 Subject: [PATCH 16/38] vimPlugins.plenary-nvim: fix curl command path --- pkgs/misc/vim-plugins/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 7188186e7e5b..3d7645b38e70 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -307,6 +307,13 @@ self: super: { # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + }); + gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); From ec1b4a780dbfff767b802d1be4238b18cbf89b4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 06:42:17 +0000 Subject: [PATCH 17/38] sarasa-gothic: 0.35.2 -> 0.35.5 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 069dcfb3de5c..c28b3745f942 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.35.2"; + version = "0.35.5"; in fetchurl { name = "sarasa-gothic-${version}"; # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-ts6GM09Z7hYHVx/JGxVPze5X1sZ/22TTdxHBGiYMn5I="; + sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0="; recursiveHash = true; downloadToTemp = true; From 8dd9fabf0de0d9c18d2dc3f3216cd1ecf303c1e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 07:00:30 +0000 Subject: [PATCH 18/38] cascadia-code: 2110.31 -> 2111.01 --- pkgs/data/fonts/cascadia-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 89547c23b875..67ad8682a8e8 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2110.31"; + version = "2111.01"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "sha256-SyPQtmudfogBwASTApl1hSpOPf2PLTSOzhJAJzrQ3Mg="; + sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; postFetch = '' mkdir -p $out/share/fonts/ From 2a9ebe61efde23e79bd81db8e0a3d1de1bc45ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 07:28:37 +0000 Subject: [PATCH 19/38] fasm: 1.73.28 -> 1.73.29 --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 12a25ca6a4d7..9f4263b08ed5 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.28"; + version = "1.73.29"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-ntHrtIX9EXQRGpTrdzEFojSRE5jgUJD15xSr9iyAkpI="; + sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs="; }; installPhase = '' From 4c90e2dcfc6785f1a372d21ec25bdf45b7cafcb7 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 31 Dec 2021 01:00:15 -0700 Subject: [PATCH 20/38] nebula: 1.4.0 -> 1.5.2 --- pkgs/tools/networking/nebula/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 2aec2fb50c76..a30c9f3bbdcd 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo117Module, fetchFromGitHub }: -buildGoModule rec { +buildGo117Module rec { pname = "nebula"; - version = "1.4.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU="; + sha256 = "kxBu+r99sC3XWDX+xTmhdUJx0HMVWA0Xgy7wgfrjZ5E="; }; - vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg="; + vendorSha256 = "5Yv2t5vdUNCcCo2KAm1xCkRVrt6gIasKHLqH7VVPDuU="; doCheck = false; @@ -38,7 +38,7 @@ buildGoModule rec { ''; homepage = "https://github.com/slackhq/nebula"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne numinit ]; }; } From e3d982dfee3b625bca4e42b34224bb7606190f17 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Fri, 31 Dec 2021 10:04:07 +0100 Subject: [PATCH 21/38] speedcrunch: 0.12.0 -> unstable-2021-10-09 --- pkgs/applications/science/math/speedcrunch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index a4745c9ab922..a4e15060fe3b 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "speedcrunch"; - version = "0.12.0"; + version = "unstable-2021-10-09"; src = fetchFromBitbucket { owner = "heldercorreia"; repo = pname; - rev = "release-${version}"; - sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; + rev = "74756f3438149c01e9edc3259b0f411fa319a22f"; + sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU="; }; buildInputs = [ qtbase qttools ]; From bd7b03d5dea874d495c2b9abf3eaf63fb6c8a547 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 11:06:44 +0000 Subject: [PATCH 22/38] featherpad: 1.0.1 -> 1.1.0 --- pkgs/applications/editors/featherpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 8fbcfbb4c101..80328fb06f82 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-FeqTPDix2tqTJ3UU6i2e6FkmCO0KMNt4tLtrPjX57fc="; + sha256 = "sha256-Sff1oyRYCsiJ7Kl3HxI/bln0M80KlbcNSw6jrEOeWiI="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; From cdc10fa6f22e6b720a064899a8873a7148586c4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 06:19:21 +0000 Subject: [PATCH 23/38] tilt: 0.23.3 -> 0.23.4 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index d34f4e3373de..dbdf06771b46 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.23.3"; + version = "0.23.4"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1612yrlsajl1j95zh057k82nzz492a9p1cgamph4m84zpm0v67jc"; + sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ="; }; vendorSha256 = null; From 79cba6165cfffc5232bfadd497d060091c3b4153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 10:22:08 +0000 Subject: [PATCH 24/38] entt: 3.8.1 -> 3.9.0 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 122bd9387308..f8d1bce9fc88 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-vg2tpGyZZM8c97Qko88JMP5YNPZx5kI5qRkkRclvZtA="; + sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo="; }; nativeBuildInputs = [ cmake ]; From ccf454849d0a17a343c02899e000a27ed7781707 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Dec 2021 10:23:00 +0000 Subject: [PATCH 25/38] entt: add platforms --- pkgs/development/libraries/entt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index f8d1bce9fc88..c514e3d78003 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; maintainers = with maintainers; [ twey ]; + platforms = platforms.all; license = licenses.mit; }; } From c218eff8112c3ac0c115d78f6a4e2edeb15f3b0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Dec 2021 06:47:39 +0000 Subject: [PATCH 26/38] python38Packages.xattr: 0.9.8 -> 0.9.9 --- pkgs/development/python-modules/xattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index cbec33483ccd..28b9f809dd00 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xattr"; - version = "0.9.8"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7"; + sha256 = "09cb7e1efb3aa1b4991d6be4eb25b73dc518b4fe894f0915f5b0dcede972f346"; }; propagatedBuildInputs = [ cffi ]; From c2c4b017783a92345f9af9f20c956d96006dd786 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Dec 2021 10:36:26 +0000 Subject: [PATCH 27/38] esbuild: 0.14.2 -> 0.14.8 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1258df45639b..c3ed6ce6b14d 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.2"; + version = "0.14.8"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ou1fkmlychf6VbKQD/PT1ehfyIQMIpbwEKlxpfncfEo="; + sha256 = "sha256-RyxlU6Wf+rHSZ/xuhiCbF+KYhMxHEEh3XvLCdwAVTYw="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From 8b0995f4fc0ac58ece0547f3033b2ae379816a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Dec 2021 05:33:52 +0000 Subject: [PATCH 28/38] delve: 1.7.3 -> 1.8.0 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 0ad756614de3..457a1d7a31db 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.7.3"; + version = "1.8.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-cqIU4nzS8l1JgW3DWRLpyCISDf2uPgw6CbVGyyvx0mg="; + sha256 = "sha256-NihlBFZ5xu+DMBtUiGyjxpgob2hoLlFJ7MfnM55feuw="; }; subPackages = [ "cmd/dlv" ]; From c3f8722baac88210a6f497c1bef24ebf9f7d78b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Dec 2021 00:41:10 +0000 Subject: [PATCH 29/38] leftwm: 0.2.9 -> 0.2.10 --- pkgs/applications/window-managers/leftwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 9379fb358b35..5b77320e2203 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256:0w4afhrp2cxz0nmpvalyaxz1dpywajjj2wschw8dpkvgxqs64gd5"; + sha256 = "sha256-WGss/XmryULq8Ly5MFmEqsL+9r4fnrvBEtetngJ05NY="; }; - cargoSha256 = "sha256:0r0smpv50gim2naaa0qf6yhvqvsa2f40rkgiryi686y69m5ii7mv"; + cargoSha256 = "sha256-9qvXzsAu4H2TAcArajrGqXwKF3BBDvmZbny7hiVO9Yo="; buildInputs = rpathLibs; From 6a3d020b9054980c1ee2fc6171a6a1d6c210d4e0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 24 Sep 2021 19:20:23 +0200 Subject: [PATCH 30/38] nixos/documentation: move man-db-specifics into new man-db module It may be possible to revert the move of `documentation.man.manualPages` later. The problem is that other man implementations (mandoc) want to generate their index databases in place, so the approach taken here doesn't translate super well. --- nixos/modules/misc/documentation.nix | 53 +++-------------------- nixos/modules/misc/man-db.nix | 63 ++++++++++++++++++++++++++++ nixos/modules/module-list.nix | 2 + 3 files changed, 71 insertions(+), 47 deletions(-) create mode 100644 nixos/modules/misc/man-db.nix diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 64b1c15086fc..d107a1abbc56 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -74,10 +74,6 @@ let ]; }; - # list of man outputs currently active intended for use as default values - # for man-related options, thus "man" is included unconditionally. - activeManOutputs = [ "man" ] ++ lib.optionals cfg.dev.enable [ "devman" ]; - in { @@ -107,8 +103,8 @@ in type = types.bool; default = true; description = '' - Whether to install manual pages and the man command. - This also includes "man" outputs. + Whether to install manual pages. + This also includes man outputs. ''; }; @@ -116,30 +112,12 @@ in type = types.bool; default = false; description = '' - Whether to generate the manual page index caches using - mandb(8). This allows searching for a page or + Whether to generate the manual page index caches. + This allows searching for a page or keyword using utilities like apropos(1). ''; }; - man.manualPages = mkOption { - type = types.path; - default = pkgs.buildEnv { - name = "man-paths"; - paths = config.environment.systemPackages; - pathsToLink = [ "/share/man" ]; - extraOutputsToInstall = activeManOutputs; - ignoreCollisions = true; - }; - defaultText = literalDocBook "all man pages in "; - description = '' - The manual pages to generate caches for if - is enabled. Must be a path to a directory with man pages under - /share/man; see the source for an example. - Advanced users can make this a content-addressed derivation to save a few rebuilds. - ''; - }; - info.enable = mkOption { type = types.bool; default = true; @@ -221,29 +199,10 @@ in config = mkIf cfg.enable (mkMerge [ + # The actual implementation for this lives in man-db.nix (mkIf cfg.man.enable { - environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = activeManOutputs; - environment.etc."man_db.conf".text = - let - manualCache = pkgs.runCommandLocal "man-cache" { } '' - echo "MANDB_MAP ${cfg.man.manualPages}/share/man $out" > man.conf - ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1 - ''; - in - '' - # Manual pages paths for NixOS - MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man - MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man - - ${optionalString cfg.man.generateCaches '' - # Generated manual pages cache for NixOS (immutable) - MANDB_MAP /run/current-system/sw/share/man ${manualCache} - ''} - # Manual pages caches for NixOS - MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos - ''; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; }) (mkIf cfg.info.enable { diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix new file mode 100644 index 000000000000..94898504b3f7 --- /dev/null +++ b/nixos/modules/misc/man-db.nix @@ -0,0 +1,63 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.documentation.man.man-db; +in + +{ + options = { + documentation.man.man-db = { + enable = lib.mkEnableOption "man-db as the default man page viewer" // { + default = config.documentation.man.enable; + defaultText = lib.literalExpression "config.documentation.man.enable"; + example = false; + }; + + manualPages = lib.mkOption { + type = lib.types.path; + default = pkgs.buildEnv { + name = "man-paths"; + paths = config.environment.systemPackages; + pathsToLink = [ "/share/man" ]; + extraOutputsToInstall = [ "man" ] + ++ lib.optionals config.documentation.dev.enable [ "devman" ]; + ignoreCollisions = true; + }; + defaultText = lib.literalDocBook "all man pages in "; + description = '' + The manual pages to generate caches for if + is enabled. Must be a path to a directory with man pages under + /share/man; see the source for an example. + Advanced users can make this a content-addressed derivation to save a few rebuilds. + ''; + }; + }; + }; + + imports = [ + (lib.mkRenamedOptionModule [ "documentation" "man" "manualPages" ] [ "documentation" "man" "man-db" "manualPages" ]) + ]; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.man-db ]; + environment.etc."man_db.conf".text = + let + manualCache = pkgs.runCommandLocal "man-cache" { } '' + echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf + ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1 + ''; + in + '' + # Manual pages paths for NixOS + MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man + MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man + + ${lib.optionalString config.documentation.man.generateCaches '' + # Generated manual pages cache for NixOS (immutable) + MANDB_MAP /run/current-system/sw/share/man ${manualCache} + ''} + # Manual pages caches for NixOS + MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos + ''; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dd6a74df30cb..6fe6b41c6098 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -108,6 +108,8 @@ ./misc/lib.nix ./misc/label.nix ./misc/locate.nix + ./misc/man-db.nix + ./misc/mandoc.nix ./misc/meta.nix ./misc/nixpkgs.nix ./misc/passthru.nix From bcc4c34640047b610f514fffc7233401f8caf1df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 24 Sep 2021 19:31:03 +0200 Subject: [PATCH 31/38] nixos/documentation: properly reference apropos(1), mention man -k man -k is useful to mention as it is -- in constrast to apropos(1) -- actually required by POSIX. --- nixos/modules/misc/documentation.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index d107a1abbc56..8f09568ee093 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -114,7 +114,16 @@ in description = '' Whether to generate the manual page index caches. This allows searching for a page or - keyword using utilities like apropos(1). + keyword using utilities like + + apropos + 1 + + and the -k option of + + man + 1 + . ''; }; From f4f723886002f3959d8ef94f556aaaf9c261cc9e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Sep 2021 19:51:03 +0200 Subject: [PATCH 32/38] nixos/mandoc: init Adds a NixOS module which allows using mandoc as the main manual viewer. It can be used as a drop-in replacement for documentation.man which relies on GNU's man-db and provides more or less the same features. The generateCaches option requires a different implementation for mandoc, so it is hard to share code between the two modules -- hence it has been implemented separately. Using both at the same time makes little sense and wouldn't quite work, so there's an assertion to prevent it. To make makewhatis(8) index manual pages which are symlinks to the nix store, we need to set READ_ALLOWED_PATH to include `builtins.storeDir`. For background and discussion see: https://inbox.vuxu.org/mandoc-tech/c9932669-e9d4-1454-8708-7c8e36967e8e@systemli.org/T/ --- nixos/modules/misc/documentation.nix | 13 ++++++- nixos/modules/misc/mandoc.nix | 51 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/misc/mandoc.nix diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 8f09568ee093..bb294addccd9 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -207,8 +207,19 @@ in }; config = mkIf cfg.enable (mkMerge [ + { + assertions = [ + { + assertion = !(cfg.man.man-db.enable && cfg.man.mandoc.enable); + message = '' + man-db and mandoc can't be used as the default man page viewer at the same time! + ''; + } + ]; + } - # The actual implementation for this lives in man-db.nix + # The actual implementation for this lives in man-db.nix or mandoc.nix, + # depending on which backend is active. (mkIf cfg.man.enable { environment.pathsToLink = [ "/share/man" ]; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; diff --git a/nixos/modules/misc/mandoc.nix b/nixos/modules/misc/mandoc.nix new file mode 100644 index 000000000000..939f87a31784 --- /dev/null +++ b/nixos/modules/misc/mandoc.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, ... }: + +let + makewhatis = "${lib.getBin pkgs.mandoc}/bin/makewhatis"; + + cfg = config.documentation.man.mandoc; + +in { + meta.maintainers = [ lib.maintainers.sternenseemann ]; + + options = { + documentation.man.mandoc = { + enable = lib.mkEnableOption "mandoc as the default man page viewer"; + + manPath = lib.mkOption { + type = with lib.types; listOf str; + default = [ "share/man" ]; + example = lib.literalExpression "[ \"share/man\" \"share/man/fr\" ]"; + description = '' + Change the manpath, i. e. the directories where + man1 + looks for section-specific directories of man pages. + You only need to change this setting if you want extra man pages + (e. g. in non-english languages). All values must be strings that + are a valid path from the target prefix (without including it). + The first value given takes priority. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment = { + systemPackages = [ pkgs.mandoc ]; + + # tell mandoc about man pages + etc."man.conf".text = lib.concatMapStrings (path: '' + manpath /run/current-system/sw/${path} + '') cfg.manPath; + + # create mandoc.db for whatis(1), apropos(1) and man(1) -k + # TODO(@sternenseemman): fix symlinked directories not getting indexed, + # see: https://inbox.vuxu.org/mandoc-tech/20210906171231.GF83680@athene.usta.de/T/#e85f773c1781e3fef85562b2794f9cad7b2909a3c + extraSetup = lib.mkIf config.documentation.man.generateCaches '' + ${makewhatis} -T utf8 ${ + lib.concatMapStringsSep " " (path: "\"$out/${path}\"") cfg.manPath + } + ''; + }; + }; +} From d110798747127ca587c114a6cb802915631f0a11 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 24 Sep 2021 20:54:08 +0200 Subject: [PATCH 33/38] nixos/tests/man: test common functionality of both man impls --- nixos/tests/all-tests.nix | 1 + nixos/tests/man.nix | 100 +++++++++++++++++++++++++++++ pkgs/tools/misc/man-db/default.nix | 6 +- pkgs/tools/misc/mandoc/default.nix | 6 +- 4 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/man.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 63a990d3d810..0dbd36718771 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -255,6 +255,7 @@ in magnetico = handleTest ./magnetico.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mailhog = handleTest ./mailhog.nix {}; + man = handleTest ./man.nix {}; mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; matomo = handleTest ./matomo.nix {}; diff --git a/nixos/tests/man.nix b/nixos/tests/man.nix new file mode 100644 index 000000000000..1ff5af4e8059 --- /dev/null +++ b/nixos/tests/man.nix @@ -0,0 +1,100 @@ + +import ./make-test-python.nix ({ pkgs, lib, ... }: let + manImplementations = [ + "mandoc" + "man-db" + ]; + + machineNames = builtins.map machineSafe manImplementations; + + makeConfig = useImpl: { + # Note: mandoc currently can't index symlinked section directories. + # So if a man section comes from one package exclusively (e. g. + # 1p from man-pages-posix and 2 from man-pages), it isn't searchable. + environment.systemPackages = [ + pkgs.man-pages + pkgs.openssl + pkgs.libunwind + ]; + + documentation = { + enable = true; + nixos.enable = lib.mkForce true; + dev.enable = true; + man = { + enable = true; + generateCaches = true; + } // lib.listToAttrs (builtins.map (impl: { + name = impl; + value = { + enable = useImpl == impl; + }; + }) manImplementations); + }; + }; + + machineSafe = builtins.replaceStrings [ "-" ] [ "_" ]; +in { + name = "man"; + meta.maintainers = [ lib.maintainers.sternenseemann ]; + + nodes = lib.listToAttrs (builtins.map (i: { + name = machineSafe i; + value = makeConfig i; + }) manImplementations); + + testScript = '' + import re + start_all() + + def match_man_k(page, section, haystack): + """ + Check if the man page {page}({section}) occurs in + the output of `man -k` given as haystack. Note: + This is not super reliable, e. g. it can't deal + with man pages that are in multiple sections. + """ + + for line in haystack.split("\n"): + # man -k can look like this: + # page(3) - bla + # page (3) - bla + # pagea, pageb (3, 3P) - foo + # pagea, pageb, pagec(3) - bar + pages = line.split("(")[0] + sections = re.search("\\([a-zA-Z1-9, ]+\\)", line) + if sections is None: + continue + else: + sections = sections.group(0)[1:-1] + + if page in pages and f'{section}' in sections: + return True + + return False + + '' + lib.concatMapStrings (machine: '' + with subtest("Test direct man page lookups in ${machine}"): + # man works + ${machine}.succeed("man man > /dev/null") + # devman works + ${machine}.succeed("man 3 libunwind > /dev/null") + # NixOS configuration man page is installed + ${machine}.succeed("man configuration.nix > /dev/null") + + with subtest("Test generateCaches via man -k in ${machine}"): + expected = [ + ("openssl", "ssl", 3), + ("unwind", "libunwind", 3), + ("user", "useradd", 8), + ("user", "userdel", 8), + ("mem", "free", 3), + ("mem", "free", 1), + ] + + for (keyword, page, section) in expected: + matches = ${machine}.succeed(f"man -k {keyword}") + if not match_man_k(page, section, matches): + raise Exception(f"{page}({section}) missing in matches: {matches}") + '') machineNames; +}) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index f1739cbd50dd..d495c912f599 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages, nixosTests }: stdenv.mkDerivation rec { pname = "man-db"; @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; + passthru.tests = { + nixos = nixosTests.man; + }; + meta = with lib; { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 1771f6515bc4..2d974b8af63d 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, perl }: +{ lib, stdenv, fetchurl, zlib, perl, nixosTests }: let # check if we can execute binaries for the host platform on the build platform @@ -62,6 +62,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; preCheck = "patchShebangs --build regress/regress.pl"; + passthru.tests = { + nixos = nixosTests.man; + }; + meta = with lib; { homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; From 4942248a40e97272eff533f653b0aadc869d1252 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 2 Oct 2021 15:26:54 +0200 Subject: [PATCH 34/38] nixos/man-db: add package option --- nixos/modules/misc/man-db.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix index 94898504b3f7..8bd329bc4e0c 100644 --- a/nixos/modules/misc/man-db.nix +++ b/nixos/modules/misc/man-db.nix @@ -31,6 +31,16 @@ in Advanced users can make this a content-addressed derivation to save a few rebuilds. ''; }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.man-db; + defaultText = lib.literalExpression "pkgs.man-db"; + description = '' + The man-db derivation to use. Useful to override + configuration options used for the package. + ''; + }; }; }; @@ -39,12 +49,12 @@ in ]; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.man-db ]; + environment.systemPackages = [ cfg.package ]; environment.etc."man_db.conf".text = let manualCache = pkgs.runCommandLocal "man-cache" { } '' echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf - ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1 + ${cfg.package}/bin/mandb -C man.conf -psc >/dev/null 2>&1 ''; in '' From adfbfc0397887e668d8f91c45be013c044c53870 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 2 Oct 2021 15:28:48 +0200 Subject: [PATCH 35/38] nixos/mandoc: add package option --- nixos/modules/misc/mandoc.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/mandoc.nix b/nixos/modules/misc/mandoc.nix index 939f87a31784..3da60f2f8e65 100644 --- a/nixos/modules/misc/mandoc.nix +++ b/nixos/modules/misc/mandoc.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - makewhatis = "${lib.getBin pkgs.mandoc}/bin/makewhatis"; + makewhatis = "${lib.getBin cfg.package}/bin/makewhatis"; cfg = config.documentation.man.mandoc; @@ -26,12 +26,22 @@ in { The first value given takes priority. ''; }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.mandoc; + defaultText = lib.literalExpression "pkgs.mandoc"; + description = '' + The mandoc derivation to use. Useful to override + configuration options used for the package. + ''; + }; }; }; config = lib.mkIf cfg.enable { environment = { - systemPackages = [ pkgs.mandoc ]; + systemPackages = [ cfg.package ]; # tell mandoc about man pages etc."man.conf".text = lib.concatMapStrings (path: '' From 710699449ab1172074862f5b08e77819acfb9765 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Nov 2021 23:25:22 +0100 Subject: [PATCH 36/38] nixos/doc: document documentation.man changes in 22.05 rel notes --- .../from_md/release-notes/rl-2205.section.xml | 14 ++++++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 16 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 517a2e458aae..82965ff18754 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -169,6 +169,20 @@ ~100MB for python itself). + + + documentation.man has been refactored to + support choosing a man implementation other than GNU’s + man-db. For this, + documentation.man.manualPages has been + renamed to + documentation.man.man-db.manualPages. If + you want to use the new alternative man implementation + mandoc, add + documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; } + to your configuration. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index cfe1130068c7..be9b57d1afea 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -62,6 +62,8 @@ In addition to numerous new and upgraded packages, this release has the followin This has the added benefit to reduce the closure size of `ipython` from ~400MB to ~160MB (including ~100MB for python itself). +- `documentation.man` has been refactored to support choosing a man implementation other than GNU's `man-db`. For this, `documentation.man.manualPages` has been renamed to `documentation.man.man-db.manualPages`. If you want to use the new alternative man implementation `mandoc`, add `documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; }` to your configuration. + ## Other Notable Changes {#sec-release-22.05-notable-changes} - The option [services.redis.servers](#opt-services.redis.servers) was added From fe92c39ced30676adf018302212057f044b8d77a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Dec 2021 16:25:49 +1000 Subject: [PATCH 37/38] terraform-providers: updates --- .../terraform-providers/providers.json | 153 +++++++++--------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 67daa13fade2..2dda8cee9ff3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -10,38 +10,38 @@ "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.7.0", - "sha256": "0dyzsfazhxjjfkykykz823n0fk2fbl53nwxpv7wvl1zzmg72lk37", - "vendorSha256": "1sw83jxa3kjjqrjv3z1hczlszskc7lk0i4lrnvdnxa6s642i7brl", - "version": "2.7.0" + "rev": "v2.7.1", + "sha256": "0gnq8jm31v0q2a4v310cjrrdc7y17c9vi326c6x9cs3lgjvn27m2", + "vendorSha256": "1wssw8x8zlrgx51ij0ghhwsbyzfl2r1qy4aqv03v705xipil8yn3", + "version": "2.7.1" }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.3.2", - "sha256": "14ivvb1ql06gxfi6ffg1kg9k9xadds6fgzj9wp2hh3an2rf7v9ym", - "vendorSha256": "0akqbhjz309znzjqm633nk2zbf925l6027n88bb7mgbv1zjxqw9j", - "version": "2.3.2" + "rev": "v2.4.0", + "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i", + "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v", + "version": "2.4.0" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.8.0", - "sha256": "0jpw16bap4q75dzchimfqgqqkkn3ckw19q9rjfb8zbkvini5ybw1", - "vendorSha256": "sha256-03Q0/YrivaG2fMgIjW6mxWOIdFZ7FKYB8C6DZIGr+/w=", - "version": "1.8.0" + "rev": "v1.9.1", + "sha256": "17a3ml4h1b1480z9dzppig20jx9mgldnmpz8cn2x8qgzbpiqz3hs", + "vendorSha256": "0l50hy4cy360g6adbhhbl4x8hagma9zfb3yyzk6vbslal9m4kd6j", + "version": "1.9.1" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.144.0", - "sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd", - "vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y", - "version": "1.144.0" + "rev": "v1.149.0", + "sha256": "0v9jhpvz33hzq09i8bxp1dif9jdypb5g2xy3d2g1mw4lgqrdpjix", + "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", + "version": "1.149.0" }, "archive": { "owner": "hashicorp", @@ -84,28 +84,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.66.0", - "sha256": "1s9bdpadg34wbr0qgiafn86xnaryfdfa5vdbvz6i24dps082gv6y", - "vendorSha256": "1cycfd3vc9980ijfwldgyvx3v003khrcm3qg18928s7k16xaql0b", - "version": "3.66.0" + "rev": "v3.70.0", + "sha256": "0133f1ngwa7x8w9zicfwmkj14rav9cvwk7qf7hdz0cfmyl4pj4x2", + "vendorSha256": "03k8xijzfawbdzc1wavw9k2z2zyffi1ysnqls412nzdyvxyl8xw4", + "version": "3.70.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.10.0", - "sha256": "1q70kighdgsq1jwwfhcjx6458242lvkczlzjl0mf5j5y7k5g3m42", + "rev": "v2.13.0", + "sha256": "13337m20yxamdjpiw4kfi2ik4i5ivvr1fryygixpsj34lr21zxgk", "vendorSha256": null, - "version": "2.10.0" + "version": "2.13.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.86.0", - "sha256": "0p508qvqh0bg3x80i62i4p3q4nzgq0il651vrcg4c13lwynk2wcn", + "rev": "v2.90.0", + "sha256": "04bll0ygjgrqq18va97xi42p55fvlbgdc24m2i9amjhjbly5m7wn", "vendorSha256": null, - "version": "2.86.0" + "version": "2.90.0" }, "azurestack": { "owner": "hashicorp", @@ -183,10 +183,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.4.0", - "sha256": "1w37wkpb785jfqq91piclcsrhy3idpbmwb90n5y7rkgmm37ij7ij", - "vendorSha256": "004pb5xnvisq3j113i6qfvnh1j06nkpkgzav3wb08k0bl19b6jks", - "version": "3.4.0" + "rev": "v3.6.0", + "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d", + "vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87", + "version": "3.6.0" }, "cloudinit": { "owner": "hashicorp", @@ -254,19 +254,19 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.6.0", - "sha256": "00j40m720m2kh0pn4953n8zis78g02ah9yjkcavcjkpxy4p899ma", - "vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "0fynbn0zbplslbvqz0jij4gm8q6ydg697x7nh5rzw89dy26l2f8g", + "vendorSha256": "0ngvbc9h3csl811g40q707flf4dl1hal95hpkxsvz7p71s3371q8", + "version": "3.7.0" }, "dhall": { "owner": "awakesecurity", "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", - "rev": "v0.0.1", - "sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa", - "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", - "version": "0.0.1" + "rev": "v0.0.2", + "sha256": "1fw83ic5wwhl5yk1asy8p4cxsdwclw639j7ki1xgpi284h6gmh5a", + "vendorSha256": "1wqbblqpb1lpbsn4k9yh43g19iw13q825l5i9wvy4w0w4nzz70p4", + "version": "0.0.2" }, "digitalocean": { "owner": "digitalocean", @@ -341,19 +341,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", - "rev": "v2.1.0", - "sha256": "0xc3mj0d4yrr1952c5ywrx19ny1k2475grka9v2w7szdy6p2rkk5", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.1.1", + "sha256": "1f92cg2fjwy2n5380fx9j6j2bnsnkcy18kq0bjbkwkh8kmshqjn8", + "vendorSha256": "031knr4axrcwisbhzs39faykzc1jgm9hx4rhqk46wim950gifl7g", + "version": "2.1.1" }, "fastly": { "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.38.0", - "sha256": "1pfwpx83f5v12r9h2a89z8xvqpmwzsadzxx6wh0d1csdkdrr9z1n", + "rev": "v0.39.0", + "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8", "vendorSha256": null, - "version": "0.38.0" + "version": "0.39.0" }, "flexibleengine": { "owner": "terraform-providers", @@ -416,10 +416,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.14.0", - "sha256": "1d8w2a86m1q79f41ypgwg4i4w5269br1yvh437xiypvabajn7yjl", - "vendorSha256": "0gk0hk4f060hbl89ay1r91ayp5mwnc236x5jxvw4sgi2cq7mmns2", - "version": "1.14.0" + "rev": "v1.17.0", + "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd", + "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw", + "version": "1.17.0" }, "gridscale": { "owner": "terraform-providers", @@ -487,10 +487,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.36.0", - "sha256": "09lhxh1cmg1k939gaksaqx11j06f971s1091wk03vivgfzrjy3hn", - "vendorSha256": "sha256-IjCLN/7EKenJbbHfBnRJh1LT3Ym/R2yEu+7zCnJ8Giw=", - "version": "1.36.0" + "rev": "v1.37.1", + "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc", + "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji", + "version": "1.37.1" }, "icinga2": { "owner": "terraform-providers", @@ -648,10 +648,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.0", - "sha256": "07qdgxvdk564psb4v5d8saaak2037y04b3cj2p09m18fbam8cpry", + "rev": "v3.2.1", + "sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw", "vendorSha256": null, - "version": "3.2.0" + "version": "3.2.1" }, "metalcloud": { "owner": "terraform-providers", @@ -747,10 +747,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.53.0", - "sha256": "0vbi8k6mvcwvmjrs7walw1gfam77simvcr89gmh84jagvz0mngbw", + "rev": "v4.57.0", + "sha256": "123k24pa5232j9yxhgn6ng36s46y3iv4xsqay9ry53g4pw6zcx9y", "vendorSha256": null, - "version": "4.53.0" + "version": "4.57.0" }, "okta": { "owner": "terraform-providers", @@ -791,10 +791,10 @@ "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.45.0", - "sha256": "0r769ckswcz6q3qmdxkvhqkq77x9qlv3359lvaplmkilk7zhpvcj", - "vendorSha256": "1wcls4kc19wy2nkwzrc1zc2lrlazfqr6dmfvzv9andldvd8swspg", - "version": "1.45.0" + "rev": "v1.46.0", + "sha256": "1kkqfr0i33kw0qj3dp5knxm14p1ndy72n4chd36dhkydp4rm688f", + "vendorSha256": "1f77z6p8423gh8x7zbhn3pkd8a1nxd5pabc1043d66pbw9rxchax", + "version": "1.46.0" }, "opentelekomcloud": { "owner": "terraform-providers", @@ -902,12 +902,12 @@ }, "rancher2": { "owner": "rancher", - "provider-source-address": "registry.terraform.io/hashicorp/rancher2", + "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.13.0", - "sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89", - "vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c", - "version": "1.13.0" + "rev": "v1.22.1", + "sha256": "0sx24riks78ywxsrhvc18w3wppz676zv1bjmzvm7r4q94miplxgl", + "vendorSha256": "0qdd1sl9r6rpp9jmxy3r5a064f8agjmlkrn241p4sd7j5cncxdk3", + "version": "1.22.1" }, "random": { "owner": "hashicorp", @@ -947,11 +947,13 @@ "version": "1.15.0" }, "secret": { - "owner": "tweag", + "owner": "numtide", + "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", - "rev": "v1.1.1", - "sha256": "1pr0amzgv1i1lxniqlx8spdb73q522l7pm8a4m25hwy1kwby37sd", - "version": "1.1.1" + "rev": "v1.2.0", + "sha256": "1211vvcd00llajza3chw25h0sl43wl116ni4r251k00m6kb5nfwq", + "vendorSha256": null, + "version": "1.2.0" }, "segment": { "owner": "ajbosco", @@ -1010,9 +1012,10 @@ "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", - "rev": "v0.5.1", - "sha256": "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh", - "version": "0.5.1" + "rev": "v0.6.3", + "sha256": "1db67jcgpg279hq4vfk1xhql0msn9fy95m8fdi1cxv54y7zcxwf9", + "vendorSha256": "1haw17k6xg3n6hbx3pj8ysyhq35k3lis1qq65qnyskl62y1ia54h", + "version": "0.6.3" }, "spotinst": { "owner": "terraform-providers", From 7f3d3af98d61749f0e2f87c60947cc84b077e006 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 31 Dec 2021 11:46:14 +0100 Subject: [PATCH 38/38] chromiumBeta: 97.0.4692.56 -> 97.0.4692.71 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1ca7fcff31b7..2f070c5e3f60 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "97.0.4692.56", - "sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf", - "sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g", + "version": "97.0.4692.71", + "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca", + "sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc", "deps": { "gn": { "version": "2021-11-03",