From 62ddc304f8b463aac02f9a72ab46959a1ea0dcb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 04:25:03 +0000 Subject: [PATCH 01/39] opendht: 2.4.12 -> 2.5.5 --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index c016b7635aa1..64cf84e36c3f 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.12"; + version = "2.5.5"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo="; + sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; }; nativeBuildInputs = [ From 009757a868e3aac087d79d91fc19b59f9f2df047 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Thu, 6 Jul 2023 09:45:54 +0200 Subject: [PATCH 02/39] bookstack: 23.01.1 -> 23.06.1 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 502 ++++++++++-------- 2 files changed, 283 insertions(+), 223 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index e96528d7cd6a..8a48ec4fc7a5 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 = "23.01.1"; + version = "23.06.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S4yGys1Lc2FAd3RKI4KdE9X12rsQyVcPQ+Biwwrnb0I="; + sha256 = "0947rnapk7xv10a12fzymjlvj8j7drjlqjm61fckshif9c1q5r6j"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index f07b07c3a3ec..6679fb16127e 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,20 +5,20 @@ let "aws/aws-crt-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; + name = "aws-aws-crt-php-1926277fc71d253dfa820271ac5987bdb193ccf5"; src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; - sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5"; + sha256 = "037rdpys895vmk80zgb6r2c77ss2l545qsfma7q55kx9jm39habl"; }; }; }; "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-c600a07da531d6c29af791b9d2e8b6df796aa14b"; + name = "aws-aws-sdk-php-6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/c600a07da531d6c29af791b9d2e8b6df796aa14b"; - sha256 = "03iisnif804dkgnynn24y6ji1hnq95ryv8vwgwi6398apcz6vypn"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78"; + sha256 = "178k6mcjg6qlvzn4mkw1qykn5bs3921xhh554z45nqd5f9fclwxb"; }; }; }; @@ -35,40 +35,50 @@ let "barryvdh/laravel-dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; + name = "barryvdh-laravel-dompdf-9843d2be423670fb434f4c978b3c0f4dd92c87a6"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; - sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/9843d2be423670fb434f4c978b3c0f4dd92c87a6"; + sha256 = "1b7j7rnba50ibsnjzxz3bcnpcii51qrin5p0ivi0bzm57xhvns9s"; }; }; }; "barryvdh/laravel-snappy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-snappy-2c18a3602981bc6f25b32908cf8aaa05952ab2f7"; + name = "barryvdh-laravel-snappy-940eec2d99b89cbc9bea2f493cf068382962a485"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/2c18a3602981bc6f25b32908cf8aaa05952ab2f7"; - sha256 = "1h3s9g9n1rk3iji0p9m3g21gakjxnp4ciqwd5cdbj0wnh9k7gi2h"; + url = "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/940eec2d99b89cbc9bea2f493cf068382962a485"; + sha256 = "0i168sq1sah83xw3xfrilnpja789q79zvhjfgfcszd10g7y444gc"; }; }; }; "brick/math" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "brick-math-ca57d18f028f84f777b2168cd1911b0dee2343ae"; + name = "brick-math-0ad82ce168c82ba30d1c01ec86116ab52f589478"; src = fetchurl { - url = "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae"; - sha256 = "1nr1grrb9g5g3ihx94yk0amp8zx8prkkvg2934ygfc3rrv03cq9w"; + url = "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478"; + sha256 = "04kqy1hqvp4634njjjmhrc2g828d69sk6q3c55bpqnnmsqf154yb"; }; }; }; "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; + name = "dasprid-enum-8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"; src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; - sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"; + sha256 = "0cckq42c9iyjfv7xmy6rl4xj3dn80v9k8qzc3ppdjm4wgj43rrkz"; + }; + }; + }; + "dflydev/dot-access-data" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "dflydev-dot-access-data-f41715465d65213d644d3141a6a93081be5d3549"; + src = fetchurl { + url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549"; + sha256 = "1vgbjrq8qh06r26y5nlxfin4989r3h7dib1jifb2l3cjdn1r5bmj"; }; }; }; @@ -85,20 +95,20 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; + name = "doctrine-dbal-19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; - sha256 = "1xz7yyq0r8378zb4jrac13z0762pid0dxxnaj0rx82f7vwbxaqas"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"; + sha256 = "0mz606j1ndng7cakmra4f6rs6ij1wbznkax4nyxd76ikn65isdqg"; }; }; }; "doctrine/deprecations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; + name = "doctrine-deprecations-612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; - sha256 = "1sk1f020n0w7p7r4rsi7wnww85vljrim1i5h9wb0qiz2c4l8jj09"; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"; + sha256 = "078w4k0xdywyb44caz5grbcbxsi87iy13g7a270rs9g5f0p245fi"; }; }; }; @@ -115,30 +125,30 @@ let "doctrine/inflector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-inflector-d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"; + name = "doctrine-inflector-f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"; - sha256 = "1z6y0mxqadarw76whppcl0h0cj7p5n6k7mxihggavq46i2wf7nhj"; + url = "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; + sha256 = "1kdq3sbwrzwprxr36cdw9m1zlwn15c0nz6i7mw0sq9mhnd2sgbrb"; }; }; }; "doctrine/lexer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-lexer-c268e882d4dbdd85e36e4ad69e02dc284f89d229"; + name = "doctrine-lexer-39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229"; - sha256 = "12g069nljl3alyk15884nd1jc4mxk87isqsmfj7x6j2vxvk9qchs"; + url = "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; + sha256 = "19kak8fh8sf5bpmcn7a90sqikgx30mk2bmjf0jbzcvlbnsjyggah"; }; }; }; "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-c5310df0e22c758c85ea5288175fc6cd777bc085"; + name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085"; - sha256 = "1h9y3v02qdijc6hmi7p8x626jlhkjd2pcck9mkcmm5sz9xzqhdwb"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; + sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3"; }; }; }; @@ -155,60 +165,70 @@ let "egulias/email-validator" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; + name = "egulias-email-validator-e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"; src = fetchurl { - url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; - sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; + url = "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"; + sha256 = "16s7k5ck8bzk83xfy46fikjyj4jywalriqba8jvd5ngd177s2mw5"; }; }; }; - "filp/whoops" = { + "fruitcake/php-cors" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-f7948baaa0330277c729714910336383286305da"; + name = "fruitcake-php-cors-58571acbaa5f9f462c9c77e911700ac66f446d4e"; src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da"; - sha256 = "1l70lq27h072ria2pgmf9dp3h5awszirqd1khlcknl4w1hww3swv"; + url = "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e"; + sha256 = "18xm69q4dk9zqfwgp938y2byhlyy9lr5x5qln4k2mg8cq8xr2sm1"; }; }; }; "graham-campbell/result-type" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-a878d45c1914464426dc94da61c9e1d36ae262a8"; + name = "graham-campbell-result-type-672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8"; - sha256 = "1xayas92b467yixpc79l7ydgspy3s76cpfddv7lrvd691y11g1vb"; + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"; + sha256 = "156zbfs19r9g543phlpjwhqin3k2x4dsvr5p0wk7rk4j0wwp8l2v"; }; }; }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-b50a2a1251152e43f6a37f0fa053e730a67d25ba"; + name = "guzzlehttp-guzzle-fb7566caccf22d74d1ab270de3551f72a58399f5"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba"; - sha256 = "0cy828r0kafx58jh0k1cy17y77qh248d9kfk9ncn9pyq2q5v9p9p"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5"; + sha256 = "0cmpq50s5xi9sg1dygllrhwj5dz5bxxj83xkvjspz63751xr51cs"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-b94b2807d85443f9719887892882d0329d1e2598"; + name = "guzzlehttp-promises-67ab6e18aaa14d753cc148911d273f6e6cb6721e"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598"; - sha256 = "1vvac7y5ax955qjg7dyjmaw3vab9v2lypjygap0040rv3z4x9vz8"; + url = "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e"; + sha256 = "0y3md6lkpk60kvmi607mgj29cfjg2bljc5nhfh3qf9hzk6c1b2j6"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-67c26b443f348a51926030c83481b85718457d3d"; + name = "guzzlehttp-psr7-b635f279edd83fc275f822a1188157ffea568ff6"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d"; - sha256 = "09avh5xzmzwfpa5xv9zw90ypyfrhpyhszbli395prgh3llnrx9wg"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6"; + sha256 = "0734h3r8db06hcffagr8s7bxhjkvlfzvqg1klwmqidflwdwk7yj1"; + }; + }; + }; + "guzzlehttp/uri-template" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "guzzlehttp-uri-template-b945d74a55a25a949158444f09ec0d3c120d69e2"; + src = fetchurl { + url = "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2"; + sha256 = "02vd4r2di8xh9n5awfjy1lyb7vn5gkaynbiiqilm8did0r89qdhf"; }; }; }; @@ -225,80 +245,100 @@ let "knplabs/knp-snappy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "knplabs-knp-snappy-5126fb5b335ec929a226314d40cd8dad497c3d67"; + name = "knplabs-knp-snappy-b66f79334421c26d9c244427963fa2d92980b5d3"; src = fetchurl { - url = "https://api.github.com/repos/KnpLabs/snappy/zipball/5126fb5b335ec929a226314d40cd8dad497c3d67"; - sha256 = "1j5bdj3sbww43nfgk7pasmyciwqdi92vj6pykw8f2xaq9c3i75p9"; + url = "https://api.github.com/repos/KnpLabs/snappy/zipball/b66f79334421c26d9c244427963fa2d92980b5d3"; + sha256 = "164zx6pr06maad8rsf2rq2p576pcx62khzpz808v3dpm4yadlh88"; }; }; }; "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; + name = "laravel-framework-858add225ce88a76c43aec0e7866288321ee0ee9"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; - sha256 = "1k7afj4himxmhv02lmq8dc992m2vdkw8hcjyfcnff99cv555z9ph"; + url = "https://api.github.com/repos/laravel/framework/zipball/858add225ce88a76c43aec0e7866288321ee0ee9"; + sha256 = "0af52p51g1jgjx7jxw02nyfciz6a3jlc0lpxbfvl4c4dvbdkbwn2"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-47afb7fae28ed29057fdca37e16a84f90cc62fae"; + name = "laravel-serializable-closure-f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae"; - sha256 = "1mfj1jszq1mssxfh68y3s43sq90bpj25a2kpj0djbmcrccgwd46z"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"; + sha256 = "0dyvqph5q1lb6gl6ga4b1xkziqzj6s2ia5pbd7h40anm4sh3z8dl"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-dae03ca4ecfe3badafcdfb81965d2279080051f4"; + name = "laravel-socialite-00ea7f8630673ea49304fc8a9fca5a64eb838c7e"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/dae03ca4ecfe3badafcdfb81965d2279080051f4"; - sha256 = "1cv67knibrhyfbimgbnig4hrnq2rjyi7kqmsqyqs7il2nizl51vm"; + url = "https://api.github.com/repos/laravel/socialite/zipball/00ea7f8630673ea49304fc8a9fca5a64eb838c7e"; + sha256 = "0ryw1hwngxqdsi5cvsj69zfqg1ql92z4wmi7bb1wj75x7dn1v76f"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-74d0b287cc4ae65d15c368dd697aae71d62a73ad"; + name = "laravel-tinker-04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad"; - sha256 = "1rhppd4zzz47abjahid8hdhwrzjrnbwkcy0cqqws5dia4x81k7xb"; + url = "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"; + sha256 = "06rivrmcf8m8hm4vn9s7wwpfmgl89p73b78dm0qx26rs0lpr36p0"; }; }; }; "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-2b8185c13bc9578367a5bf901881d1c1b5bbd09b"; + name = "league-commonmark-d44a24690f16b8c1808bf13b1bd54ae4c63ea048"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b"; - sha256 = "14hp7vmqag9jh89rcq1mi3hyw01rkmypdbw2p3zsnjq2p8wwh4r5"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048"; + sha256 = "1qx99m1qa2g3l6r2fim3rak6qh28zjj8sqjj86nq743dm3yszygw"; + }; + }; + }; + "league/config" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-config-754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"; + sha256 = "0yjb85cd0qa0mra995863dij2hmcwk9x124vs8lrwiylb0l3mn8s"; }; }; }; "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-3239285c825c152bcc315fe0e87d6b55f5972ed1"; + name = "league-flysystem-a141d430414fcb8bf797a18716b09f759a385bed"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1"; - sha256 = "0p1cirl7j9b3gvbp264d08abfnrki89jr7rx0cbw0bjw1apf4spz"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed"; + sha256 = "0w476nkv4izdrh8dn4g58lrqnfwrp8ijhj6fj8d8cpvr81kq0wiv"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; + name = "league-flysystem-aws-s3-v3-d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; - sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; + sha256 = "0hr11wwn2c2f26w0kj5yanx17ln17plk0si8yajkd470z3ssprwj"; + }; + }; + }; + "league/flysystem-local" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-flysystem-local-543f64c397fefdf9cfeac443ffb6beff602796b3"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3"; + sha256 = "1f44jgjip7pgnjafwlazmbv9jap3xsw3jfzhgakbsa4bkx3aavr2"; }; }; }; @@ -335,30 +375,30 @@ let "league/oauth2-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-oauth2-client-2334c249907190c132364f5dae0287ab8666aa19"; + name = "league-oauth2-client-160d6274b03562ebeb55ed18399281d8118b76c8"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth2-client/zipball/2334c249907190c132364f5dae0287ab8666aa19"; - sha256 = "12a3mpv3x5jy1nnpzx25z80chzhjxk8sgvn5x02pzk5dlw8kbzhz"; + url = "https://api.github.com/repos/thephpleague/oauth2-client/zipball/160d6274b03562ebeb55ed18399281d8118b76c8"; + sha256 = "1vyd8c64armlaf9zmpjx2gy0nvv4mhzy5qk9k26k75wa9ffh482s"; }; }; }; "masterminds/html5" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947"; + name = "masterminds-html5-3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3"; src = fetchurl { - url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947"; - sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k"; + url = "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3"; + sha256 = "19gkv95lzsqwwxlvhi4pk7a2nvl29jdga9mrh43387z9nakzddp4"; }; }; }; "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-720488632c590286b88b80e62aa3d3d551ad4a50"; + name = "monolog-monolog-f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50"; - sha256 = "0wg1y0mghhib6cp9gcavbs6ajfs9rgxc2ssipqb5yfwfkkbwrif6"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; + sha256 = "0lz7lgr1bcxsh4c63z8k26bxawkx14h689wgdiap8992rf97kbk2"; }; }; }; @@ -375,20 +415,50 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-09acf64155c16dc6f580f36569ae89344e9734a3"; + name = "nesbot-carbon-4f991ed2a403c85efbc4f23eb4030063fdbe01da"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3"; - sha256 = "1m4sb4vnimg3238g0mivnxgfmf3lwkb3v2njmird20jrh48k4c69"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da"; + sha256 = "09k9ljqwn6qsr5z7wp2yv8p0vqr4hn03lyxvm76xm2g6wb6l43gp"; + }; + }; + }; + "nette/schema" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nette-schema-abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"; + src = fetchurl { + url = "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"; + sha256 = "16i8gim0jpmmbq0pp4faw8kn2448yvpgsd1zvipbv9xrk37vah5q"; + }; + }; + }; + "nette/utils" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nette-utils-cacdbf5a91a657ede665c541eda28941d4b09c1e"; + src = fetchurl { + url = "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e"; + sha256 = "0v3as5xdmr9j7d4q4ly18f7g8g0sjcy25l4ispsdp60byldi7m8h"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-570e980a201d8ed0236b0a62ddf2c9cbb2034039"; + name = "nikic-php-parser-19526a33fb561ef417e822e85f08a00db4059c17"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039"; - sha256 = "1q3hnpjya4rsxfh72ccs2vj3gz8h0sn12290w8wvkz9pvi0qmmmr"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17"; + sha256 = "13rmjg186nz0w63hjbwbs55nxb999msjin268s9h56w8zc5ki0sy"; + }; + }; + }; + "nunomaduro/termwind" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nunomaduro-termwind-8ab0b32c8caa4a2e09700ea32925441385e4a5dc"; + src = fetchurl { + url = "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc"; + sha256 = "1g75vpq7014s5yd6bvj78b88ia31slkikdhjv8iprz987qm5dnl7"; }; }; }; @@ -402,16 +472,6 @@ let }; }; }; - "opis/closure" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "opis-closure-3d81e4309d2a927abbe66df935f4bb60082805ad"; - src = fetchurl { - url = "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad"; - sha256 = "0hqs6rdkkcggswrgjlispkby2yg4hwn63bl2ma62lnmpfbpwn0sd"; - }; - }; - }; "paragonie/constant_time_encoding" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -455,20 +515,20 @@ let "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"; + name = "phpoption-phpoption-dd3a383e599f49777d8b628dadbb90cae435b87e"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"; - sha256 = "12i9gc2q75iv6c0x87zj3j499pl8k0wzh3yzvgrhg97nhbdhab5c"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e"; + sha256 = "029gpfa66hwg395jvf7swcvrj085wsw5fw6041nrl5kbc36fvwlb"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-f28693d38ba21bb0d9f0c411ee5dae2b178201da"; + name = "phpseclib-phpseclib-543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da"; - sha256 = "11hvq1mwk2zn1fgrwvifh5z4md178vzka5nfykj8l28vk7r0vb98"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67"; + sha256 = "108bb1lz9c1nxq8f1rkzi75h3xwa9lpvnayg7pph92x18g98ks9l"; }; }; }; @@ -485,30 +545,30 @@ let "predis/predis" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "predis-predis-a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"; + name = "predis-predis-33b70b971a32b0d28b4f748b0547593dce316e0d"; src = fetchurl { - url = "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"; - sha256 = "109j0chyqmr0rzfn25843yacfnm438z94rpxlx1hvhcigfspjhvf"; + url = "https://api.github.com/repos/predis/predis/zipball/33b70b971a32b0d28b4f748b0547593dce316e0d"; + sha256 = "0qlz42vsqzqnwg0cmdgxgb35k6gab5vs53dg87qsihi0n3rfj9ar"; }; }; }; "psr/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; + name = "psr-cache-aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; - sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; + url = "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"; + sha256 = "07rnyjwb445sfj30v5ny3gfsgc1m7j7cyvwjgs2cm9slns1k1ml8"; }; }; }; "psr/container" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-container-513e0666f7216c7459170d56df27dfcefe1689ea"; + name = "psr-container-c71ecc56dfe541dbd90c5360474fbc405f8d5963"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea"; - sha256 = "00yvj3b5ls2l1d0sk38g065raw837rw65dx1sicggjnkr85vmfzz"; + url = "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963"; + sha256 = "1mvan38yb65hwk68hl0p7jymwzr4zfnaxmwjbw7nj3rsknvga49i"; }; }; }; @@ -525,60 +585,60 @@ let "psr/http-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; + name = "psr-http-client-0955afe48220520692d2d09f7ab7e0f93ffd6a31"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; + url = "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31"; + sha256 = "09r970lfpwil861gzm47446ck1s6km6ijibkxl13p1ymwdchnv6m"; }; }; }; "psr/http-factory" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; + name = "psr-http-factory-e616d01114759c4c489f93b099585439f795fe35"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; + url = "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35"; + sha256 = "1vzimn3h01lfz0jx0lh3cy9whr3kdh103m1fw07qric4pnnz5kx8"; }; }; }; "psr/http-message" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; + name = "psr-http-message-402d35bcb92c70c026d1a6a9883f06b2ead23d71"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; - sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; + url = "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71"; + sha256 = "13cnlzrh344n00sgkrp5cgbkr8dznd99c3jfnpl0wg1fdv1x4qfm"; }; }; }; "psr/log" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; + name = "psr-log-fe5ea303b0887d5caefd3d431c3e61ad47037001"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; - sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; + url = "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001"; + sha256 = "0a0rwg38vdkmal3nwsgx58z06qkfl85w2yvhbgwg45anr0b3bhmv"; }; }; }; "psr/simple-cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; + name = "psr-simple-cache-764e0b3939f5ca87cb904f570ef9be2d78a07865"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; - sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; + url = "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865"; + sha256 = "0hgcanvd9gqwkaaaq41lh8fsfdraxmp2n611lvqv69jwm1iy76g8"; }; }; }; "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-e9eadffbed9c9deb5426fd107faae0452bf20a36"; + name = "psy-psysh-4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36"; - sha256 = "0yaj5ixg8zb6hh9swpcc29dcrpffjn4cxp61qz2zqbizvq2d6z0z"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"; + sha256 = "10754cxjwjf818g7i3vyd4jk0sy8r3i36jxpqk38n70ckasdd7w0"; }; }; }; @@ -605,10 +665,10 @@ let "ramsey/uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-uuid-fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; + name = "ramsey-uuid-60a4c63ab724854332900504274f6150ff26d286"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; - sha256 = "1fhjsyidsj95x5dd42z3hi5qhzii0hhhxa7xvc5jj7spqjdbqln4"; + url = "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286"; + sha256 = "1w1i50pbd18awmvzqjkbszw79dl09912ibn95qm8lxr4nsjvbb27"; }; }; }; @@ -635,10 +695,10 @@ let "socialiteproviders/discord" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574"; + name = "socialiteproviders-discord-11f6a8ded5b1948723886f2e5413b91139fcce6b"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574"; - sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc"; + url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/11f6a8ded5b1948723886f2e5413b91139fcce6b"; + sha256 = "1jc64flz7djp8i87fp3xi6q80m6bp069gbq1mh44g82qnky4jp1h"; }; }; }; @@ -655,10 +715,10 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-738276dfbc2b68a9145db7b3df1588d53db528a1"; + name = "socialiteproviders-manager-47402cbc5b7ef445317e799bf12fd5a12062206c"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/738276dfbc2b68a9145db7b3df1588d53db528a1"; - sha256 = "0d7ayh72cdxkslmgdgj0d6rkqghyhbdhdhkiz9064virm7fa5ii0"; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/47402cbc5b7ef445317e799bf12fd5a12062206c"; + sha256 = "0lmsb1ni27dw1zipd3l24dzm43xggh4dd92iws3r161s4pppf7sc"; }; }; }; @@ -712,113 +772,113 @@ let }; }; }; - "swiftmailer/swiftmailer" = { + "ssddanbrown/symfony-mailer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; + name = "ssddanbrown-symfony-mailer-2219dcdc5f58e4f382ce8f1e6942d16982aa3012"; src = fetchurl { - url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; - sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; + url = "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/2219dcdc5f58e4f382ce8f1e6942d16982aa3012"; + sha256 = "14j99gr09mvgjf6jjxbw50zay8n9mg6c0w429hz3vrfaijc2ih8c"; }; }; }; "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; + name = "symfony-console-c3ebc83d031b71c39da318ca8b7a07ecc67507ed"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; - sha256 = "1r8a7hra81wfs10m235qhq9xdgini4gx9hf86l1ijbp7k6aszk7b"; + url = "https://api.github.com/repos/symfony/console/zipball/c3ebc83d031b71c39da318ca8b7a07ecc67507ed"; + sha256 = "1vvdw2fg08x9788m50isspi06n0lhw6c6nif3di1snxfq0sgb1np"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; + name = "symfony-css-selector-f1d00bddb83a4cb2138564b2150001cb6ce272b1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; - sha256 = "1nracybpl4i2w6vcfhymd0p7bj9cnk5s2frp6dah4anfhmdjk16a"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/f1d00bddb83a4cb2138564b2150001cb6ce272b1"; + sha256 = "0nl94wjr5sm4yrx9y0vwk4dzh1hm17f1n3d71hmj7biyzds0474i"; }; }; }; "symfony/deprecation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-deprecation-contracts-e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; + name = "symfony-deprecation-contracts-26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; - sha256 = "09k869asjb7cd3xh8i5ps824k5y6v510sbpzfalndwy3knig9fig"; + url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"; + sha256 = "1wlaj9ngbyjmgr92gjyf7lsmjfswyh8vpbzq5rdzaxjb6bcsj3dp"; }; }; }; "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; + name = "symfony-error-handler-c7df52182f43a68522756ac31a532dd5b1e6db67"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; - sha256 = "0rsp4l6azy715r638xbxp8aydksz8v8r2kaz2590bg7c44v52zf0"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/c7df52182f43a68522756ac31a532dd5b1e6db67"; + sha256 = "1dqr0n3w6zmk96q7x8pz1przkiyb2kyg5mw3d1nmnyry8dryv7c8"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; + name = "symfony-event-dispatcher-2eaf8e63bc5b8cefabd4a800157f0d0c094f677a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; - sha256 = "0mp91rpqbjarbh9jzyqa8cv012ilarwa9yx2rhqvms8bhk0aq7qi"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/2eaf8e63bc5b8cefabd4a800157f0d0c094f677a"; + sha256 = "0wwphxh21n502wgldh3kqqhvl1zxh2yncbadwwh05d8sp5mz0ysn"; }; }; }; "symfony/event-dispatcher-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-contracts-f98b54df6ad059855739db6fcbc2d36995283fe1"; + name = "symfony-event-dispatcher-contracts-7bc61cc2db649b4637d331240c5346dcc7708051"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1"; - sha256 = "114zpsd8vac016a0ppf5ag5lmgllrha7nwln8vvhq9282r79xhsl"; + url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051"; + sha256 = "1crx2j4g5jn904fwk7919ar9zpyfd5bvgm80lmyg15kinsjm3w4i"; }; }; }; "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-40c08632019838dfb3350f18cf5563b8080055fc"; + name = "symfony-finder-5cc9cac6586fc0c28cd173780ca696e419fefa11"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc"; - sha256 = "0gszqsqjgjf05hrycks1sgvizlfx1y6qnwh8cvcih50nmqn2q950"; + url = "https://api.github.com/repos/symfony/finder/zipball/5cc9cac6586fc0c28cd173780ca696e419fefa11"; + sha256 = "1f0sbxczwcrzxb03cc2rshfzdrkjfg7nwkbvvi449qscaq1qx2dc"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-b64a0e2df212d5849e4584cabff0cf09c5d6866a"; + name = "symfony-http-foundation-e16b2676a4b3b1fa12378a20b29c364feda2a8d6"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a"; - sha256 = "01l1349d2pab5vsihripq8718988yz1kh67bpp3j1xvgzd09b5a1"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/e16b2676a4b3b1fa12378a20b29c364feda2a8d6"; + sha256 = "0d2fgzcxi7sq7j8l1lg2kpfsr6p1xk1lxdjyqr63vihm34i8p42g"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-5da6f57a13e5d7d77197443cf55697cdf65f1352"; + name = "symfony-http-kernel-6dc70833fd0ef5e861e17c7854c12d7d86679349"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/5da6f57a13e5d7d77197443cf55697cdf65f1352"; - sha256 = "1y0mqas5v4rhrmsgizv6pqqhxy49hm6wfs1wahaaxcm3zjip1504"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/6dc70833fd0ef5e861e17c7854c12d7d86679349"; + sha256 = "1j1z911g4nsx7wjg14q1g7y98qj1k4crxnwxi97i4cjnyqihcj2r"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-2a83d82efc91c3f03a23c8b47a896df168aa5c63"; + name = "symfony-mime-d7052547a0070cbeadd474e172b527a00d657301"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63"; - sha256 = "1rkg5728y052hq1sag41w46kxnmyfm6jf5bn29canbnx05x32xly"; + url = "https://api.github.com/repos/symfony/mime/zipball/d7052547a0070cbeadd474e172b527a00d657301"; + sha256 = "005jfcpcdn8p2qqv1kyh14jijx36n3rrh9v9a9immfdr0gyv22ca"; }; }; }; @@ -832,16 +892,6 @@ let }; }; }; - "symfony/polyfill-iconv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-927013f3aac555983a5059aada98e1907d842695"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695"; - sha256 = "1qmnzd3r2l35rx84r8ai0596dywsj7q5y3dngaf1vsz16k5ig409"; - }; - }; - }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -892,16 +942,6 @@ let }; }; }; - "symfony/polyfill-php73" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-9e8ecb5f92152187c4799efd3c96b78ccab18ff9"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9"; - sha256 = "1p0jr92x323pl4frjbhmziyk5g1zig1g30i1v1p0wfli2sq8h5mb"; - }; - }; - }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -922,73 +962,93 @@ let }; }; }; + "symfony/polyfill-uuid" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-uuid-f3cf1a645c2734236ed1e2e671e273eeb3586166"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166"; + sha256 = "1pjh861iwlf71frm9f9i7acw4bbiq40gkh96a5wd09nfd2c3w7mc"; + }; + }; + }; "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-6e75fe6874cbc7e4773d049616ab450eff537bf1"; + name = "symfony-process-2114fd60f26a296cc403a7939ab91478475a33d4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1"; - sha256 = "0jzymj7jh9zm376p3ydq6adid9cxd8fmmk2hdnyjk30chsb37yfw"; + url = "https://api.github.com/repos/symfony/process/zipball/2114fd60f26a296cc403a7939ab91478475a33d4"; + sha256 = "1rpcl0qayf0jysfn95c4s73r7fl48sng4m5flxy099z6m6bblwq1"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; + name = "symfony-routing-e56ca9b41c1ec447193474cd86ad7c0b547755ac"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; - sha256 = "1dqnxgkm817msrimhfs9l3d3k4zsjy7zgy2avaq23sm4yvm3nbyw"; + url = "https://api.github.com/repos/symfony/routing/zipball/e56ca9b41c1ec447193474cd86ad7c0b547755ac"; + sha256 = "0qsx525fhqnx6g5rn8lavzpqccrg2ixrp88p1g4yjr8x7i2im5nd"; }; }; }; "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; + name = "symfony-service-contracts-d78d39c1599bd1188b8e26bb341da52c3c6d8a66"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; - sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66"; + sha256 = "1cgbn2yx2fyrc3c1d85vdriiwwifr1sdg868f3rhq9bh78f03z99"; }; }; }; "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-55733a8664b8853b003e70251c58bc8cb2d82a6b"; + name = "symfony-string-d9e72497367c23e08bf94176d2be45b00a9d232a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b"; - sha256 = "0mbagzl3kmrfdkvrb2nddngnzz0cy18r59gipmfsa60n1d7bww4l"; + url = "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a"; + sha256 = "0k4vvcjfdp2dni8gzq4rn8d6n0ivd38sfna70lgsh8vlc8rrlhpf"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-f0ed07675863aa6e3939df8b1bc879450b585cab"; + name = "symfony-translation-9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab"; - sha256 = "0a6y9glxjaiflprlr3fk8qgjdhqmqzjf912pq1qbn0lmc7f0y8pr"; + url = "https://api.github.com/repos/symfony/translation/zipball/9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f"; + sha256 = "12c13k5ljch06g8xp28kkpv0ml67hy086rk25mzd94hjpawrs4x2"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; + name = "symfony-translation-contracts-acbfbb274e730e5a0236f619b6168d9dedb3e282"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; - sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282"; + sha256 = "1r496j63a6q3ch0ax76qa1apmc4iqf41zc8rf6yn8vkir3nzkqr0"; + }; + }; + }; + "symfony/uid" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-uid-6499e28b0ac9f2aa3151e11845bdb5cd21e6bb9d"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/uid/zipball/6499e28b0ac9f2aa3151e11845bdb5cd21e6bb9d"; + sha256 = "12r2jgmwwchmq4apgmb2h1hy6i4cznjpc94976h2qzy3q3yp7zyq"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-ad74890513d07060255df2575703daf971de92c7"; + name = "symfony-var-dumper-eb980457fa6899840fe1687e8627a03a7d8a3d52"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7"; - sha256 = "0i1k6x0rfg17fjbcqgppp0vmhp7y597vik7vs6475v20rmvhdncd"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/eb980457fa6899840fe1687e8627a03a7d8a3d52"; + sha256 = "183igs4i74kljxyq7azpg59wb281mlvy1xgqnb4pkz4dw50jgc2k"; }; }; }; @@ -1015,10 +1075,10 @@ let "voku/portable-ascii" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "voku-portable-ascii-87337c91b9dfacee02452244ee14ab3c43bc485a"; + name = "voku-portable-ascii-b56450eed252f6801410d810c8e1727224ae0743"; src = fetchurl { - url = "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a"; - sha256 = "1j2xpbv7xiwxwb6gfc3h6imc6xcbyb2jw3h8wgfnpvjl5yfbi4xb"; + url = "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743"; + sha256 = "0gwlv1hr6ycrf8ik1pnvlwaac8cpm8sa1nf4d49s8rp4k2y5anyl"; }; }; }; From 8df3683112f97fe11d0b40d2b7cd47914504d897 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 7 Jul 2023 20:45:12 +0800 Subject: [PATCH 03/39] jami: add patch for opendht 2.5 --- .../networking/instant-messengers/jami/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d7b0a675bb52..ee14657bed1c 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , fetchFromGitLab +, fetchpatch , gitUpdater , ffmpeg_5 @@ -106,7 +107,13 @@ stdenv.mkDerivation rec { inherit src version meta; sourceRoot = "source/daemon"; - patches = [ ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch ]; + patches = [ + ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch + (fetchpatch { + url = "https://git.jami.net/savoirfairelinux/jami-daemon/-/commit/315b5fbf546712f22a7b03ca750257bc92263a91.patch"; + hash = "sha256-GNUhFWvYpihAVe1gkVkZARpQmN+Cgv97hRQ4VFiEoKI="; + }) + ]; nativeBuildInputs = [ autoreconfHook From 9dad8416be218ad1f667452b4bd766637054755a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 9 Jul 2023 13:10:19 +0200 Subject: [PATCH 04/39] minetest: use lua5_1 if luajit is not supported --- pkgs/games/minetest/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 0f645ce37967..550f088e8af0 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -14,6 +14,7 @@ , openal , libvorbis , sqlite +, lua5_1 , luajit , freetype , gettext @@ -93,8 +94,9 @@ let nativeBuildInputs = [ cmake doxygen graphviz ninja ]; buildInputs = [ - irrlichtmtInput luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + irrlichtmtInput jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex + ] ++ [ (if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1) ] ++ [ ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ From 0a2b50444ef4ba198650f6d8a8bc7456a8d655b4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Jul 2023 13:28:13 +0200 Subject: [PATCH 05/39] linux_xanmod: 6.1.35 -> 6.1.37 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d5be2d43d2c0..3447882f0924 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.35"; - hash = "sha256-CfrM2CNaGUTfkVteudL8xnAuCdZJxD5pUEC1YW9LiuU="; + version = "6.1.37"; + hash = "sha256-g8cmAhsM03jBu7UZoNOLBX7cGg8rz70/xhF7sJj9nCY="; variant = "lts"; }; From c3354e71d3f46112026715456c64f6e8a92833b3 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Jul 2023 13:28:30 +0200 Subject: [PATCH 06/39] linux_xanmod_latest: 6.3.9 -> 6.4.1 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3447882f0924..3fbdcd2171f4 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.3.9"; - hash = "sha256-t1fKPZ+giANPmhM4zGoGtYWJF6rDnbpJaoHILl3nyRI="; + version = "6.4.1"; + hash = "sha256-WPnINDkOj0IoUDLBG/2LOrppVi9o9XSSgMrs/NBbqdA="; variant = "main"; }; From 7631229b5e6623e77dccc66d9cf78d56e169784c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Jul 2023 18:58:49 +0200 Subject: [PATCH 07/39] beets: fix embedart with imagick 7.1.1-12 Signed-off-by: Sefa Eyeoglu --- pkgs/tools/audio/beets/common.nix | 8 +++---- pkgs/tools/audio/beets/default.nix | 16 +++++++++++++ .../remove-failing-embedart-test.patch | 24 ------------------- ...stable-fix-embedart-imagick-7.1.1-12.patch | 13 ++++++++++ 4 files changed, 32 insertions(+), 29 deletions(-) delete mode 100644 pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch create mode 100644 pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 10db9441258a..be52b32d6c84 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -23,6 +23,7 @@ , src , version +, extraPatches ? [ ] , pluginOverrides ? { } , disableAllPlugins ? false @@ -45,22 +46,19 @@ let pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins); in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "beets"; inherit src version; patches = [ # Bash completion fix for Nix ./patches/bash-completion-always-print.patch - # Reported upstream at: - # https://github.com/beetbox/beets/issues/4836 - ./patches/remove-failing-embedart-test.patch (fetchpatch { # Fix unidecode>=1.3.5 compat url = "https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9.patch"; hash = "sha256-gqkrE+U1j3tt1qPRJufTGS/GftaSw/gweXunO/mCVG8="; }) - ]; + ] ++ extraPatches; propagatedBuildInputs = with python3Packages; [ confuse diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c21861bfc276..c109e3c087d0 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,6 +1,7 @@ { lib , callPackage , fetchFromGitHub +, fetchpatch }: /* ** To customize the enabled beets plugins, use the pluginOverrides input to the @@ -26,6 +27,12 @@ lib.makeExtensible (self: { rev = "v${version}"; hash = "sha256-fT+rCJJQR7bdfAcmeFRaknmh4ZOP4RCx8MXpq7/D8tM="; }; + extraPatches = [ + # Fix embedart with ImageMagick 7.1.1-12 + # https://github.com/beetbox/beets/pull/4839 + # The upstream patch does not apply on 1.6.0, as the related code has been refactored since + ./patches/stable-fix-embedart-imagick-7.1.1-12.patch + ]; }; beets-minimal = self.beets.override { disableAllPlugins = true; }; @@ -38,6 +45,15 @@ lib.makeExtensible (self: { rev = "50bd693057de472470ab5175fae0cdb5b75811c6"; hash = "sha256-91v1StaByG60ryhQqByBXu6sFCjk0qT0nsUPnocSEE4="; }; + extraPatches = [ + (fetchpatch { + # Fix embedart with ImageMagick 7.1.1-12 + # https://github.com/beetbox/beets/pull/4839 + name = "fix-embedart-imagick-7.1.1-12.patch"; + url = "https://github.com/beetbox/beets/commit/a873a191b9d25236774cec82df2ceb6399ed4ce3.patch"; + hash = "sha256-1b3igHx0jKQkyVUlwOx6Oo3O1f3w8oZDw4xpHFw0DO0="; + }) + ]; pluginOverrides = { # unstable has a new plugin, so we register it here. limit = { builtin = true; }; diff --git a/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch b/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch deleted file mode 100644 index ac531ef20c65..000000000000 --- a/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git i/test/test_embedart.py w/test/test_embedart.py -index 23a6f5e5..91b9c8c2 100644 ---- i/test/test_embedart.py -+++ w/test/test_embedart.py -@@ -163,19 +163,6 @@ class EmbedartCliTest(TestHelper, FetchImageHelper): - 'Image written is not {}'.format( - displayable_path(self.abbey_artpath))) - -- @require_artresizer_compare -- def test_accept_similar_art(self): -- self._setup_data(self.abbey_similarpath) -- album = self.add_album_fixture() -- item = album.items()[0] -- self.run_command('embedart', '-y', '-f', self.abbey_artpath) -- config['embedart']['compare_threshold'] = 20 -- self.run_command('embedart', '-y', '-f', self.abbey_similarpath) -- mediafile = MediaFile(syspath(item.path)) -- -- self.assertEqual(mediafile.images[0].data, self.image_data, -- 'Image written is not {}'.format( -- displayable_path(self.abbey_similarpath))) - - def test_non_ascii_album_path(self): - resource_path = os.path.join(_common.RSRC, b'image.mp3') diff --git a/pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch b/pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch new file mode 100644 index 000000000000..42ae3526e978 --- /dev/null +++ b/pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch @@ -0,0 +1,13 @@ +diff --git a/beets/art.py b/beets/art.py +index 13d5dfbd..ac1d2fd8 100644 +--- a/beets/art.py ++++ b/beets/art.py +@@ -132,7 +132,7 @@ def check_art_similarity(log, item, imagepath, compare_threshold): + convert_cmd = ['convert', syspath(imagepath, prefix=False), + syspath(art, prefix=False), + '-colorspace', 'gray', 'MIFF:-'] +- compare_cmd = ['compare', '-metric', 'PHASH', '-', 'null:'] ++ compare_cmd = ['compare', '-define', 'phash:colorspaces=sRGB,HCLp', '-metric', 'PHASH', '-', 'null:'] + log.debug('comparing images with pipeline {} | {}', + convert_cmd, compare_cmd) + convert_proc = subprocess.Popen( From d0a98a0fc2a93f51c1b1873e1d71456c168957e9 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 8 Jul 2023 23:03:03 +0200 Subject: [PATCH 08/39] beets-unstable: unstable-2022-08-27 -> unstable-2023-07-05 Signed-off-by: Sefa Eyeoglu --- pkgs/tools/audio/beets/common.nix | 11 +---- pkgs/tools/audio/beets/default.nix | 26 ++++++----- ...ch => fix-embedart-imagick-7.1.1-12.patch} | 0 ...nstable-bash-completion-always-print.patch | 43 +++++++++++++++++++ 4 files changed, 60 insertions(+), 20 deletions(-) rename pkgs/tools/audio/beets/patches/{stable-fix-embedart-imagick-7.1.1-12.patch => fix-embedart-imagick-7.1.1-12.patch} (100%) create mode 100644 pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index be52b32d6c84..801637320839 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -50,15 +50,7 @@ python3Packages.buildPythonApplication { pname = "beets"; inherit src version; - patches = [ - # Bash completion fix for Nix - ./patches/bash-completion-always-print.patch - (fetchpatch { - # Fix unidecode>=1.3.5 compat - url = "https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9.patch"; - hash = "sha256-gqkrE+U1j3tt1qPRJufTGS/GftaSw/gweXunO/mCVG8="; - }) - ] ++ extraPatches; + patches = extraPatches; propagatedBuildInputs = with python3Packages; [ confuse @@ -72,6 +64,7 @@ python3Packages.buildPythonApplication { pyyaml reflink unidecode + typing-extensions ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); nativeBuildInputs = [ diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c109e3c087d0..7f5c3bbceae9 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -28,31 +28,35 @@ lib.makeExtensible (self: { hash = "sha256-fT+rCJJQR7bdfAcmeFRaknmh4ZOP4RCx8MXpq7/D8tM="; }; extraPatches = [ + # Bash completion fix for Nix + ./patches/bash-completion-always-print.patch + + # Fix unidecode>=1.3.5 compat + (fetchpatch { + url = "https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9.patch"; + hash = "sha256-gqkrE+U1j3tt1qPRJufTGS/GftaSw/gweXunO/mCVG8="; + }) + # Fix embedart with ImageMagick 7.1.1-12 # https://github.com/beetbox/beets/pull/4839 # The upstream patch does not apply on 1.6.0, as the related code has been refactored since - ./patches/stable-fix-embedart-imagick-7.1.1-12.patch + ./patches/fix-embedart-imagick-7.1.1-12.patch ]; }; beets-minimal = self.beets.override { disableAllPlugins = true; }; beets-unstable = callPackage ./common.nix { - version = "unstable-2022-08-27"; + version = "unstable-2023-07-05"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "50bd693057de472470ab5175fae0cdb5b75811c6"; - hash = "sha256-91v1StaByG60ryhQqByBXu6sFCjk0qT0nsUPnocSEE4="; + rev = "9481402b3c20739ca0b879d19adbfca22ccd6a44"; + hash = "sha256-AKmozMNVchysoQcUWd90Ic6bQBKQgylVn0E3i85dGb8="; }; extraPatches = [ - (fetchpatch { - # Fix embedart with ImageMagick 7.1.1-12 - # https://github.com/beetbox/beets/pull/4839 - name = "fix-embedart-imagick-7.1.1-12.patch"; - url = "https://github.com/beetbox/beets/commit/a873a191b9d25236774cec82df2ceb6399ed4ce3.patch"; - hash = "sha256-1b3igHx0jKQkyVUlwOx6Oo3O1f3w8oZDw4xpHFw0DO0="; - }) + # Bash completion fix for Nix + ./patches/unstable-bash-completion-always-print.patch ]; pluginOverrides = { # unstable has a new plugin, so we register it here. diff --git a/pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch b/pkgs/tools/audio/beets/patches/fix-embedart-imagick-7.1.1-12.patch similarity index 100% rename from pkgs/tools/audio/beets/patches/stable-fix-embedart-imagick-7.1.1-12.patch rename to pkgs/tools/audio/beets/patches/fix-embedart-imagick-7.1.1-12.patch diff --git a/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch new file mode 100644 index 000000000000..395f40f92c98 --- /dev/null +++ b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch @@ -0,0 +1,43 @@ +diff --git a/beets/ui/commands.py b/beets/ui/commands.py +index 1377ad0c..e178eeae 100755 +--- a/beets/ui/commands.py ++++ b/beets/ui/commands.py +@@ -1831,20 +1831,6 @@ default_commands.append(config_cmd) + def print_completion(*args): + for line in completion_script(default_commands + plugins.commands()): + print_(line, end='') +- if not any(os.path.isfile(syspath(p)) for p in BASH_COMPLETION_PATHS): +- log.warning('Warning: Unable to find the bash-completion package. ' +- 'Command line completion might not work.') +- +- +-BASH_COMPLETION_PATHS = [ +- b'/etc/bash_completion', +- b'/usr/share/bash-completion/bash_completion', +- b'/usr/local/share/bash-completion/bash_completion', +- # SmartOS +- b'/opt/local/share/bash-completion/bash_completion', +- # Homebrew (before bash-completion2) +- b'/usr/local/etc/bash_completion', +-] + + + def completion_script(commands): +diff --git a/test/test_ui.py b/test/test_ui.py +index f66917dc..f3d934c6 100644 +--- a/test/test_ui.py ++++ b/test/test_ui.py +@@ -1310,12 +1310,7 @@ class CompletionTest(_common.TestCase, TestHelper): + stdout=subprocess.PIPE, env=env) + + # Load bash_completion library. +- for path in commands.BASH_COMPLETION_PATHS: +- if os.path.exists(syspath(path)): +- bash_completion = path +- break +- else: +- self.skipTest('bash-completion script not found') ++ self.skipTest('bash-completion script not found') + try: + with open(util.syspath(bash_completion), 'rb') as f: + tester.stdin.writelines(f) From 6884d74408fb695186593f53e99d452ba0f61dec Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Jul 2023 20:11:27 -0400 Subject: [PATCH 09/39] runme: 1.3.0 -> 1.4.0 Diff: https://github.com/stateful/runme/compare/v1.3.0...v1.4.0 Changelog: https://github.com/stateful/runme/releases/tag/v1.4.0 --- pkgs/development/tools/misc/runme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 7669bd777067..104b78a48b49 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "runme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-pfx4X9FgC08nQ74j9MJRBKIZnvO3plHN4cmaU4kFOoI="; + hash = "sha256-X2zHSqhtVtJZt28/O9i+EDwyRf+qJs2JTtCUveSWUVM="; }; vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI="; From 495b199f8fb34338a95076421a2066f1addf423d Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 9 Jul 2023 17:44:54 -0500 Subject: [PATCH 10/39] python3Packages.annotated-types: init at 0.5.0 --- .../annotated-types/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/annotated-types/default.nix diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix new file mode 100644 index 000000000000..645e3c40c48c --- /dev/null +++ b/pkgs/development/python-modules/annotated-types/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, typing-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "annotated-types"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "annotated-types"; + repo = "annotated-types"; + rev = "v${version}"; + hash = "sha256-zCsWfJ8BQuov8FN+hlm9XBKWAAQ/KHPK/x024A8k2kE="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + pythonImportsCheck = [ "annotated_types" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Reusable constraint types to use with typing.Annotated"; + homepage = "https://github.com/annotated-types/annotated-types"; + changelog = "https://github.com/annotated-types/annotated-types/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d951a0537a76..adefadfdb9da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -488,6 +488,8 @@ self: super: with self; { annexremote = callPackage ../development/python-modules/annexremote { }; + annotated-types = callPackage ../development/python-modules/annotated-types { }; + annoy = callPackage ../development/python-modules/annoy { }; anonip = callPackage ../development/python-modules/anonip { }; From cfe29b36b27ea51f66a6dd9438f74ec46ad17efd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jul 2023 05:08:20 +0000 Subject: [PATCH 11/39] python310Packages.google-cloud-bigquery-storage: 2.20.0 -> 2.22.0 --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index a23294a8cb7b..2ef048af1ab8 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.20.0"; + version = "2.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F61ZHBaE8cEaQl0+7wyWcrjQlk66QHQiUbUasjyjfZw="; + hash = "sha256-9tjHs6ubV0xml3/O6dM24zStGjhDpyK+GRI2QOeAjqM="; }; propagatedBuildInputs = [ From e9ffb19d7949b14f49020cb08e7010ed58c01499 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jul 2023 08:30:51 +0000 Subject: [PATCH 12/39] python310Packages.allpairspy: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/allpairspy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index b029296fd3a7..93188736c833 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "allpairspy"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1"; + sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4="; }; propagatedBuildInputs = [ six ]; From f7ae3cc5e721bf3de583d22faaa9a49197dac1d9 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 10 Jul 2023 06:36:48 -0600 Subject: [PATCH 13/39] govulncheck: unstable-2023-03-22 -> 0.2.0 This switches to the versioned releases (0.2.0 came out on Jun 30, 2023). It also disables the tests as vendoring causes issues them and there isn't a clear fix. --- pkgs/tools/security/govulncheck/default.nix | 29 +++++---------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index bb62c0e17565..51855b6f1a2a 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -1,37 +1,22 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "govulncheck"; - version = "unstable-2023-03-22"; + version = "0.2.0"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - rev = "f2d9b5a6e023e7cd80347eb7ebca02ae19b28903"; - sha256 = "sha256-zaeCEgFlv3Oxm4dIT/Evevww05JYEecekXO9UtIKLkU="; + rev = "v${version}"; + sha256 = "sha256-0lb1GwOcEpchT3TkdSve335bjYbVsuVzq1SvCDwtX/Q="; }; - vendorSha256 = "sha256-RxdiZ3NN+EWVCiBPI0VIDuRI1/h4rnU4KCNn2WwZL7Q="; + vendorSha256 = "sha256-r9XshbgVA5rppJF46SFYPad344ZHMLWTHTnL6vbIFH8="; subPackages = [ "cmd/govulncheck" ]; - preCheck = '' - # test all paths - unset subPackages - - # remove test that calls checks.bash - # the header check and misspell gets upset at the vendor dir - rm all_test.go - - # remove tests that generally have "inconsistent vendoring" issues - # - tries to builds govulncheck again - rm cmd/govulncheck/main_command_118_test.go - # - does go builds of example go files - rm internal/vulncheck/binary_test.go - # - just have resolution issues - rm internal/vulncheck/{source,vulncheck}_test.go - rm internal/govulncheck/callstacks_test.go - ''; + # Vendoring breaks tests + doCheck = false; ldflags = [ "-s" "-w" ]; From db9ff9eb8a5a60b9484e7780684bb0e89c471224 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 10 Jul 2023 08:50:13 -0400 Subject: [PATCH 14/39] blender: 3.5.1 -> 3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without removing the `rm … FindEmbree`, compilation fails due to various macros depending on the version of embree. The nixpkgs history provides no indication of why this patch is done (it has been present since the addition of embree as a dep in 6b74f99abd2f4c62e8093cfbdb104f60661d5405), and the build succeeds without them, so remove. --- pkgs/applications/misc/blender/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index cc1252899b51..81b7a54a754d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk="; + hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { pythonPath = with python310Packages; [ numpy requests ]; postPatch = '' - # allow usage of dynamically linked embree - rm build_files/cmake/Modules/FindEmbree.cmake '' + (if stdenv.isDarwin then '' : > build_files/cmake/platform/platform_apple_xcode.cmake From 19a6554e28dab9015c300a904528a342c8ea6275 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 10 Jul 2023 09:15:21 -0700 Subject: [PATCH 15/39] xilinx-bootgen: unstable-2019-10-23 -> xilinx_v2023.1 Among other changes, the xilinx_v2023.1 tag adds a `read` subcommand for printing the layout of xilinx boot files. --- pkgs/tools/misc/xilinx-bootgen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/pkgs/tools/misc/xilinx-bootgen/default.nix index 5d0c80c55bfb..f6619e025d3e 100644 --- a/pkgs/tools/misc/xilinx-bootgen/default.nix +++ b/pkgs/tools/misc/xilinx-bootgen/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xilinx-bootgen"; - version = "unstable-2019-10-23"; + version = "xilinx_v2023.1"; src = fetchFromGitHub { owner = "xilinx"; repo = "bootgen"; - rev = "f9f477adf243fa40bc8c7316a7aac37a0efd426d"; - sha256 = "1qciz3jkzy0z0lcgqnhch9pqj0202mk5ghzp2m9as5pzk8n8hrbz"; + rev = version; + sha256 = "sha256-pEkpZachZX2tOhH2Odb2fZWqJehLILE/0Z500xRuRzU="; }; buildInputs = [ openssl ]; From 2f7bf343c386718ba4a710a90282d690f82d843b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jul 2023 22:52:28 +0200 Subject: [PATCH 16/39] python311Packages.rpds-py: 0.8.8 -> 0.8.10 --- pkgs/development/python-modules/rpds-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index e97486649965..7eb6d7906c8e 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.8.8"; + version = "0.8.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-MAuFeXQLBuJGI4tzDmNvMUp9jcR1vhhoZQ9dPdwpoNg="; + hash = "sha256-E+ZDzorVAqAmM5c2L7iHWUtJz4S/UY1gOMFvI18rzqQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jg9oos4wqewIHe31c3DixIp6fssk742kqt4taWyOq4U="; + hash = "sha256-D4pbEipVn1r5rrX+wDXi97nDZJyBlkdqhmbJSgQGTLU="; }; nativeBuildInputs = [ From 65384b45f805d9c89ea6a48abd69f8c31f6af607 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jul 2023 22:53:07 +0200 Subject: [PATCH 17/39] python311Packages.sentry-sdk: 1.27.1 -> 1.28.0 Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.27.1...1.28.0 Changelog: https://github.com/getsentry/sentry-python/blob/1.28.0/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 6969247daf8c..e00b6408a964 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.27.1"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-IXmSQg5I78wwKIzKyuJHypAJeMMGu2vuoo3bqyK1K+c="; + hash = "sha256-HUsCNehkybKfcilON4TqMNFDdyfi48UGAOFEOOnhu6A="; }; propagatedBuildInputs = [ From 6d4d3ccc2502be4e0b3aab2d9ff67eb257cb969c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jul 2023 23:03:09 +0200 Subject: [PATCH 18/39] checkov: 2.3.312 -> 2.3.318 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.312...2.3.318 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.318 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index be5e669c4d94..3535e4d5529a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.312"; + version = "2.3.318"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SskpDZosJOPF2HhzclRI+8xd3ELtoxdeW8nWXrmI4hM="; + hash = "sha256-E1PSwbEmTTHsYbRlLUJ2HLqiJJuQO/aN73xWHTaQdBY="; }; patches = [ From b5daa1cc8dc43783c2d92d99eec2684f012ec6c7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 11 Jul 2023 09:57:02 +0800 Subject: [PATCH 19/39] pantheon.elementary-files: 6.4.0 -> 6.4.1 https://github.com/elementary/files/releases/tag/6.4.1 --- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index c24bb6716138..fb413d539a44 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.4.0"; + version = "6.4.1"; outputs = [ "out" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-mpCB8jRE9QIUiyBWkfYpfm6dsnMDcWvwwg8twbOiZ6I="; + sha256 = "sha256-s4Df2eLnr+RnbTwPzjt9bVA+xZ9xca2hiFdGlRUZRfU="; }; nativeBuildInputs = [ From 49b8dbf0e6f654a4182fcda54cb888d1579ed599 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 10 Jul 2023 22:27:03 -0400 Subject: [PATCH 20/39] python310Packages.mask-rcnn: remove --- .../python-modules/mask-rcnn/default.nix | 68 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/development/python-modules/mask-rcnn/default.nix diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix deleted file mode 100644 index 471b1fa61d42..000000000000 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ buildPythonPackage -, cython -, fetchFromGitHub -, fetchpatch -, h5py -, imgaug -, ipython -, keras -, lib -, matplotlib -, numpy -, opencv3 -, pillow -, scikit-image -, scipy -, tensorflow -}: - -buildPythonPackage rec { - pname = "mask-rcnn"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "matterport"; - repo = "Mask_RCNN"; - rev = "3deaec5d902d16e1daf56b62d5971d428dc920bc"; - sha256 = "13s3q9yh2q9m9vyksd269mww3bni4q2w7q5l419q70ca075qp8zp"; - }; - - patches = [ - # Fix for TF2: - # https://github.com/matterport/Mask_RCNN/issues/2734 - (fetchpatch { - url = "https://github.com/BupyeongHealer/Mask_RCNN_tf_2.x/commit/7957839fe2b248f2f22c7e991ead12068ddc6cfc.diff"; - excludes = [ "mrcnn/model.py" ]; - hash = "sha256-70BGrx6X1uJDA2025f0YTlreT2uB3n35yIzuhf+ypVc="; - }) - ]; - - # Fix for recent Keras - postPatch = '' - substituteInPlace mrcnn/model.py \ - --replace "KE." "KL." - ''; - - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ - h5py - imgaug - ipython - keras - matplotlib - numpy - opencv3 - pillow - scikit-image - scipy - tensorflow - ]; - - meta = with lib; { - description = "Mask R-CNN for object detection and instance segmentation on Keras and TensorFlow"; - homepage = "https://github.com/matterport/Mask_RCNN"; - license = licenses.mit; - maintainers = with maintainers; [ rakesh4g ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0f4cc1b4072e..e4e0e8ce968b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -172,6 +172,7 @@ mapAliases ({ Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10 + mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10 MDP = mdp; # added 2023-02-19 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c38c49c9ada7..6e2e7621339e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6179,8 +6179,6 @@ self: super: with self; { mashumaro = callPackage ../development/python-modules/mashumaro { }; - mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - masky = callPackage ../development/python-modules/masky { }; mastodon-py = callPackage ../development/python-modules/mastodon-py { }; From 9f35ab953bc2be03373de3ff08cf629317446f64 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 10 Jul 2023 22:22:59 -0400 Subject: [PATCH 21/39] python310Packages.imgaug: remove In addition to being unmaintained, it has been broken in Nixpkgs for some time due to library incompatibilities. --- .../python-modules/imgaug/default.nix | 84 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 pkgs/development/python-modules/imgaug/default.nix diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix deleted file mode 100644 index c67f7fa5b949..000000000000 --- a/pkgs/development/python-modules/imgaug/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, imageio -, imagecorruptions -, numpy -, opencv3 -, pytestCheckHook -, scikit-image -, scipy -, shapely -, six -, lib -}: - -buildPythonPackage rec { - pname = "imgaug"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "aleju"; - repo = "imgaug"; - rev = version; - sha256 = "17hbxndxphk3bfnq35y805adrfa6gnm5x7grjxbwdw4kqmbbqzah"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "opencv-python-headless" "" - substituteInPlace setup.py \ - --replace "opencv-python-headless" "" - substituteInPlace pytest.ini \ - --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" "" - ''; - - propagatedBuildInputs = [ - imageio - imagecorruptions - numpy - opencv3 - scikit-image - scipy - shapely - six - ]; - - nativeCheckInputs = [ - opencv3 - pytestCheckHook - ]; - - disabledTests = [ - # Tests are outdated - "test_quokka_segmentation_map" - "test_pool" - "test_avg_pool" - "test_max_pool" - "test_min_pool" - "est_median_pool" - "test_alpha_is_080" - "test_face_and_lines_at_half_visibility" - "test_polygon_fully_inside_image__no_rectangular_shape" - # flaky due to timing-based assertions - "test_imap_batches_output_buffer_size" - "test_imap_batches_unordered_output_buffer_size" - ]; - - disabledTestPaths = [ - # TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' - "test/augmenters/test_pooling.py" - ]; - - pythonImportsCheck = [ "imgaug" ]; - - meta = with lib; { - homepage = "https://github.com/aleju/imgaug"; - description = "Image augmentation for machine learning experiments"; - license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; - platforms = platforms.linux; - # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 - # and https://github.com/scikit-image/scikit-image/issues/6093 - broken = lib.versionAtLeast scikit-image.version "0.19"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e4e0e8ce968b..e6cd378e4be7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -150,6 +150,7 @@ mapAliases ({ IMAPClient = imapclient; # added 2021-10-28 imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10 + imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e2e7621339e..ed05a195e901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4949,8 +4949,6 @@ self: super: with self; { img2pdf = callPackage ../development/python-modules/img2pdf { }; - imgaug = callPackage ../development/python-modules/imgaug { }; - imgdiff = callPackage ../development/python-modules/imgdiff { }; imgsize = callPackage ../development/python-modules/imgsize { }; From d48573ec1f67b644a4b1d9b0247840045e23dc49 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 1 Jul 2023 11:19:14 +1000 Subject: [PATCH 22/39] gedit: fix cross compilation --- pkgs/applications/editors/gedit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index a7afca46ee6c..91f39e618c55 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -15,6 +15,7 @@ , gsettings-desktop-schemas , wrapGAppsHook , gtk-doc +, gobject-introspection , docbook-xsl-nons , ninja , libsoup @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { vala wrapGAppsHook gtk-doc + gobject-introspection docbook-xsl-nons ]; From abbb7ed8dc2d2ab36c4de290b19e90852440f71a Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 11 Jul 2023 11:38:03 +0800 Subject: [PATCH 23/39] python310Packages.pycookiecheat: fix darwin --- pkgs/development/python-modules/pycookiecheat/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index a8898e4b627e..08085b03c87c 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , cryptography , fetchFromGitHub @@ -54,6 +55,8 @@ buildPythonPackage rec { # Tests want to use playwright executable "test_no_cookies" "test_fake_cookie" + ] ++ lib.optionals stdenv.isDarwin [ + "test_slack_config" ]; meta = with lib; { From ab78ab62131d1bf22f3eb1519d97568bf5bab1a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jul 2023 03:46:12 +0000 Subject: [PATCH 24/39] b3sum: 1.4.0 -> 1.4.1 --- pkgs/tools/security/b3sum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index dc074a5616af..c7634b790ef6 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.4.0"; + version = "1.4.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-rh5xELjiwm5rSFVgIMZUMG4J/VxKKF8xrxX/wK+sVF8="; + sha256 = "sha256-cVl0thk+ENZEhTRvFvtAnHIWM8LzKDKEVSVyI22fh2I="; }; - cargoHash = "sha256-q10NC3QH4+ExF4vO6j/Ud8LenzXIuhZC8Yyev+2gJNU="; + cargoHash = "sha256-v175TKlCZ9Vdd1L2IHv2YX406ZkxRXJmZFKBIMab2gg="; meta = { description = "BLAKE3 cryptographic hash function"; From 8d0f24539192c22a86ab58b2e2603a2aeb28eaa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jul 2023 04:05:59 +0000 Subject: [PATCH 25/39] dyff: 1.5.7 -> 1.5.8 --- pkgs/development/tools/dyff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 2d0ca43ff4ca..3a5802a187b4 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-iavJgJnmUFNjdCwVifNP1K5gQ94Rth4wbZ99VXFgNpA="; + sha256 = "sha256-CnSccws3loqfbtjGKe3tkXNVOmNtQX/0+szODMErgxE="; }; - vendorHash = "sha256-48IpEBA5EaGZBhrRqAwGcf8xQuP/IlzWPFhh+7bFlPc="; + vendorHash = "sha256-PgQvckmqewzE2QXlP9xtzP5s2S6DDl2o8KWrNXFhEO4="; subPackages = [ "cmd/dyff" From 03848975178ba9fe61ad2e5b62a63f0cb581479f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Jul 2023 04:20:00 +0000 Subject: [PATCH 26/39] python310Packages.allpairspy: use pyproject format --- .../python-modules/allpairspy/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 93188736c833..da22d65c3639 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -1,21 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "allpairspy"; version = "2.5.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4="; }; - propagatedBuildInputs = [ six ]; + nativeCheckInputs = [ + pytestCheckHook + setuptools + ]; - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "allpairspy" + ]; meta = with lib; { description = "Pairwise test combinations generator"; From 834ed32062fddd7bb1d85e883458a9d54093ee26 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Jul 2023 04:20:00 +0000 Subject: [PATCH 27/39] python310Packages.allpairspy: add changelog to meta --- pkgs/development/python-modules/allpairspy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index da22d65c3639..a59a0a9f702c 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { meta = with lib; { description = "Pairwise test combinations generator"; homepage = "https://github.com/thombashi/allpairspy"; + changelog = "https://github.com/thombashi/allpairspy/releases/tag/v${version}"; license = licenses.mit; + maintainers = [ ]; }; } From 8742e41f50277a7353c0ab5b93bf01d42a97f39f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Jul 2023 04:20:00 +0000 Subject: [PATCH 28/39] python310Packages.robomachine: fix build --- .../python-modules/robomachine/default.nix | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 768aaeb89cf6..613b47a8e601 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,27 +1,48 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ stdenv +, lib +, allpairspy +, buildPythonPackage +, fetchPypi +, pyparsing +, pythonRelaxDepsHook +, robotframework +, setuptools +}: buildPythonPackage rec { pname = "RoboMachine"; version = "0.10.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; - propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; - # Remove Windows .bat files - postInstall = '' - rm "$out/bin/"*.bat - ''; + propagatedBuildInputs = [ + pyparsing + robotframework + allpairspy + ]; - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; + pythonRemoveDeps = [ + "argparse" + ]; + + pythonRelaxDeps = [ + "pyparsing" + ]; + + pythonImportsCheck = [ + "robomachine" + ]; meta = with lib; { - broken = true; description = "Test data generator for Robot Framework"; homepage = "https://github.com/mkorpela/RoboMachine"; license = licenses.asl20; From ab5d13ef49d0819ed35b80e582cbf7cd0be45e06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jul 2023 04:28:43 +0000 Subject: [PATCH 29/39] iosevka-bin: 25.0.0 -> 25.0.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 253339db8b0f..719a9d0224c1 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "25.0.0"; + version = "25.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index b36134df133e..aec3f2d28942 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0lx6cvaf3fqqy2mny84qhgrzmhvxipl24w7i6q7crg22fqqhcm9p"; - iosevka-aile = "14vg7xd2mibp97p5xj6xl2v7vcqzly1mbfx4nzpsygq5i8l6xixw"; - iosevka-curly = "0kc5kpxqdz27kffi0gg0qm8rw8qahkpwffqraf2956dfqa6md772"; - iosevka-curly-slab = "0pgqr4iwj0as3wnyqfyiwnp4libc7srzs36fcvxvhy4h39dmiyx7"; - iosevka-etoile = "0zhmm2pafmimgsznj60dkvjikcznlw1npjl1gvbrvlcxhs1i9bjv"; - iosevka-slab = "090yrggsx9bihaa51an2j0fxax9p47xbnrk67a9sxx2l9p70lbpw"; - iosevka-ss01 = "07cv7qj14ldnigm49y4sn96xbzsd7vl61fc2kamkg9n1zrk70376"; - iosevka-ss02 = "16zc4x3pcg1zcjn5pvy41mf21xqa6jm7ql6f7q1ls3nwda0z2v4h"; - iosevka-ss03 = "14i6c5q7p4k3n3l8wnj4jzrjc0fgp5hfj1zb4rnjbmx59yy7qvws"; - iosevka-ss04 = "0fjp92x8din0v5ml81dydif2n6zxv638y2aj10snfpixrnwryy9h"; - iosevka-ss05 = "04q0y02q7l2c4y5awfniddpx3pmskdip9r5ypzws30hsab12mghq"; - iosevka-ss06 = "08w145lrp10prhcidi0apdd0y34qdmlhfzr8xxm1mxl459g647mj"; - iosevka-ss07 = "0dz0gva0ji6zs7nxvva31z2jqawhg3vi873fwzwm4wdhp1p7m9xs"; - iosevka-ss08 = "0ylfkdxgndanii1aldfhncnp75hsprsw09fcr7xhyjj32zvzwvph"; - iosevka-ss09 = "1dz1jak3jg5jn4rdp0xcxrnbjknxqc9jwivhjp3wzdjpkkbgvyvr"; - iosevka-ss10 = "1wh0rfcp9yipjhvqcqy5n3v56s8hj5s017wr7kjk76wd0fx0sd4f"; - iosevka-ss11 = "1vfkfmq03b944nwxj32wc8anbhzfppmyj9vc6fp7c0prmqdi4a0m"; - iosevka-ss12 = "02mqw70rqqhq0c44823ip1c237bj0g52xkmx7vhggf9avnw0090z"; - iosevka-ss13 = "1zb72vx72z92vybj4yb3gggdsjz4gdrnm2k1j484x56z51d2qsbz"; - iosevka-ss14 = "1j9bhkb8qkdbm6mg2krbcxf2j9ii5vwgrq48b95zg0b2hdvabdpf"; - iosevka-ss15 = "17lffwlq5cm4ri2g1jznb0bqp1xaifrk1jcik0wl7b8y3mg27i1n"; - iosevka-ss16 = "1b27dbz585jviir5hwhwb9qg5f9cjpy6nvh7p7rd8n18ri2c7n5q"; - iosevka-ss17 = "09wijvz5b9s7kz2jpl68d2ygrf1kriaalrdhbgz7gc7rw5cvn8vd"; - iosevka-ss18 = "09wp9syfwz9dch26ldsvb14vmg1fcj68qlr6mfqj3wwykvb84835"; - sgr-iosevka = "1fcxnwynmwrd49h2wwlk2qkvrfpjwvxwlpq01j01ikschvi5smg2"; - sgr-iosevka-aile = "18ivsrxc8x2bvknqqn47swdphjldzad0fva9fab7b2jf537g9kd0"; - sgr-iosevka-curly = "0l1zi6svq8d1inp5rg8ihvm03x9wcavm6ak6xhx19lnxhca6nipx"; - sgr-iosevka-curly-slab = "1fakczd3bmld6liz9h4m9zgqvv7skjg91b4vbcqk05dqqdkpy9s4"; - sgr-iosevka-etoile = "0g236kfv3cr4swj41aiv31vwm7jxqjgkvvc1cd3riz2ikhyjry4f"; - sgr-iosevka-fixed = "0kgfimhm67kcscx0f6p9hyvav3dz3rzij25y8zb6wwc5x4kbs7q6"; - sgr-iosevka-fixed-curly = "199s7yzph0rbi78i6678g4kazmzhm63wkklmj412a8k7iqbi287y"; - sgr-iosevka-fixed-curly-slab = "1k4zb2sf8llv30aigxsv6r6ddvwdkgly6cfk0rhs5m33ram562r4"; - sgr-iosevka-fixed-slab = "05h6152fwqw99jm7lz65zid7n3b3sbxsg683yl1pm5jyqfcmjhds"; - sgr-iosevka-fixed-ss01 = "0npi71az66cgr4cv1idij8kb8q0sh03zf18frziz0gzh7rvlgp9b"; - sgr-iosevka-fixed-ss02 = "1y0xvbr8qlmn1ii71l7przqh0zl06w03300wdvsj9ncx651hvdpr"; - sgr-iosevka-fixed-ss03 = "020f2jfa6wps41jryjwim1p1xx2qdckdzf98fdcfp6gj1zag3k70"; - sgr-iosevka-fixed-ss04 = "0by2zngg1g3lklpr8xswp7bp7yaw2sxsd0cpg73bsllv73i4bzrd"; - sgr-iosevka-fixed-ss05 = "0mxl85c0g2csnckl7fqrafrvff030njw9b8c7sy34gfpvasbc51j"; - sgr-iosevka-fixed-ss06 = "1dfz4g225r5v86y5sji03x61hhaf66p1afqw9lrmsig2x04qxr1g"; - sgr-iosevka-fixed-ss07 = "02g9nfpd2xf3bn23jfpvy6vw9jlgy3hy2mphvqkq8zqa73a101dv"; - sgr-iosevka-fixed-ss08 = "1q1248gr82vq0jcmp67aknxxdkbpjqwdk5b18qrbfynwppkn8xw8"; - sgr-iosevka-fixed-ss09 = "1v2pgbw21iya9sayvhv987sm4iwxgrdfrc7raqdlb9xhln64bn0g"; - sgr-iosevka-fixed-ss10 = "1y92wiwh0d2q1ygnr8z9wkq973wqkr8g7n0n0q5kzv8y1v79i0s1"; - sgr-iosevka-fixed-ss11 = "1gnn1d0nkm8xiwv8fj28jrzmxmxi3c3p9shdvki2zpyb24f2kflv"; - sgr-iosevka-fixed-ss12 = "11h1i3i8y89k9kkvzh5jfrvyniba9l013001isk53yj9ww29hbi4"; - sgr-iosevka-fixed-ss13 = "1qgni0z0x7k3a4nsxj2nqmcxs64s2paaq1d4q6p4s77gb3v1nysb"; - sgr-iosevka-fixed-ss14 = "0ai6jx75ni5afsyg963xhwgpypa6nqq4g6104kqs0x7qbcinj5a3"; - sgr-iosevka-fixed-ss15 = "05bc3zzgmbh8mhpxskhvi3p8j38xxadvfkqck78j6f1034k9pcv3"; - sgr-iosevka-fixed-ss16 = "0whk1z3fzwagfa2vdp76iy2bfbp9jrgpq3vajmk49z4n1gh35rj2"; - sgr-iosevka-fixed-ss17 = "0085z35gagqgg410zqd9fa2vg9ixzgkz11n8rwjsmi5y5kg3rklq"; - sgr-iosevka-fixed-ss18 = "158c5xzp18ryfz8xhq2bvk6pplvsjcki4q3mc9v77gglmn23zcdh"; - sgr-iosevka-slab = "0i68g7wj4bbmilsaprbj7y69dbkg98nhd1zivc9x3pfka8pa53fd"; - sgr-iosevka-ss01 = "15yri67z1rbslv5b9aaf198ayrnifc31rivg67lgb6gm62zafx9b"; - sgr-iosevka-ss02 = "1d3wnc30yadawkbs388xb8mnzhjb1c16v2rh99ma6cf4sf3ag2mv"; - sgr-iosevka-ss03 = "0razg88g43m4vgdjixrsncfgzx0xf78p400gjcwlvyf93l2z5hqz"; - sgr-iosevka-ss04 = "163zb0vjb150xj86kyxhhlm6m9y3b58vdnxr5mlch6cc74d0hclb"; - sgr-iosevka-ss05 = "1nkpy5khlq7jjmf7pxxkyk0rpjfbzb5hyif0b96xybdf8f834q76"; - sgr-iosevka-ss06 = "0bs86i0ibs2jzgqhs0k9p3c5llwlzjfkkbw8vrk6qn4pdahammsl"; - sgr-iosevka-ss07 = "15cljy3npakxaphbhy97mh0x9817d8qdg5948gmdybz2q259x77n"; - sgr-iosevka-ss08 = "0m3yjwm7gybk943zmyhw4ppr7kjd1w43p23vf7ia2d0qf698iyz1"; - sgr-iosevka-ss09 = "0sf5pidrxc9w2c5wxgym7cw0n0j5yqdbfysj5a9n64cglbwap6fz"; - sgr-iosevka-ss10 = "0775lxx3rk0sfvki042mwgixpk8xxsz4wr3a7whs7wym8b0pzhlw"; - sgr-iosevka-ss11 = "1kgzmb3qzjw6jhw02w13i2qsg2vva2hij79jbp01idqhygzbm82j"; - sgr-iosevka-ss12 = "1as3iww2rzs9c5a40cm8m30j933na5ijch72hfaf84sn6nhmvvhz"; - sgr-iosevka-ss13 = "0c083nk1c5hq0h8miv941j9vxk9x637r41mgizrlvjlpirr2l0w3"; - sgr-iosevka-ss14 = "19i10anm517j1gh1dq85hsa3yaanjfbqgczj5iqs8a8ygzf4fc2c"; - sgr-iosevka-ss15 = "0vrsc9dsa5fmr62xc9bax3sks72m2p9ph4hd98rajl502j1dlh3p"; - sgr-iosevka-ss16 = "0fajhxjjqigmg52n7w6bv3b4kymx6ycgjw256gfqkakwadvgcxbz"; - sgr-iosevka-ss17 = "178n0wr2jck2ms7cbmnxhw4favcljwdc8qw6fl68cid3hbnm7p8k"; - sgr-iosevka-ss18 = "0i80ns3mk7d7ac18l3lf5nbbiyb8rw12d1gjwd18nq5sqvqrypj3"; - sgr-iosevka-term = "02pyq8dq4hppbs0lqk1rf045bpvb6ylcygw70yqskvh250djid1i"; - sgr-iosevka-term-curly = "1g7adk1s00hkn4jimcsyj5zs2yvc7gd6xzhs7w7lzyqpvpfjl4k6"; - sgr-iosevka-term-curly-slab = "0kpasgyl08rinwjkahxja6fxzzcngb97n4f40619pbj0n6m8f4my"; - sgr-iosevka-term-slab = "0p3skdrkg5wj724p8lsfzrrhlwi3fzaih34wvwrfnid23x0w2wn2"; - sgr-iosevka-term-ss01 = "18qgpb9k3whgh0n6iacwsp017i4nj52hv4js9r5a8ck1i47nmrzr"; - sgr-iosevka-term-ss02 = "04wyg5jmbprqn50c2g1k69bqvmvaj1iljdjjcyd5431ph5rr5qq8"; - sgr-iosevka-term-ss03 = "0i3j4p4hswkyz64m1x8ffs20dh1lszmcs2gq4xvgrbfdzqm68mbx"; - sgr-iosevka-term-ss04 = "1bsxg3psg33whzhn79i4nnpmyld57xvy5ic63vykyl1vrik5rhwd"; - sgr-iosevka-term-ss05 = "006i3w44qxw3wdcmshx8g7mgaxv50lpvad2jyfskkzvm1n66dbhn"; - sgr-iosevka-term-ss06 = "067p5a95pj5rgv717zq3n25g9zlsx20xc28i2nn0f4ifqn3x3g7a"; - sgr-iosevka-term-ss07 = "0vj4dq8igp6f81rmdgql194xk57dh453z5baqzg2mg9f4an2jsb6"; - sgr-iosevka-term-ss08 = "150l621swy7y4v19g2kmzj3033q0y626pnb530mw6ng2vnyy0qb5"; - sgr-iosevka-term-ss09 = "1bycnq1x7fmqpxg88ks0hsyyi5nqcyywc9vkfxmsasf2qqgicisn"; - sgr-iosevka-term-ss10 = "1gkc5zvkk9rwrn11vcb2gz2vjz8rnr9z066ql47p8plhxkxh49pn"; - sgr-iosevka-term-ss11 = "0sslhjbdzg3x5i58ivmym80v4klqxh3mis7adc9gjg0qgi8z5p37"; - sgr-iosevka-term-ss12 = "1a8bisfnajmiidmkyin4kbrp6jfwrwvzkjam1g1657hp6y74qb90"; - sgr-iosevka-term-ss13 = "0vih5lcyr1diw3iifn11pjjj9j7xyy6c7ccbswfsn9c4fzb0jih5"; - sgr-iosevka-term-ss14 = "1z643z83hyd0fya58sr897fhz38niils9ln8086chxhnlmpjlgpy"; - sgr-iosevka-term-ss15 = "10l4531xf2mygfbbyyp3krf9z0psv0133zvv7iqjb4y46pmj2gzf"; - sgr-iosevka-term-ss16 = "1dbddz9r8babvskax87pzyffl69rld9a6p4y655imr32y10bgg3n"; - sgr-iosevka-term-ss17 = "1brqlxpgplnmhi56km8019ssshv1djy8k2hm80d9hrdfadzzp6cw"; - sgr-iosevka-term-ss18 = "1cnfabclw4w0f4vv4w2rx6prhcrm8cz6jsksnp37apa26z5bh2py"; + iosevka = "0lmr4xqmyr4pz1xz0iw71zjwa9xn0nbkzxr1q3mdv3x12pdp0r11"; + iosevka-aile = "1l4bmn1cangjn91rq2w40np6dkcw34l8yvfbsqpmbzfqsz34ga61"; + iosevka-curly = "1sp8ig31s8rq91vl2ziv3ixqh50qdvnnlx6fjiccyxza079kxjw0"; + iosevka-curly-slab = "08jmmshflmhwwaa184aggxbmwfj4q1czynl52cz1may3cgvjr9za"; + iosevka-etoile = "1zvd8n7vm5za2jlply796hvzar92g73ibkhdc4r8d38148xxmwp2"; + iosevka-slab = "1xfrs95d1dzjz9dlgyn49xryyjzm711frxi45931l6i2jxppgz74"; + iosevka-ss01 = "0q9q5vx4p1r29l404yadbi4qslrjzgkisk6hk04xrhhrmkhh4b5j"; + iosevka-ss02 = "1nd7lyjcciirq146lj9crxrbxp82q29lclbhmxvkszlymif36vr5"; + iosevka-ss03 = "1rkgqhbh3c77jzysn0hdci2lgw1ss0f98zdnc2xfwhzimhlcsb2n"; + iosevka-ss04 = "17dcgbjhvyjcmk4jzf55faqwb30inhx98qldpjx66rkjg274dady"; + iosevka-ss05 = "1prpxj9hphhpmjpn001gznwmphijv4fkd1m5yr6zyyq10zyawx1j"; + iosevka-ss06 = "0narnyrfk88rclgm1caaqd7rmisbviizzrp4g54naxsmwhxj6zvd"; + iosevka-ss07 = "00v615vs6kmnxv7zql04b01dxc0ngdkpin51qi8fdld1nwy3gw4j"; + iosevka-ss08 = "1rzjpp82s2y2zybyh20406c131wk1mfazc4fzc766an87gip8409"; + iosevka-ss09 = "0amq785n58f1f92vi7xv4zsx91v5a3rkksk5yifysnc6pkxjs56w"; + iosevka-ss10 = "062x74l5df1ahxb7a27nrya6nh49dl0pi5c88v78hi2m85baviar"; + iosevka-ss11 = "06ak3wlxf472vpl5z02fg92z4hiycxvqj411g9cpfz7kg6y006fb"; + iosevka-ss12 = "1jny1y27swpzm2cqbavkkkbi3k1v2z2hy17l9arr9dv54bnm2d57"; + iosevka-ss13 = "0aylmsnhbrjckj012s7j6x0gikldiln60grjnp4h1z80nhs6md3a"; + iosevka-ss14 = "0j6v8bihckwp0bhs80zwr1rsrdf4bhaqjzwjx2mr9d63dnhj5lp9"; + iosevka-ss15 = "0xs52nbmj1g43x943vvb4pnms1i98ffidkad79f63nhw0x0ygr01"; + iosevka-ss16 = "0p9g432d44rdiv9bs5z0irdamqsknsi82snxyrmjplgy7m1frv9k"; + iosevka-ss17 = "1bvc9782yry9klkinfwrbn59mclcpizmv3yndz4b1ixv8dgym65z"; + iosevka-ss18 = "1a4m0drdg4f3rpxcjm899rzpym2m0hhiypwg61506nww1jcl8kk8"; + sgr-iosevka = "1xwpg3cq2587m8az2sfpd0k3pmvd8w4ci1jl7717fap38drl86ba"; + sgr-iosevka-aile = "0qjds4jhdzgnar0xdbz315kb2f4hxgh6xi8sdqpfbg84wjaj9872"; + sgr-iosevka-curly = "1qxyncllbbi1pcq7ajq63127k4q119cag76yyh3xpwl2f235ybrx"; + sgr-iosevka-curly-slab = "1bp44hgmc81avvpwdckjkmh049igfdfppnmmmpxmy55xzpmy30ik"; + sgr-iosevka-etoile = "0jvnlrz7mxrm0lg7wkdh3pz529xmssw63rgi0nfdy77zga3gv8r4"; + sgr-iosevka-fixed = "0bqdfq1xaanqpv1s9skapch184hcvbmdpcnjh7skms5ggcal7s3n"; + sgr-iosevka-fixed-curly = "0a7agrgi4qi3dk8yix3p9kbjvyqbxvm4lc0b75ywa8330g42khf5"; + sgr-iosevka-fixed-curly-slab = "0kxgkhvhz4l7ifc591c1n112wkcimfl417p49s3k5rx19yadz3rv"; + sgr-iosevka-fixed-slab = "1aq7qc6jjm7wkd5ng937gbv5l82gqx9snm4ffpp2k5zk8nnm38lv"; + sgr-iosevka-fixed-ss01 = "12gfppvi8vfp6y6y96zd6yvpb8xlr907gzhz04vm3j9m2dx8mdpz"; + sgr-iosevka-fixed-ss02 = "1ip6yx99rfa09bx64ah8bk5jp8w0x1qsdjknda7fwd8n1ian9qb1"; + sgr-iosevka-fixed-ss03 = "0cbayci1j0qj0xbydkxl4g8p4rdhjpdkjy6vb5zsxrx8rcxzmh6r"; + sgr-iosevka-fixed-ss04 = "1nm1wbax6xlxhsnw3522wi9dzzzr8k92464p9w31krrajlji46bn"; + sgr-iosevka-fixed-ss05 = "0y68rh0352idl0ncmx0lngbc6jj98incsnlh8xn55qggawah2g7l"; + sgr-iosevka-fixed-ss06 = "0x4azqmmznzaimg3ahv8kl0zcl3bdmrq4lqrvy94qz5ivgfnr7zv"; + sgr-iosevka-fixed-ss07 = "1l29i7q8zyw4cz21dqz2bc74c60grmmasiy3l31awrbwmabncqms"; + sgr-iosevka-fixed-ss08 = "1zlfqrkbsysi2nzfmvmz4yfbjngx3wpi3c68b4nkd8wdabll7a4m"; + sgr-iosevka-fixed-ss09 = "1631yavmr59lvmqhp3940n19200zsphy2fvq9kdg0xnrr9hgcgk0"; + sgr-iosevka-fixed-ss10 = "131crnfgvhxakggmvgk6apji8w3wkbgzm9ma77sz9ib9hcfrcn1f"; + sgr-iosevka-fixed-ss11 = "1gwz51ck1jdfww1g2yxzrjhyl3i41mqm6cykm2587r9kr5igxbyq"; + sgr-iosevka-fixed-ss12 = "198v6chwk948q7yikv06s4lydhyg4vq4s6ssl4fvay7d7jg33s5j"; + sgr-iosevka-fixed-ss13 = "1fg77lzw05qijap03l8f5k5lmfrn6phxpswvmzvlzzdscb5f2f3a"; + sgr-iosevka-fixed-ss14 = "1rhlja6vl1rdgp3r1ls3ycdr19x4bb0azyras7pamv2g5wbcrzv8"; + sgr-iosevka-fixed-ss15 = "03i2cr65368w8naqqyvhmry2sphihcdy3vw7pbq2mknn1ygrhafp"; + sgr-iosevka-fixed-ss16 = "1zxjik8z4jmq73fwfzg3y74wfp8a4yiy1dvm5g73b1r3jjc413dz"; + sgr-iosevka-fixed-ss17 = "0hxsa0bkf6yfh4hvs3h83myp3iil40c0629biys6h5a79nvqgxpr"; + sgr-iosevka-fixed-ss18 = "1zrnzrrzv1iw1aqa24khcxpwsg8fhvcbbs71j91j7yp5s070szar"; + sgr-iosevka-slab = "1d9lffq7xd6liglrr8kcymkq2bkvnz9cxnq4m5bby5h48vxr72j5"; + sgr-iosevka-ss01 = "1aa36415rpn4ihsd43mj1pgsjsiy4y2wr4ybckjyg7av1wi0n0rs"; + sgr-iosevka-ss02 = "0khj2j30q5zdygabmx45wn20g140zafifyg93fk9zp0ivs7xm13g"; + sgr-iosevka-ss03 = "0qvhlqc51bislhdhs61vv21dw0rvvf5sg9m7zk81d74harxba0qz"; + sgr-iosevka-ss04 = "0zpx6dpgivmk4gnf5w17978pd7cpq0f4j7ly53ykwa6ngjwq7cxq"; + sgr-iosevka-ss05 = "0jsaf52jydp4hah5q8l7sky1d7j3amkj7hs08qraw1h4bxbhqdq2"; + sgr-iosevka-ss06 = "0yh39c3bb59imysb0jyb0w006lhf5627ck4lkbv3pffa3jaskfrm"; + sgr-iosevka-ss07 = "1pm7pml2y9hfl8xpf0ggprvzc9yqxf2dpi64zsrbh950d41wmxyj"; + sgr-iosevka-ss08 = "11dqssnw6bhvsplc4sd8jvwhnmk6k8f506m8j26v2gr5iqk773kj"; + sgr-iosevka-ss09 = "014182zym2rw5zakpjaf921mpvxlr6ic24ag09c79c0w9mi2jnff"; + sgr-iosevka-ss10 = "0wzfxrhx173yga3s1ln1709wwxf4hbqym4sdg9jz3dn2hdn1f55j"; + sgr-iosevka-ss11 = "0wh1dy6w3sgw9xw2nda0xpa931v66nxv4kd4q4s8r9g6s5kbpj35"; + sgr-iosevka-ss12 = "1dnh7gs5lyyc4n7jmnl6c9qcsj7fnhzlyy8kxmsgn5hxfzjn42i8"; + sgr-iosevka-ss13 = "0g47da6ah2skrxs522q9w3aamrpyfhixg9cpqy0sgyxraw2iaq3d"; + sgr-iosevka-ss14 = "1if7hs8wjw7fs0j46camazmc93p0z1hz43i0rrkjxnai6cjqkaqj"; + sgr-iosevka-ss15 = "05h5yzpzx9xlf8xwkw8inp16x0arpdcfrklc62qdi87mdnfpkw8w"; + sgr-iosevka-ss16 = "01d3w7yblfbca3l2cmazh72f5a0z3wnb5d77rlw9wlvgw0drj8b0"; + sgr-iosevka-ss17 = "0sl94iaw038kljr78ms42vjqyj55pbyslxbm0b81fg6xkjy6q60n"; + sgr-iosevka-ss18 = "17395mrpjz1rmh5661s1v1ja53qhygf3zalqabya7cwfb1hz0xqy"; + sgr-iosevka-term = "10zg4365w5f554zdcdq4h7ixq3aq1lm21qndffp4q5c0kv57ggak"; + sgr-iosevka-term-curly = "19lkavcwpy7hsgmxz2jwlvbx9lsi8wm3xrypcb0wbcy80hjgkms2"; + sgr-iosevka-term-curly-slab = "1asdfglxskg6cikhhxx83jpwqsq3adrb5zgk94h1m2sv2xpcd65i"; + sgr-iosevka-term-slab = "0rsl048jzbf4fwindxxrlb2fwivjjayydc3fs8v92xg239y45m35"; + sgr-iosevka-term-ss01 = "17hin55idhzvcvrpvgpgjwkn29zsckmvjygbsjf560vy3cv48nlg"; + sgr-iosevka-term-ss02 = "0xnr89bdifbydgy7xbkg1msqxyjxp7l0rxby19bayd6f5lyh552s"; + sgr-iosevka-term-ss03 = "1ijz7qjym1fdrrjyi4g7lkl75frbcyh5ds548szwdavffh9ad74d"; + sgr-iosevka-term-ss04 = "1xrmlsp0gggqzgqckgp5r3h445xyglqid2g6f0fblcv5a79kp04w"; + sgr-iosevka-term-ss05 = "1d4llq2g6s9pp3ajl9spca5bpkk24kba4ki847gi55i7lpw4d1kl"; + sgr-iosevka-term-ss06 = "1wbqsgng4r3b588lnip0li321ibrnc4i39jjmvrs9c8xmgzswfjg"; + sgr-iosevka-term-ss07 = "0jxq4ygc6afq4vfgzrpsvhdw52535yqk6702nb5frlf9bllxpali"; + sgr-iosevka-term-ss08 = "1hqs6j38sghi1v86l83rhkyl7frsph7dp9jnhmzzb6w70ikbmajx"; + sgr-iosevka-term-ss09 = "0h8cf76s7dsa6gfsf9sxiri98d8crsdq2a2cjmn5iz9cxwnnrf0h"; + sgr-iosevka-term-ss10 = "0p3643d444r03y74djhpmgdz4f6ydwkhddgw4fpjhx4sg226yvfc"; + sgr-iosevka-term-ss11 = "0ak3w6h58wnpcxahdmdij52izvlq49allvrlq1syziaqd6b95qpz"; + sgr-iosevka-term-ss12 = "0km4sfg4q1z6b999piiiaiv6qxnvanw1s0jgrvy933fxyv7n4h7a"; + sgr-iosevka-term-ss13 = "0xhimnsspan0mcmspvz1r412q4rzririjnj744mgxs339w1bi6bh"; + sgr-iosevka-term-ss14 = "0h1v4lvf367p7w5m8s3mncp2ssfncxrixn1grj1nigijdc53m7ws"; + sgr-iosevka-term-ss15 = "1pppczbfv0dh7dnf39rw23qmr1h8ixkgw3gc6yashjni0jd9rr3r"; + sgr-iosevka-term-ss16 = "06fradackj5xi8j79sv16mnrxv91s596n04w6l3s29dcsmahf3yv"; + sgr-iosevka-term-ss17 = "0g4pv6v09n0xpxai3i79bhjspabvadv4wd4r1ryms6jyfdn9n367"; + sgr-iosevka-term-ss18 = "00zv631z48ifkpaw4idr9r6q2zdjv7m7i19xb33gv8yvfv96s3hz"; } From f8cbb4568e1c5c2cf5e84b5958271224da86d90c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jul 2023 05:05:21 +0000 Subject: [PATCH 30/39] thermald: 2.5.2 -> 2.5.3 --- pkgs/tools/system/thermald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index ccedeef55b0e..b4696d704224 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.2"; + version = "2.5.3"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-Ex3HSGJJDPPciX0Po9TpySVPUL257wz1ZjaLCa2igCM="; + sha256 = "sha256-rYhf+mbELNmm6gVS7eH1EEY73Dsw1vZLFUbaTOU980I="; }; nativeBuildInputs = [ From 9a7623847e972a2c839126d1d04eeba6b5fbc42a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Jul 2023 16:46:20 +0200 Subject: [PATCH 31/39] python3Packages.qgrid: init at 1.3.1 --- .../python-modules/qgrid/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/qgrid/default.nix diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix new file mode 100644 index 000000000000..79df36ed0ca7 --- /dev/null +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, ipywidgets +, notebook +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qgrid"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; + }; + + patches = [ + # Fixes compatibility of qgrid with ipywidgets >= 8.0.0 + # See https://github.com/quantopian/qgrid/pull/331 + (fetchpatch { + url = "https://github.com/quantopian/qgrid/pull/331/commits/8cc50d5117d4208a9dd672418021c59898e2d1b2.patch"; + hash = "sha256-+NLz4yBUGUXKyukPVE4PehenPzjnfljR5RAX7CEtpV4="; + }) + ]; + + propagatedBuildInputs = [ + ipywidgets + notebook + pandas + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Those tests are also failing upstream + disabledTests = [ + "test_edit_date" + "test_period_object_column" + ]; + + pythonImportsCheck = [ "qgrid" ]; + + meta = with lib; { + description = "An interactive grid for sorting, filtering, and editing DataFrames in Jupyter notebooks"; + homepage = "https://github.com/quantopian/qgrid"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c38c49c9ada7..8fde74d34615 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10503,6 +10503,8 @@ self: super: with self; { qds_sdk = callPackage ../development/python-modules/qds_sdk { }; + qgrid = callPackage ../development/python-modules/qgrid { }; + qiling = callPackage ../development/python-modules/qiling { }; qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; From 4ccdd2d01731c792f70f580a20f04ccf00fbf2e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Jul 2023 07:49:42 +0200 Subject: [PATCH 32/39] python3Packages.experiment-utilities: init at 0.3.3 --- .../experiment-utilities/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/experiment-utilities/default.nix diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix new file mode 100644 index 000000000000..46c50e1e2ec0 --- /dev/null +++ b/pkgs/development/python-modules/experiment-utilities/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, cloudpickle +, dill +, fasteners +, fetchFromGitLab +, qgrid +, ipywidgets +, odfpy +, scipy +, plotly +, pytestCheckHook +, pyyaml +, tabulate +, tensorboard +, torch +}: + +buildPythonPackage rec { + pname = "experiment-utilities"; + version = "0.3.4"; + + src = fetchFromGitLab { + owner = "creinke"; + repo = "exputils"; + domain = "gitlab.inria.fr"; + rev = "refs/tags/version_${version}"; + hash = "sha256-zjmmLUpGjUhpw2+stLJE6cImesnBSvrcid5bHMftX/Q="; + }; + + # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its + # owned derivation + postPatch = '' + substituteInPlace setup.cfg \ + --replace "ipywidgets >= 7.5.1,<= 7.6.5" "ipywidgets >= 7.5.1" + ''; + + propagatedBuildInputs = [ + cloudpickle + dill + fasteners + ipywidgets + odfpy + plotly + pyyaml + qgrid + scipy + tabulate + tensorboard + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + "test_experimentstarter" + ]; + + pythonImportsCheck = [ "exputils" ]; + + meta = with lib; { + description = "Various tools to run scientific computer experiments."; + homepage = "https://gitlab.inria.fr/creinke/exputils"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8fde74d34615..7a584d335f1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3453,6 +3453,8 @@ self: super: with self; { expecttest = callPackage ../development/python-modules/expecttest { }; + experiment-utilities = callPackage ../development/python-modules/experiment-utilities { }; + expiring-dict = callPackage ../development/python-modules/expiring-dict { }; expiringdict = callPackage ../development/python-modules/expiringdict { }; From 80f1bea8bc6c5bd98489cf1fd9af3b0795de63e1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Jul 2023 11:06:57 +0300 Subject: [PATCH 33/39] linux: 6.4.2 -> 6.4.3 --- pkgs/os-specific/linux/kernel/linux-6.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix index c9177a7d6c0c..19aa95a1a10d 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4.2"; + version = "6.4.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0b0623pvf9spb5biv1k4wzjbcj9fyf2svk69fdyb3ibn84ian9m3"; + sha256 = "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"; }; } // (args.argsOverride or { })) From 34b396feef90b1930decab6ae08cb213d14a8100 Mon Sep 17 00:00:00 2001 From: Short Cord Date: Wed, 14 Jun 2023 17:03:52 -0400 Subject: [PATCH 34/39] maintainers: add shortcord --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f040598e5d39..53f162af62ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15009,6 +15009,12 @@ github = "kf5grd"; githubId = 18297490; }; + shortcord = { + name = "Short Cord"; + email = "short@shortcord.com"; + github = "shortcord"; + githubId = 3823744; + }; shou = { email = "x+g@shou.io"; github = "Shou"; From 35881fdd9de7c0a4c33c462ab2d4a6896546944a Mon Sep 17 00:00:00 2001 From: Short Cord Date: Wed, 14 Jun 2023 15:13:54 -0400 Subject: [PATCH 35/39] obs-tuna: init at 1.9.6 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-tuna/default.nix | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 2ca9d0f5cd54..bac94a8123ed 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -58,6 +58,8 @@ obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { }; + obs-tuna = qt6Packages.callPackage ./obs-tuna { }; + obs-vaapi = callPackage ./obs-vaapi { }; obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix new file mode 100644 index 000000000000..52ad130b034d --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, cmake +, zlib +, curl +, taglib +, dbus +, pkg-config +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-tuna"; + version = "1.9.6"; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; + + src = fetchFromGitHub { + owner = "univrsal"; + repo = "tuna"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+AgRaivvYhogX4CLGK2ylvE8tQoauC/UMvXK6W0Tvog="; + fetchSubmodules = true; + }; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + dontWrapQtApps = true; + + meta = { + description = "Song information plugin for obs-studio"; + homepage = "https://github.com/univrsal/tuna"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ shortcord ]; + platforms = lib.platforms.linux; + }; +}) From b2bbed2f792ce2ca82bffd4ab0c111b792d22fb2 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Mon, 10 Jul 2023 17:01:31 +0200 Subject: [PATCH 36/39] ns-3: v35 -> v39 --- .../science/networking/ns-3/default.nix | 143 +++++++++++------- 1 file changed, 87 insertions(+), 56 deletions(-) diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 0eba41234fd5..f515253026b8 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,77 +1,108 @@ { stdenv +, breakpointHook , fetchFromGitLab , python -, wafHook +, libxml2 +, sqlite -# for binding generation +, boost +, gtk3-x11 +, root +, glib +, gsl + +, cmake +, pkg-config + + +, libpcap + +, jansson + +, harfbuzz +, freetype + + # for binding generation , castxml ? null +, cppyy ? null -# can take a long time, generates > 30000 images/graphs + # can take a long time, generates > 30000 images/graphs , enableDoxygen ? false -# e.g. "optimized" or "debug". If not set, use default one -, build_profile ? null + # very long +, withManual ? false +, doxygen ? null +, graphviz ? null +, imagemagick ? null + # for manual, tetex is used to get the eps2pdf binary + # texlive to get latexmk. building manual still fails though +, dia +, tetex ? null +, ghostscript ? null +, texlive ? null -# --enable-examples -, withExamples ? false + # generates python bindings +, pythonSupport ? true +, ncurses ? null -# very long -, withManual ? false, doxygen ? null, graphviz ? null, imagemagick ? null -# for manual, tetex is used to get the eps2pdf binary -# texlive to get latexmk. building manual still fails though -, dia, tetex ? null, ghostscript ? null, texlive ? null - -# generates python bindings -, pythonSupport ? false, ncurses ? null - -# All modules can be enabled by choosing 'all_modules'. -# we include here the DCE mandatory ones -, modules ? [ "core" "network" "internet" "point-to-point" "point-to-point-layout" "fd-net-device" "netanim" ] , lib }: let - pythonEnv = python.withPackages(ps: + pythonEnv = python.withPackages (ps: lib.optional withManual ps.sphinx - ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) + ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml cppyy]) ); in stdenv.mkDerivation rec { pname = "ns-3"; - version = "35"; + version = "39"; src = fetchFromGitLab { owner = "nsnam"; - repo = "ns-3-dev"; - rev = "ns-3.${version}"; - sha256 = "sha256-3w+lCWWra9sndL8+vkGfH5plrDYYCMFi1PzwIVRku6I="; + repo = "ns-3-dev"; + rev = "ns-3.${version}"; + sha256 = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; }; - nativeBuildInputs = [ wafHook python ]; + nativeBuildInputs = [ cmake pkg-config pythonEnv ]; - outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + outputs = [ "out" ]; # ncurses is a hidden dependency of waf when checking python buildInputs = lib.optionals pythonSupport [ castxml ncurses ] ++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ] - ++ lib.optionals withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texlive.combined.scheme-medium ] + ++ [ + libxml2 + pythonEnv + sqlite.dev + gsl + boost + root + glib.out + glib.dev + libpcap + gtk3-x11.dev + harfbuzz + freetype + jansson + ]; propagatedBuildInputs = [ pythonEnv ]; - postPatch = '' - patchShebangs doc/ns3_html_theme/get_version.sh + preConfigure = '' + substituteInPlace src/tap-bridge/CMakeLists.txt \ + --replace '-DTAP_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/tap-bridge/' "-DTAP_CREATOR=\"$out/libexec/ns3/" + + substituteInPlace src/fd-net-device/CMakeLists.txt \ + --replace '-DRAW_SOCK_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/fd-net-device/' "-DRAW_SOCK_CREATOR=\"$out/libexec/ns3/" + + substituteInPlace src/fd-net-device/CMakeLists.txt \ + --replace '-DTAP_DEV_CREATOR="''${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/src/fd-net-device/' "-DTAP_DEV_CREATOR=\"$out/libexec/ns3/" ''; - wafConfigureFlags = with lib; [ - "--enable-modules=${concatStringsSep "," modules}" - "--with-python=${pythonEnv.interpreter}" - ] - ++ optional (build_profile != null) "--build-profile=${build_profile}" - ++ optional withExamples " --enable-examples " - ++ optional doCheck " --enable-tests " - ; - - doCheck = true; + doCheck = false; buildTargets = "build" + lib.optionalString enableDoxygen " doxygen" @@ -80,25 +111,25 @@ stdenv.mkDerivation rec { # to prevent fatal error: 'backward_warning.h' file not found CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; - postBuild = with lib; let flags = concatStringsSep ";" ( - optional enableDoxygen "./waf doxygen" - ++ optional withManual "./waf sphinx" - ); - in "${flags}" - ; + # Make generated python bindings discoverable in customized python environment + passthru = { pythonModule = python; }; - postInstall = '' - moveToOutput "${pythonEnv.libPrefix}" "$py" - ''; - - # we need to specify the proper interpreter else ns3 can check against a - # different version - checkPhase = '' - ${pythonEnv.interpreter} ./test.py --nowaf - ''; + cmakeFlags = [ + "-DPython3_LIBRARY_DIRS=${pythonEnv}/lib" + "-DPython3_INCLUDE_DIRS=${pythonEnv}/include" + "-DPython3_EXECUTABLE=${pythonEnv}/bin/python" + "-DNS3_PYTHON_BINDINGS=ON" + "-DNS3_DES_METRICS=ON" + "-DNS3_BINDINGS_INSTALL_DIR=lib/${pythonEnv.libPrefix}/site-packages" + "-DNS3_LOG=ON" + "-DNS3_ASSERT=ON" + "-DNS3_GTK3=ON" + "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + ] + ++ lib.optional doCheck "-DNS3_TESTS=ON"; # strictoverflow prevents clang from discovering pyembed when bindings - hardeningDisable = [ "fortify" "strictoverflow"]; + hardeningDisable = [ "fortify" "strictoverflow" ]; meta = with lib; { homepage = "http://www.nsnam.org"; From f76f2d5b9b19be642eb2f8f37cc8e6c44987bf32 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sun, 7 May 2023 08:12:24 +0100 Subject: [PATCH 37/39] obs-studio-plugins.waveform: init at 1.7.0 Co-authored-by: Franz Pletz --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/waveform/default.nix | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/waveform/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index fdb2b43d9735..831e8637bda2 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -47,4 +47,6 @@ obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself."; wlrobs = callPackage ./wlrobs.nix { }; + + waveform = callPackage ./waveform { }; } diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix new file mode 100644 index 000000000000..ff5c52380de7 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, obs-studio +, pkg-config +, fftwFloat +}: + +stdenv.mkDerivation rec { + pname = "waveform"; + version = "1.7.0"; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "phandasm"; + repo = "waveform"; + rev = "v${version}"; + sha256 = "sha256-DR3+ZBbWoGybUvDwVXLvarp+IGsTPl9Y0mFe739Ar8E="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + postFixup = '' + mkdir $out/lib $out/share + mv $out/${pname}/bin/64bit $out/lib/obs-plugins + mv $out/${pname}/data $out/share/obs + rm -rf $out/${pname} + ''; + + buildInputs = [ + obs-studio + fftwFloat + ]; + + meta = { + description = "Audio spectral analysis plugin for OBS"; + homepage = "https://github.com/phandasm/waveform"; + maintainers = with lib.maintainers; [ matthewcroughan ]; + license = lib.licenses.gpl3; + platforms = ["x86_64-linux"]; + }; +} From 68dd30b73feb05dc168a6e2b0b88c41c6eaa8bfb Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 11 Jul 2023 18:29:36 +0800 Subject: [PATCH 38/39] eksctl: 0.147.0 -> 0.148.0 Diff: https://github.com/weaveworks/eksctl/compare/0.147.0...0.148.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0fa1b31a6265..f01edc1d6109 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.147.0"; + version = "0.148.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-rrsXdkYF22lTJDXTToiK8/j12A1cZn9oV/R/yH+tb2g="; + hash = "sha256-0/gjBUbngj6lVw3ascI0P+n95IkjsDhEq5x72P5DnSg="; }; - vendorHash = "sha256-VFrx1Y44wbeTtpquKEKA13lnCLQDH/rmduYpL+BCu+I="; + vendorHash = "sha256-30OmvzC0Sd0ce2IAleE7prQBlMvMGvUGF5IfrG2m0IQ="; doCheck = false; From c9e191434b5918319ddc7cc7641d876d275afebe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Jul 2023 00:03:59 +0200 Subject: [PATCH 39/39] shairport-sync: fix cross compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Tools from the glib.dev output need to be in PATH for cross compilation to work. Not sure if there is a cleaner way than my string trick to do it… - The upstream configure script neglects to check for $AR properly, so we need to pass it explicitly. --- pkgs/servers/shairport-sync/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 2a160ab9ab88..b9b4ff868e0f 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -49,7 +49,21 @@ stdenv.mkDerivation rec { hash = "sha256-ru2iaXSgS+w2ktqGLGC9SiYztkmmOQVzHaeLwMqvMzk="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + # For glib we want the `dev` output for the same library we are + # also linking against, since pkgsHostTarget.glib.dev exposes + # some extra tools that are built for build->host execution. + # To achieve this, we coerce the output to a string to prevent + # mkDerivation's splicing logic from kicking in. + "${glib.dev}" + ]; + + makeFlags = [ + # Workaround for https://github.com/mikebrady/shairport-sync/issues/1705 + "AR=${stdenv.cc.bintools.targetPrefix}ar" + ]; buildInputs = [ openssl @@ -100,6 +114,8 @@ stdenv.mkDerivation rec { ++ optional enableLibdaemon "--with-libdaemon" ++ optional enableAirplay2 "--with-airplay-2"; + strictDeps = true; + meta = with lib; { homepage = "https://github.com/mikebrady/shairport-sync"; description = "Airtunes server and emulator with multi-room capabilities";