lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
07bf88ec 22484645

+1046 -455
+7
maintainers/maintainer-list.nix
··· 281 281 githubId = 124545; 282 282 name = "Anthony Cowley"; 283 283 }; 284 + adamcstephens = { 285 + email = "happy.plan4249@valkor.net"; 286 + matrix = "@adam:valkor.net"; 287 + github = "adamcstephens"; 288 + githubId = 2071575; 289 + name = "Adam C. Stephens"; 290 + }; 284 291 adamlwgriffiths = { 285 292 email = "adam.lw.griffiths@gmail.com"; 286 293 github = "adamlwgriffiths";
+11
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 1233 1233 </listitem> 1234 1234 <listitem> 1235 1235 <para> 1236 + PowerDNS has been updated from <literal>4.6.x</literal> to 1237 + <literal>4.7.x</literal>. Please be sure to review the 1238 + <link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master">Upgrade 1239 + Notes</link> provided by upstream before upgrading. Worth 1240 + specifically noting is that the new Catalog Zones feature 1241 + comes with a mandatory schema change for the gsql database 1242 + backends, which has to be manually applied. 1243 + </para> 1244 + </listitem> 1245 + <listitem> 1246 + <para> 1236 1247 There is a new module for the <literal>thunar</literal> 1237 1248 program (the Xfce file manager), which depends on the 1238 1249 <literal>xfconf</literal> dbus service, and also has a dbus
+2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 377 377 378 378 - The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment. 379 379 380 + - PowerDNS has been updated from `4.6.x` to `4.7.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the gsql database backends, which has to be manually applied. 381 + 380 382 - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. 381 383 382 384 - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
+5 -1
nixos/tests/bazarr.nix
··· 16 16 enable = true; 17 17 listenPort = port; 18 18 }; 19 + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"]; 20 + # Workaround for https://github.com/morpheus65535/bazarr/issues/1983 21 + # ("Crash when running without timezone info"). 22 + time.timeZone = "UTC"; 19 23 }; 20 24 21 25 testScript = '' 22 26 machine.wait_for_unit("bazarr.service") 23 - machine.wait_for_open_port(port) 27 + machine.wait_for_open_port(${toString port}) 24 28 machine.succeed("curl --fail http://localhost:${toString port}/") 25 29 ''; 26 30 })
+4 -4
pkgs/applications/audio/squeezelite/default.nix
··· 34 34 pname = binName; 35 35 # versions are specified in `squeezelite.h` 36 36 # see https://github.com/ralph-irving/squeezelite/issues/29 37 - version = "1.9.9.1403"; 37 + version = "1.9.9.1411"; 38 38 39 39 src = fetchFromGitHub { 40 40 owner = "ralph-irving"; 41 41 repo = "squeezelite"; 42 - rev = "bc72c0de3fff771540a2a45aaafafed539387b3c"; 43 - hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ="; 42 + rev = "ca44fc6e258bb413d6281d927063b25940f42e5c"; 43 + hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY="; 44 44 }; 45 45 46 46 buildInputs = [ flac libmad libvorbis mpg123 ] ··· 82 82 description = "Lightweight headless squeezebox client emulator"; 83 83 homepage = "https://github.com/ralph-irving/squeezelite"; 84 84 license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; 85 - maintainers = with maintainers; [ samdoshi ]; 85 + maintainers = with maintainers; [ adamcstephens ]; 86 86 platforms = platforms.linux; 87 87 }; 88 88 }
+2 -2
pkgs/applications/audio/tauon/default.nix
··· 25 25 26 26 stdenv.mkDerivation rec { 27 27 pname = "tauon"; 28 - version = "7.4.2"; 28 + version = "7.4.3"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "Taiko2k"; 32 32 repo = "TauonMusicBox"; 33 33 rev = "v${version}"; 34 - sha256 = "sha256-fEEu7GqK1leOop3kd1Ci9BAH2bP31jvTOg3DEL8lIF4="; 34 + sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0="; 35 35 }; 36 36 37 37 postUnpack = ''
+10 -9
pkgs/applications/editors/eclipse/plugins.nix
··· 433 433 }; 434 434 }; 435 435 436 - gnuarmeclipse = buildEclipseUpdateSite rec { 437 - name = "gnuarmeclipse-${version}"; 438 - version = "3.1.1-201606210758"; 436 + embed-cdt = buildEclipseUpdateSite rec { 437 + name = "embed-cdt-${version}"; 438 + version = "6.3.1"; 439 439 440 440 src = fetchzip { 441 - stripRoot = false; 442 - url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip"; 443 - sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h"; 441 + stripRoot = true; 442 + url = "https://github.com/eclipse-embed-cdt/eclipse-plugins/archive/v${version}.zip"; 443 + sha256 = "sha256-0wHRIls48NGDQzD+wuX79Thgiax+VVYVPJw2Z6NEzsg="; 444 444 }; 445 445 446 446 meta = with lib; { 447 - homepage = "http://gnuarmeclipse.livius.net/"; 448 - description = "GNU ARM Eclipse Plug-ins"; 447 + homepage = "https://github.com/eclipse-embed-cdt/eclipse-plugins"; 448 + description = "Embedded C/C++ Development Tools (formerly GNU MCU/ARM Eclipse)"; 449 449 sourceProvenance = with sourceTypes; [ binaryBytecode ]; 450 - license = licenses.epl10; 450 + license = licenses.epl20; 451 451 platforms = platforms.all; 452 452 maintainers = [ maintainers.bjornfor ]; 453 453 }; 454 454 }; 455 + gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04 455 456 456 457 jsonedit = buildEclipsePlugin rec { 457 458 name = "jsonedit-${version}";
+129 -129
pkgs/applications/editors/vim/plugins/generated.nix
··· 281 281 282 282 SchemaStore-nvim = buildVimPluginFrom2Nix { 283 283 pname = "SchemaStore.nvim"; 284 - version = "2022-10-31"; 284 + version = "2022-11-03"; 285 285 src = fetchFromGitHub { 286 286 owner = "b0o"; 287 287 repo = "SchemaStore.nvim"; 288 - rev = "bfcd9a05ded8ff6cf89b302bee548c35177d9158"; 289 - sha256 = "1mwj6dhk7wpyk766bq504i87hyw3rgspc64ml0kc5xf8wq1mxx4m"; 288 + rev = "6d856dc67cb85539fae976cce268e853f14079e7"; 289 + sha256 = "09xqfahq1i59bw7fpxh6g16g1j9habsxi68v8ghr1za5lspki768"; 290 290 }; 291 291 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; 292 292 }; ··· 341 341 342 342 SpaceVim = buildVimPluginFrom2Nix { 343 343 pname = "SpaceVim"; 344 - version = "2022-11-01"; 344 + version = "2022-11-02"; 345 345 src = fetchFromGitHub { 346 346 owner = "SpaceVim"; 347 347 repo = "SpaceVim"; 348 - rev = "88489db9c24e6c8cbc0b39cc9b8de96d3899cb06"; 349 - sha256 = "16hn8zpmm9qynzakj8dp3d42pczcqdb3xj5k1di7yw810r8gdycf"; 348 + rev = "49e0e52d512a370b53f315fcb83e0e84ebba4d86"; 349 + sha256 = "19jmaabbwp8vl75ldm18vkl76xcgwfx0krihah52sdimfjy1az8i"; 350 350 }; 351 351 meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; 352 352 }; ··· 365 365 366 366 SudoEdit-vim = buildVimPluginFrom2Nix { 367 367 pname = "SudoEdit.vim"; 368 - version = "2022-08-15"; 368 + version = "2022-11-03"; 369 369 src = fetchFromGitHub { 370 370 owner = "chrisbra"; 371 371 repo = "SudoEdit.vim"; 372 - rev = "bcf23412e9f307036ae3dbd7968930c1fd48f02b"; 373 - sha256 = "1zrf32d4v5751vivwl976sjy901vjrl1m5b2vzzmp7aic76rji7y"; 372 + rev = "e0ffcda0c2f98bec80cb52d1af5f3af26bd38821"; 373 + sha256 = "125npjj74zn6ldh0656m5f7bc5035wdh7v3bwhh70jkbw36c3vvm"; 374 374 }; 375 375 meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; 376 376 }; ··· 442 442 owner = "ycm-core"; 443 443 repo = "YouCompleteMe"; 444 444 rev = "728b47728c31bcbc92fbc196c00230d601ca2a15"; 445 - sha256 = "11g2gby9qffjs4197ajzk2hsmpsjgak33rxfbfijg82m9ypsf3gc"; 445 + sha256 = "0mlhaxnafi6wdyxhjiy2jdpf7xqwlxh5cqjk658znb05x4kix0pp"; 446 446 fetchSubmodules = true; 447 447 }; 448 448 meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; ··· 486 486 487 487 aerial-nvim = buildVimPluginFrom2Nix { 488 488 pname = "aerial.nvim"; 489 - version = "2022-10-31"; 489 + version = "2022-11-02"; 490 490 src = fetchFromGitHub { 491 491 owner = "stevearc"; 492 492 repo = "aerial.nvim"; 493 - rev = "159041f5f6e0ba914221f097886f1d31ce419c04"; 494 - sha256 = "06b5hjsbk4k9zw64zfz8pq540wd2q3i5z4sv78n3kh0cbcjj9gmw"; 493 + rev = "f15e49cbc0da8840531ed0bddf67735c604994d6"; 494 + sha256 = "1lkyl27a3pn7lwcljpyy0q76c7f66jcik1nlbfq5nfr52h040061"; 495 495 fetchSubmodules = true; 496 496 }; 497 497 meta.homepage = "https://github.com/stevearc/aerial.nvim/"; ··· 667 667 668 668 asyncrun-vim = buildVimPluginFrom2Nix { 669 669 pname = "asyncrun.vim"; 670 - version = "2022-10-30"; 670 + version = "2022-11-03"; 671 671 src = fetchFromGitHub { 672 672 owner = "skywind3000"; 673 673 repo = "asyncrun.vim"; 674 - rev = "4794a74dae54633c586eecd67e31d771323a2f72"; 675 - sha256 = "1d3xm00xhwdm5yc08mzkvn5897rb58cjrlq86dlbypfrni512sv7"; 674 + rev = "e74f19f430f98fbb5a2f4d3a725ea980876b7314"; 675 + sha256 = "0fasalhsyf86sr5r2y1wh6ixbf2ys7abwvsf5lzav0za59542av4"; 676 676 }; 677 677 meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; 678 678 }; ··· 907 907 908 908 bufdelete-nvim = buildVimPluginFrom2Nix { 909 909 pname = "bufdelete.nvim"; 910 - version = "2022-10-07"; 910 + version = "2022-11-02"; 911 911 src = fetchFromGitHub { 912 912 owner = "famiu"; 913 913 repo = "bufdelete.nvim"; 914 - rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93"; 915 - sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6"; 914 + rev = "027d356a5caec51881089886893c197f0c27fb48"; 915 + sha256 = "1kg671nqjic4dn275ixf3iapj40q96mmpmi4bssz0pdd4gr37klm"; 916 916 }; 917 917 meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; 918 918 }; ··· 1723 1723 1724 1724 coc-nvim = buildVimPluginFrom2Nix { 1725 1725 pname = "coc.nvim"; 1726 - version = "2022-10-31"; 1726 + version = "2022-11-03"; 1727 1727 src = fetchFromGitHub { 1728 1728 owner = "neoclide"; 1729 1729 repo = "coc.nvim"; 1730 - rev = "46571a51028dccca9c10c860a51ea3c8adc92de8"; 1731 - sha256 = "1agm4sban6sfg626hf78ayhr98hrvi263jv6i8hk0qhcgv26k32c"; 1730 + rev = "5f52e41be1ff19ce1f1bd3307144e7d96703b7fd"; 1731 + sha256 = "0nm8jgdgxbdlvcpl12fs2fgxww5nizjpqd2ywm2n7ca0lsjpqcx0"; 1732 1732 }; 1733 1733 meta.homepage = "https://github.com/neoclide/coc.nvim/"; 1734 1734 }; ··· 2011 2011 2012 2012 coq-artifacts = buildVimPluginFrom2Nix { 2013 2013 pname = "coq.artifacts"; 2014 - version = "2022-11-01"; 2014 + version = "2022-11-04"; 2015 2015 src = fetchFromGitHub { 2016 2016 owner = "ms-jpq"; 2017 2017 repo = "coq.artifacts"; 2018 - rev = "47e6f18e8583f9d48c7e71e632ceb4121dc1d6cc"; 2019 - sha256 = "1k425fr1fmq6k7j16m0ylj0z3g11lcdjflw873ivw0wc9kkh6z47"; 2018 + rev = "4e80d710635ef4599391c5da355abe5680931469"; 2019 + sha256 = "0zhscd3l9f5a0dn1zbc60p101s8447qjsjxhwivbpdyryl14ydqw"; 2020 2020 }; 2021 2021 meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; 2022 2022 }; 2023 2023 2024 2024 coq-thirdparty = buildVimPluginFrom2Nix { 2025 2025 pname = "coq.thirdparty"; 2026 - version = "2022-11-01"; 2026 + version = "2022-11-04"; 2027 2027 src = fetchFromGitHub { 2028 2028 owner = "ms-jpq"; 2029 2029 repo = "coq.thirdparty"; 2030 - rev = "eb27fa28ab08dfaf8911d0ac7f1196d8bc0290cc"; 2031 - sha256 = "04ylxsg8xkc7ca4gj4j1r86wagjb8b8vhqwwjxan66igr6lhy2m0"; 2030 + rev = "079553e07ac79f6416e7751d388e90849d9f2e91"; 2031 + sha256 = "0aw779wcsak7ypq24kjras9bq3ynvxkl7s3mrn26ddpkcdrpkdlz"; 2032 2032 }; 2033 2033 meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; 2034 2034 }; ··· 2047 2047 2048 2048 coq_nvim = buildVimPluginFrom2Nix { 2049 2049 pname = "coq_nvim"; 2050 - version = "2022-11-01"; 2050 + version = "2022-11-04"; 2051 2051 src = fetchFromGitHub { 2052 2052 owner = "ms-jpq"; 2053 2053 repo = "coq_nvim"; 2054 - rev = "0fefc00e9082b9e80345dc7805b146a25773ac2f"; 2055 - sha256 = "1ffiyqz8yqq26v81sblgn1rf6f0nxsvlqcz3ag7bxlps24fdq48x"; 2054 + rev = "f1668e780b4fbc199ceac58ccba38be5fd5fe7c6"; 2055 + sha256 = "0qyam08y3j7z37iaajah2micq82a0jsl17qv4fjd7a2hamchzgcc"; 2056 2056 }; 2057 2057 meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; 2058 2058 }; ··· 2613 2613 2614 2614 dracula-nvim = buildVimPluginFrom2Nix { 2615 2615 pname = "dracula.nvim"; 2616 - version = "2022-10-31"; 2616 + version = "2022-11-02"; 2617 2617 src = fetchFromGitHub { 2618 2618 owner = "Mofiqul"; 2619 2619 repo = "dracula.nvim"; 2620 - rev = "09cbd3d9434c781674fafe4da03d616e35a49d51"; 2621 - sha256 = "06wan9q59bisd9sfdvh8rmw8vj1ahxa87r35gywlkask2jjzq83b"; 2620 + rev = "7ff76dd8248efeabb322fec87b22d33c129536fe"; 2621 + sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz"; 2622 2622 }; 2623 2623 meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; 2624 2624 }; ··· 2666 2666 owner = "editorconfig"; 2667 2667 repo = "editorconfig-vim"; 2668 2668 rev = "6bba2596601086ddfc882488b1444bf1ea43aab9"; 2669 - sha256 = "02a8v3z8kla7fsirl6lqk9ijj51flhn3mwb4dsc47k4fnpxr4qcp"; 2669 + sha256 = "16a1c1k9q6db99i0s7rm3j0g6wci8x41y71ky04hb9khqkzv3xm8"; 2670 2670 fetchSubmodules = true; 2671 2671 }; 2672 2672 meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; ··· 2872 2872 owner = "andviro"; 2873 2873 repo = "flake8-vim"; 2874 2874 rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; 2875 - sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3"; 2875 + sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; 2876 2876 fetchSubmodules = true; 2877 2877 }; 2878 2878 meta.homepage = "https://github.com/andviro/flake8-vim/"; ··· 3455 3455 3456 3456 haskell-tools-nvim = buildVimPluginFrom2Nix { 3457 3457 pname = "haskell-tools.nvim"; 3458 - version = "2022-11-01"; 3458 + version = "2022-11-04"; 3459 3459 src = fetchFromGitHub { 3460 3460 owner = "MrcJkb"; 3461 3461 repo = "haskell-tools.nvim"; 3462 - rev = "249bf253c58b9e70d24a02c5231a75f69d170abe"; 3463 - sha256 = "0qyfy5ll3rj1svp0ahbq1f3l3ywk02wm5b2d58ccgw6zfcwndm4y"; 3462 + rev = "f7fa54b4efec69fb0fe5379a2d42baed4629ae76"; 3463 + sha256 = "07h0mbaxxkpsp0549dd366249pql58yvns1ip4y5jndzq1164c1r"; 3464 3464 }; 3465 3465 meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; 3466 3466 }; ··· 3960 3960 3961 3961 lazy-lsp-nvim = buildVimPluginFrom2Nix { 3962 3962 pname = "lazy-lsp.nvim"; 3963 - version = "2022-10-20"; 3963 + version = "2022-11-02"; 3964 3964 src = fetchFromGitHub { 3965 3965 owner = "dundalek"; 3966 3966 repo = "lazy-lsp.nvim"; 3967 - rev = "20f66b6a1ce6b22b3c02d0f53c15dfa7c6a9f3c8"; 3968 - sha256 = "1yigp01qk2ljzb5sskgqic7igxwa4q8rkg4ga9czb3w4f84kpb09"; 3967 + rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9"; 3968 + sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga"; 3969 3969 }; 3970 3970 meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; 3971 3971 }; 3972 3972 3973 3973 lazygit-nvim = buildVimPluginFrom2Nix { 3974 3974 pname = "lazygit.nvim"; 3975 - version = "2022-10-25"; 3975 + version = "2022-11-02"; 3976 3976 src = fetchFromGitHub { 3977 3977 owner = "kdheepak"; 3978 3978 repo = "lazygit.nvim"; 3979 - rev = "c7a8bfb6062e57f3f7cc735720893f2706e6fc8e"; 3980 - sha256 = "1hn6llvqbmghjjygy9vwx3y31sra647f3ys9626c5zn4x7a09kgh"; 3979 + rev = "56045b4a0d8fa7bfee37411267ca5c6d3c1fe789"; 3980 + sha256 = "1xpq3adm1d1dpfns2p3abm111dschwjqqns7c55f2biig9f3lapl"; 3981 3981 }; 3982 3982 meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; 3983 3983 }; ··· 4584 4584 4585 4585 mini-nvim = buildVimPluginFrom2Nix { 4586 4586 pname = "mini.nvim"; 4587 - version = "2022-10-30"; 4587 + version = "2022-11-03"; 4588 4588 src = fetchFromGitHub { 4589 4589 owner = "echasnovski"; 4590 4590 repo = "mini.nvim"; 4591 - rev = "3d6128b8f7c90ef8cdb0ebb7ea2f96544fa8d060"; 4592 - sha256 = "1y514ysh0jgx9bjh5mcnmiic4m9jzz0w2jmlsf9n42hpazbi6z22"; 4591 + rev = "993e8d200ff6d2a354e717b2beb7b31bd91b2ee4"; 4592 + sha256 = "02gbnc28bg9sjhjmclwrkf2nh3spqibhan0xy0qdnlswms2cpp6s"; 4593 4593 }; 4594 4594 meta.homepage = "https://github.com/echasnovski/mini.nvim/"; 4595 4595 }; ··· 4956 4956 4957 4957 neodev-nvim = buildVimPluginFrom2Nix { 4958 4958 pname = "neodev.nvim"; 4959 - version = "2022-11-01"; 4959 + version = "2022-11-04"; 4960 4960 src = fetchFromGitHub { 4961 4961 owner = "folke"; 4962 4962 repo = "neodev.nvim"; 4963 - rev = "d9d2afc71ad32ed1edb2feecfa7c5b30ce78583a"; 4964 - sha256 = "0bgfq9lihw77x9xyfizi0p5ixf7nx0spn4v3y1469mkmgab9zfm1"; 4963 + rev = "d41f7e1713f3421c3c8f71c3fe4a026084227a5d"; 4964 + sha256 = "17ffq90vhy5w42h3vqczlxpvj7vxl5sznhbbmlf90psl3s1f20sf"; 4965 4965 }; 4966 4966 meta.homepage = "https://github.com/folke/neodev.nvim/"; 4967 4967 }; ··· 4980 4980 4981 4981 neogit = buildVimPluginFrom2Nix { 4982 4982 pname = "neogit"; 4983 - version = "2022-10-27"; 4983 + version = "2022-11-02"; 4984 4984 src = fetchFromGitHub { 4985 4985 owner = "TimUntersberger"; 4986 4986 repo = "neogit"; 4987 - rev = "1acb13c07b34622fe1054695afcecff537d9a00a"; 4988 - sha256 = "1wihkwfqhxvaxazn2wsd18jh8qd9cc2rc1m0rd2bw3ywm7jm24aw"; 4987 + rev = "71651625b0cccb95bd1ae152d26bcf26d96e5182"; 4988 + sha256 = "06xiqy490jxiayabi135c01vmpvbqm55c20lzczms1f2zcrblkny"; 4989 4989 }; 4990 4990 meta.homepage = "https://github.com/TimUntersberger/neogit/"; 4991 4991 }; ··· 5100 5100 5101 5101 neotest = buildVimPluginFrom2Nix { 5102 5102 pname = "neotest"; 5103 - version = "2022-10-27"; 5103 + version = "2022-11-03"; 5104 5104 src = fetchFromGitHub { 5105 5105 owner = "nvim-neotest"; 5106 5106 repo = "neotest"; 5107 - rev = "0be9899e859da147ad28c23a30a1df2081c16741"; 5108 - sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd"; 5107 + rev = "7721205f6b8afc0dc6fa6f1f79d228c3714d6b0e"; 5108 + sha256 = "1xldwbmhdm05iimxjsdw03j4xbhf46ia075zqyp6x5zz9gdvcqd0"; 5109 5109 }; 5110 5110 meta.homepage = "https://github.com/nvim-neotest/neotest/"; 5111 5111 }; 5112 5112 5113 5113 neotest-haskell = buildVimPluginFrom2Nix { 5114 5114 pname = "neotest-haskell"; 5115 - version = "2022-10-29"; 5115 + version = "2022-11-04"; 5116 5116 src = fetchFromGitHub { 5117 5117 owner = "MrcJkb"; 5118 5118 repo = "neotest-haskell"; 5119 - rev = "550815b39a306dddffd133c29a9f8a4907ef4f1a"; 5120 - sha256 = "1zxlqqn490sahv3kp0hkxwqmy1a5wm4qixs4gn67vd5xl2d1jprh"; 5119 + rev = "74b10216995909d442ce9ffb966ae3194a6da319"; 5120 + sha256 = "184aw9vdvahcxmnhq787yh8861ai1xsai784zfkgzz1pg4s7rvbk"; 5121 5121 }; 5122 5122 meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; 5123 5123 }; ··· 5364 5364 5365 5365 null-ls-nvim = buildVimPluginFrom2Nix { 5366 5366 pname = "null-ls.nvim"; 5367 - version = "2022-10-26"; 5367 + version = "2022-11-03"; 5368 5368 src = fetchFromGitHub { 5369 5369 owner = "jose-elias-alvarez"; 5370 5370 repo = "null-ls.nvim"; 5371 - rev = "f1add2302e6a01531a007c51054392d2029dbed4"; 5372 - sha256 = "050lx51x28msshjr4cq04l93brlswbx9w3kzdp35q7mxfmcr6cyg"; 5371 + rev = "1ac465b1617b28f753cb875d8ac1d0f23c0b96d4"; 5372 + sha256 = "1f67d5ban0k1902363k3arkfpwkgqj6w1plnxnn11w1w5y3kvj9d"; 5373 5373 }; 5374 5374 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; 5375 5375 }; ··· 5424 5424 5425 5425 nvim-base16 = buildVimPluginFrom2Nix { 5426 5426 pname = "nvim-base16"; 5427 - version = "2022-11-01"; 5427 + version = "2022-11-02"; 5428 5428 src = fetchFromGitHub { 5429 5429 owner = "RRethy"; 5430 5430 repo = "nvim-base16"; 5431 - rev = "a1010173d1cf2fa719618644c2373611ea379402"; 5432 - sha256 = "17pwi0haqj7f4d81i148y5p6k5fczj6898p828gjxjm5f0blk2pj"; 5431 + rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b"; 5432 + sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn"; 5433 5433 }; 5434 5434 meta.homepage = "https://github.com/RRethy/nvim-base16/"; 5435 5435 }; ··· 5616 5616 5617 5617 nvim-dap-ui = buildVimPluginFrom2Nix { 5618 5618 pname = "nvim-dap-ui"; 5619 - version = "2022-10-27"; 5619 + version = "2022-11-03"; 5620 5620 src = fetchFromGitHub { 5621 5621 owner = "rcarriga"; 5622 5622 repo = "nvim-dap-ui"; 5623 - rev = "f889edb4f2b7fafa2a8f8101aea2dc499849b2ec"; 5624 - sha256 = "18fi54hfybbywyafk0ik2bvgrl99i605qcs49i1a8gw3d6qx8zy1"; 5623 + rev = "6a8271505e95913b82305eff63406ef22baad778"; 5624 + sha256 = "139qh9m28zv11xy9rjplpwb4r7g4slxcwwfzvha53bzpshn0w2v6"; 5625 5625 }; 5626 5626 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; 5627 5627 }; ··· 5808 5808 5809 5809 nvim-lint = buildVimPluginFrom2Nix { 5810 5810 pname = "nvim-lint"; 5811 - version = "2022-10-31"; 5811 + version = "2022-11-02"; 5812 5812 src = fetchFromGitHub { 5813 5813 owner = "mfussenegger"; 5814 5814 repo = "nvim-lint"; 5815 - rev = "82f43b518460ff4e29f6b3b2b29018012cfd1a83"; 5816 - sha256 = "17ibqbpslzgccpv447dj7cjyysyhqr4nxysyi383k1rl4a46ksb4"; 5815 + rev = "56b6d3729e13c049901e0aa1bbea1b71e97b0cda"; 5816 + sha256 = "05j1r3lnq4955xlmhhkjf21qyyv6gj8xrsh61b5r8ys0m74ahx98"; 5817 5817 }; 5818 5818 meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; 5819 5819 }; ··· 5904 5904 5905 5905 nvim-navic = buildVimPluginFrom2Nix { 5906 5906 pname = "nvim-navic"; 5907 - version = "2022-10-29"; 5907 + version = "2022-11-02"; 5908 5908 src = fetchFromGitHub { 5909 5909 owner = "smiteshp"; 5910 5910 repo = "nvim-navic"; 5911 - rev = "eebc4f15132c587c52fcd2ce2f0da78fc19a16c0"; 5912 - sha256 = "1pwshw6r90ycc315f0savp2iid4rchqplphq9ms36nb4x36894mq"; 5911 + rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0"; 5912 + sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip"; 5913 5913 }; 5914 5914 meta.homepage = "https://github.com/smiteshp/nvim-navic/"; 5915 5915 }; ··· 6072 6072 6073 6073 nvim-treesitter = buildVimPluginFrom2Nix { 6074 6074 pname = "nvim-treesitter"; 6075 - version = "2022-11-01"; 6075 + version = "2022-11-03"; 6076 6076 src = fetchFromGitHub { 6077 6077 owner = "nvim-treesitter"; 6078 6078 repo = "nvim-treesitter"; 6079 - rev = "e7bdcee167ae41295a3e99ad460ae80d2bb961d7"; 6080 - sha256 = "1h2aab3zgw4q48pllx211kxqaa47ridfa8w610jb0594sqwhfynx"; 6079 + rev = "58f61e563fadd1788052586f4d6869a99022df3c"; 6080 + sha256 = "075645lkq6cr22kfab4kz7ay1cf5r0bg41r3nbhpdb52g1klrz5k"; 6081 6081 }; 6082 6082 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; 6083 6083 }; ··· 6312 6312 6313 6313 onedarkpro-nvim = buildVimPluginFrom2Nix { 6314 6314 pname = "onedarkpro.nvim"; 6315 - version = "2022-10-28"; 6315 + version = "2022-11-03"; 6316 6316 src = fetchFromGitHub { 6317 6317 owner = "olimorris"; 6318 6318 repo = "onedarkpro.nvim"; 6319 - rev = "62b12ba06cb617fdccfd1553f864e6492dcff2fa"; 6320 - sha256 = "1kvnycwid2s7iabaql3iwlin4n88czm56d0qd12hhz2sa6jrriy9"; 6319 + rev = "7610bd6b4d4a6e8b4de5c8c8d81f25de2682a7ab"; 6320 + sha256 = "07n36hlyavan02l7jf96lhkm629gkjc7d7lr6lc1fsibqzwfdxa2"; 6321 6321 }; 6322 6322 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; 6323 6323 }; ··· 6372 6372 6373 6373 orgmode = buildVimPluginFrom2Nix { 6374 6374 pname = "orgmode"; 6375 - version = "2022-10-23"; 6375 + version = "2022-11-03"; 6376 6376 src = fetchFromGitHub { 6377 6377 owner = "nvim-orgmode"; 6378 6378 repo = "orgmode"; 6379 - rev = "2479971860e1237e4f0dafb6cbf412dfc8a3d89c"; 6380 - sha256 = "1bjxmlrjpgsc70yjphb8y0mkyyy3amk49j4jsbjyh2qzdfh4bghs"; 6379 + rev = "da9a0cf060ccb27927f234a74714a74277c858f1"; 6380 + sha256 = "0glps3xlg2pd1gwzmpwvrq3ylcw4mzjwgdq4agdjjl6bh41vdjdq"; 6381 6381 }; 6382 6382 meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; 6383 6383 }; ··· 6642 6642 owner = "python-mode"; 6643 6643 repo = "python-mode"; 6644 6644 rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; 6645 - sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw"; 6645 + sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; 6646 6646 fetchSubmodules = true; 6647 6647 }; 6648 6648 meta.homepage = "https://github.com/python-mode/python-mode/"; ··· 6662 6662 6663 6663 pywal-nvim = buildVimPluginFrom2Nix { 6664 6664 pname = "pywal.nvim"; 6665 - version = "2022-09-11"; 6665 + version = "2022-11-03"; 6666 6666 src = fetchFromGitHub { 6667 6667 owner = "AlphaTechnolog"; 6668 6668 repo = "pywal.nvim"; 6669 - rev = "c10ea0b90bc049f882517a65fedbef18ba8f8511"; 6670 - sha256 = "1irbzhw1yrds80sncqadz7d2k9xr66h3zs8pnx0malfpvgs41fyk"; 6669 + rev = "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9"; 6670 + sha256 = "00lfnbaw83iic68mvlgj75qp384g3xa5mjdhw2xmhnapghjgyv14"; 6671 6671 }; 6672 6672 meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; 6673 6673 }; ··· 6806 6806 6807 6807 registers-nvim = buildVimPluginFrom2Nix { 6808 6808 pname = "registers.nvim"; 6809 - version = "2022-11-01"; 6809 + version = "2022-11-03"; 6810 6810 src = fetchFromGitHub { 6811 6811 owner = "tversteeg"; 6812 6812 repo = "registers.nvim"; 6813 - rev = "395e119782845fe8fa3b7d6d17c60745a2004515"; 6814 - sha256 = "0lxfs4rvnvgc7qmcyqspgza70m66khck57fx80v4d6whz9c5ncav"; 6813 + rev = "cacd595e794451ce2836539cff6ce0c0c45db046"; 6814 + sha256 = "19cwkwmbb626972k8svhm04aiqw174q953bsqxsx72d5sscaisss"; 6815 6815 }; 6816 6816 meta.homepage = "https://github.com/tversteeg/registers.nvim/"; 6817 6817 }; ··· 6830 6830 6831 6831 rest-nvim = buildNeovimPluginFrom2Nix { 6832 6832 pname = "rest.nvim"; 6833 - version = "2022-09-24"; 6833 + version = "2022-11-03"; 6834 6834 src = fetchFromGitHub { 6835 6835 owner = "rest-nvim"; 6836 6836 repo = "rest.nvim"; 6837 - rev = "4a23d38726c0b3c5a2de9f927de5b0b518bdf4f7"; 6838 - sha256 = "10s74zwpr9wnnwjvh079g1k9ffnjpbzpxazwbpr55z9ln02sc2vs"; 6837 + rev = "3d4bec4754b41fa1d1a2fe145cdcf3b269b3323a"; 6838 + sha256 = "0znrslxik741p8cncf60iii3v9x7ln629wixvm0cm4c6g1mk0x4x"; 6839 6839 }; 6840 6840 meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; 6841 6841 }; ··· 7312 7312 7313 7313 srcery-vim = buildVimPluginFrom2Nix { 7314 7314 pname = "srcery-vim"; 7315 - version = "2022-06-08"; 7315 + version = "2022-11-02"; 7316 7316 src = fetchFromGitHub { 7317 7317 owner = "srcery-colors"; 7318 7318 repo = "srcery-vim"; 7319 - rev = "0ff514ff249d0e6b6cc4702d6606f196e3827fc8"; 7320 - sha256 = "0l5j9y414nxxiw0vxcygxfd09hn1wbwh3d6a735n6n3kn3z42ww5"; 7319 + rev = "cdb0bc36fda80eb58d38ecddfb1c7b2fab3a4d53"; 7320 + sha256 = "0x055kynvxym614vzxi1vv2zcndfadzjhwk92f4h6z5zvld7fpxj"; 7321 7321 }; 7322 7322 meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; 7323 7323 }; ··· 7505 7505 7506 7506 tabby-nvim = buildVimPluginFrom2Nix { 7507 7507 pname = "tabby.nvim"; 7508 - version = "2022-10-17"; 7508 + version = "2022-11-02"; 7509 7509 src = fetchFromGitHub { 7510 7510 owner = "nanozuki"; 7511 7511 repo = "tabby.nvim"; 7512 - rev = "18c8effd11f801793e1a8b9adb4d6ef7fbedf57b"; 7513 - sha256 = "0r68260gc5ln2z338mm7xb4v4y3p8xzkx1wlwagqp35dhgrl2kpn"; 7512 + rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8"; 7513 + sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a"; 7514 7514 }; 7515 7515 meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; 7516 7516 }; ··· 7546 7546 owner = "codota"; 7547 7547 repo = "tabnine-vim"; 7548 7548 rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; 7549 - sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq"; 7549 + sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; 7550 7550 fetchSubmodules = true; 7551 7551 }; 7552 7552 meta.homepage = "https://github.com/codota/tabnine-vim/"; ··· 7795 7795 7796 7796 telescope-manix = buildVimPluginFrom2Nix { 7797 7797 pname = "telescope-manix"; 7798 - version = "2022-10-19"; 7798 + version = "2022-11-04"; 7799 7799 src = fetchFromGitHub { 7800 7800 owner = "MrcJkb"; 7801 7801 repo = "telescope-manix"; 7802 - rev = "9f91408328be8719ca1f6c49a3ccc1df6392d5e9"; 7803 - sha256 = "03wkgmwq3fl92bd4d33ahfp328pdwcmpw0pcjqf9cfaplpi0fzk2"; 7802 + rev = "700279d1d8bc0267404672d2927b522e7ca87ee3"; 7803 + sha256 = "0d10lci5wf84wlixxqnrhn3frl735s5jmzg2yz2l79h37k84xydl"; 7804 7804 }; 7805 7805 meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; 7806 7806 }; ··· 8120 8120 8121 8121 toggleterm-nvim = buildVimPluginFrom2Nix { 8122 8122 pname = "toggleterm.nvim"; 8123 - version = "2022-10-26"; 8123 + version = "2022-11-03"; 8124 8124 src = fetchFromGitHub { 8125 8125 owner = "akinsho"; 8126 8126 repo = "toggleterm.nvim"; 8127 - rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3"; 8128 - sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3"; 8127 + rev = "3ba683827c623affb4d9aa518e97b34db2623093"; 8128 + sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41"; 8129 8129 }; 8130 8130 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; 8131 8131 }; ··· 8744 8744 8745 8745 vim-airline-themes = buildVimPluginFrom2Nix { 8746 8746 pname = "vim-airline-themes"; 8747 - version = "2022-09-26"; 8747 + version = "2022-11-03"; 8748 8748 src = fetchFromGitHub { 8749 8749 owner = "vim-airline"; 8750 8750 repo = "vim-airline-themes"; 8751 - rev = "cc5d3490c8f4c87d29d97df414941a9df8ceb390"; 8752 - sha256 = "13lslv7rr3ixcjgkklds2zsk9b0p9sx9lpl3fwzdnkcgh1x91vn8"; 8751 + rev = "5552f5e9aa1db1b8d588b9a645a88394452d2b05"; 8752 + sha256 = "0bzspa5mrhs52x9q6kxkwbxvqg79myim15jg35rf517sraga5v8s"; 8753 8753 }; 8754 8754 meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; 8755 8755 }; ··· 9824 9824 9825 9825 vim-floaterm = buildVimPluginFrom2Nix { 9826 9826 pname = "vim-floaterm"; 9827 - version = "2022-10-30"; 9827 + version = "2022-11-03"; 9828 9828 src = fetchFromGitHub { 9829 9829 owner = "voldikss"; 9830 9830 repo = "vim-floaterm"; 9831 - rev = "20cbfc777b783fd93259c83c96eef4a35c6ddbcd"; 9832 - sha256 = "02zwq4hq7zpqhmkir16bms8agvydc6fy51sgw6ycqib0hvsb34cd"; 9831 + rev = "280b34a0760801168a67f952542b6c49292aa5f3"; 9832 + sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw"; 9833 9833 }; 9834 9834 meta.homepage = "https://github.com/voldikss/vim-floaterm/"; 9835 9835 }; ··· 10341 10341 10342 10342 vim-illuminate = buildVimPluginFrom2Nix { 10343 10343 pname = "vim-illuminate"; 10344 - version = "2022-11-01"; 10344 + version = "2022-11-02"; 10345 10345 src = fetchFromGitHub { 10346 10346 owner = "RRethy"; 10347 10347 repo = "vim-illuminate"; 10348 - rev = "7a4eccd0fffe8b5dd14ad0d0400d3eab6d80c4b3"; 10349 - sha256 = "0a0d16vjr23a3q6mmz653xn1hmnd7h8dbkldvmsr4dx0spqfydp8"; 10348 + rev = "fb83d835eac50baeef49aac20c524a80727db0ac"; 10349 + sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n"; 10350 10350 }; 10351 10351 meta.homepage = "https://github.com/RRethy/vim-illuminate/"; 10352 10352 }; ··· 10810 10810 10811 10811 vim-maktaba = buildVimPluginFrom2Nix { 10812 10812 pname = "vim-maktaba"; 10813 - version = "2022-10-31"; 10813 + version = "2022-11-02"; 10814 10814 src = fetchFromGitHub { 10815 10815 owner = "google"; 10816 10816 repo = "vim-maktaba"; 10817 - rev = "88ad116a4b2b4777ce4d0ecf214963a0c9b4fd06"; 10818 - sha256 = "07mhpr326rjfh47izx4c9hdkb5zhpbl01k0h4bbi1lxbzvsxgs9k"; 10817 + rev = "5d416e84d024538f5e5cf25c394d081802f0a35e"; 10818 + sha256 = "13filvmaxr0dvc44f3ah80g8jhkrn3rqkwqj1a7wxjv6a6xa083z"; 10819 10819 }; 10820 10820 meta.homepage = "https://github.com/google/vim-maktaba/"; 10821 10821 }; ··· 12854 12854 pname = "vim-yapf"; 12855 12855 version = "2018-10-04"; 12856 12856 src = fetchFromGitHub { 12857 - owner = "mindriot101"; 12857 + owner = "simonrw"; 12858 12858 repo = "vim-yapf"; 12859 12859 rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad"; 12860 12860 sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80"; 12861 12861 }; 12862 - meta.homepage = "https://github.com/mindriot101/vim-yapf/"; 12862 + meta.homepage = "https://github.com/simonrw/vim-yapf/"; 12863 12863 }; 12864 12864 12865 12865 vim2hs = buildVimPluginFrom2Nix { ··· 13021 13021 13022 13022 vimtex = buildVimPluginFrom2Nix { 13023 13023 pname = "vimtex"; 13024 - version = "2022-10-31"; 13024 + version = "2022-11-03"; 13025 13025 src = fetchFromGitHub { 13026 13026 owner = "lervag"; 13027 13027 repo = "vimtex"; 13028 - rev = "e148cf1fdc817b6668263817634538d09bafd115"; 13029 - sha256 = "15iikf6w8x75g7wjdp469rsxraz883387cxlahc0zsl0bdbylv5q"; 13028 + rev = "06c47edcc2c44c1ca87a2c04a411cf0c0bd39a14"; 13029 + sha256 = "0gkq4j2cwc6a4mhhyd3ivkc5qj6m9p4jg469za4v5g1v59w22pch"; 13030 13030 }; 13031 13031 meta.homepage = "https://github.com/lervag/vimtex/"; 13032 13032 }; ··· 13382 13382 13383 13383 catppuccin-nvim = buildVimPluginFrom2Nix { 13384 13384 pname = "catppuccin-nvim"; 13385 - version = "2022-10-31"; 13385 + version = "2022-11-03"; 13386 13386 src = fetchFromGitHub { 13387 13387 owner = "catppuccin"; 13388 13388 repo = "nvim"; 13389 - rev = "c4f0f1a88304378cb76ac0a0c00a99f6d58f972f"; 13389 + rev = "72540852ca00d7842ea1123635aecb9353192f0b"; 13390 13390 sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg"; 13391 13391 }; 13392 13392 meta.homepage = "https://github.com/catppuccin/nvim/"; ··· 13406 13406 13407 13407 chad = buildVimPluginFrom2Nix { 13408 13408 pname = "chad"; 13409 - version = "2022-11-01"; 13409 + version = "2022-11-04"; 13410 13410 src = fetchFromGitHub { 13411 13411 owner = "ms-jpq"; 13412 13412 repo = "chadtree"; 13413 - rev = "d7b2c15268ffbb4dedebbda34b702c89b2cd782a"; 13414 - sha256 = "1r53lz0vmfii82mchh0hlzs0zg7d7sjxiihv2bwlapwzwmdp2n4k"; 13413 + rev = "5ec88a8374cd7e2564ffeaa27f82dd75229312d2"; 13414 + sha256 = "1swic358xzzmw0pxp7x2r35yf70ivbg83fljk8p3qi7s9pr0ngr8"; 13415 13415 }; 13416 13416 meta.homepage = "https://github.com/ms-jpq/chadtree/"; 13417 13417 };
+36 -43
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
··· 25 25 }; 26 26 bash = buildGrammar { 27 27 language = "bash"; 28 - version = "f1a86d3"; 28 + version = "77cf8a7"; 29 29 source = fetchFromGitHub { 30 30 owner = "tree-sitter"; 31 31 repo = "tree-sitter-bash"; 32 - rev = "f1a86d3cc5aeeb67e0e52442e893af7f813025b4"; 33 - hash = "sha256-zzHA+kGw67WFyPVFRWRyKmhAjxp5jkv0K2yhGxNfFM4="; 32 + rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b"; 33 + hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY="; 34 34 }; 35 35 }; 36 36 beancount = buildGrammar { ··· 503 503 }; 504 504 help = buildGrammar { 505 505 language = "help"; 506 - version = "8df3266"; 506 + version = "49cdef5"; 507 507 source = fetchFromGitHub { 508 508 owner = "neovim"; 509 509 repo = "tree-sitter-vimdoc"; 510 - rev = "8df3266b423d24c9ac3f3b4b9928e65eb1e5e741"; 511 - hash = "sha256-t9SHuymK5pYlryWGpORGPYLgPZ3xBx0XH69s5RtRnEI="; 510 + rev = "49cdef52ded4a886bf34bc474876b09f9270d48f"; 511 + hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc="; 512 512 }; 513 513 }; 514 514 hjson = buildGrammar { ··· 633 633 }; 634 634 julia = buildGrammar { 635 635 language = "julia"; 636 - version = "0572ceb"; 636 + version = "8fb38ab"; 637 637 source = fetchFromGitHub { 638 638 owner = "tree-sitter"; 639 639 repo = "tree-sitter-julia"; 640 - rev = "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c"; 641 - hash = "sha256-hN3wZJa7oXEUgdJfN0o2EoTYBsE1UZjGYfFYlGjjvO8="; 640 + rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25"; 641 + hash = "sha256-G619Zlb2uL2PskYKNqoG6XXBxRipeGFU4eOLw7u3BRo="; 642 642 }; 643 643 }; 644 644 kotlin = buildGrammar { 645 645 language = "kotlin"; 646 - version = "a4f71eb"; 646 + version = "b953dbd"; 647 647 source = fetchFromGitHub { 648 648 owner = "fwcd"; 649 649 repo = "tree-sitter-kotlin"; 650 - rev = "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569"; 651 - hash = "sha256-aRMqhmZKbKoggtBOgtFIq0xTP+PgeD3Qz6DPJsAFPRQ="; 650 + rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; 651 + hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; 652 652 }; 653 653 }; 654 654 lalrpop = buildGrammar { ··· 693 693 }; 694 694 lua = buildGrammar { 695 695 language = "lua"; 696 - version = "887dfd4"; 696 + version = "fb30e8c"; 697 697 source = fetchFromGitHub { 698 698 owner = "MunifTanjim"; 699 699 repo = "tree-sitter-lua"; 700 - rev = "887dfd4e83c469300c279314ff1619b1d0b85b91"; 701 - hash = "sha256-5i+UN6Es+K7KDD1qz3ZrVn8IfGdTswcISUyV2sGtY9M="; 700 + rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320"; 701 + hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI="; 702 702 }; 703 703 }; 704 704 m68k = buildGrammar { ··· 731 731 hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; 732 732 }; 733 733 location = "tree-sitter-markdown"; 734 - 735 734 }; 736 735 markdown_inline = buildGrammar { 737 736 language = "markdown_inline"; ··· 743 742 hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; 744 743 }; 745 744 location = "tree-sitter-markdown-inline"; 746 - 747 745 }; 748 746 menhir = buildGrammar { 749 747 language = "menhir"; ··· 815 813 hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; 816 814 }; 817 815 location = "ocaml"; 818 - 819 816 }; 820 817 ocaml_interface = buildGrammar { 821 818 language = "ocaml_interface"; ··· 827 824 hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; 828 825 }; 829 826 location = "interface"; 830 - 831 827 }; 832 828 ocamllex = buildGrammar { 833 829 language = "ocamllex"; ··· 983 979 }; 984 980 racket = buildGrammar { 985 981 language = "racket"; 986 - version = "b9b2e74"; 982 + version = "69ca563"; 987 983 source = fetchFromGitHub { 988 984 owner = "6cdh"; 989 985 repo = "tree-sitter-racket"; 990 - rev = "b9b2e7454d7098e44595dd8c1b471b9d1518b910"; 991 - hash = "sha256-DxwbIhyCx+E0kDztPQFBa9x65ssKzsMh7vY+TpP3dTM="; 986 + rev = "69ca563af3bcf9d67220532e0814786f2dc34db1"; 987 + hash = "sha256-GLBi/NM7dFsPtmZWbFm/vM0gOwqbihOqXnxMR5k8hWE="; 992 988 }; 993 989 }; 994 990 rasi = buildGrammar { ··· 1043 1039 }; 1044 1040 ruby = buildGrammar { 1045 1041 language = "ruby"; 1046 - version = "252ca18"; 1042 + version = "c919603"; 1047 1043 source = fetchFromGitHub { 1048 1044 owner = "tree-sitter"; 1049 1045 repo = "tree-sitter-ruby"; 1050 - rev = "252ca18be76b0918fb6b34c302292b6931876c25"; 1051 - hash = "sha256-8UWHLVrSxQM6iT+tN+2PwTs43n+Z69c0DVnDE3yfqKo="; 1046 + rev = "c91960320d0f337bdd48308a8ad5500bd2616979"; 1047 + hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE="; 1052 1048 }; 1053 1049 }; 1054 1050 rust = buildGrammar { ··· 1123 1119 }; 1124 1120 sql = buildGrammar { 1125 1121 language = "sql"; 1126 - version = "2743c7b"; 1122 + version = "70c5026"; 1127 1123 source = fetchFromGitHub { 1128 1124 owner = "derekstride"; 1129 1125 repo = "tree-sitter-sql"; 1130 - rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f"; 1131 - hash = "sha256-lhQxFXphS97tITDosG/pGe85osV4CweW44ulmCd+CxQ="; 1126 + rev = "70c50264ae022193adb364ffa7a767d765ed9857"; 1127 + hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs="; 1132 1128 }; 1133 1129 }; 1134 1130 supercollider = buildGrammar { ··· 1163 1159 }; 1164 1160 swift = buildGrammar { 1165 1161 language = "swift"; 1166 - version = "c88b5d7"; 1162 + version = "d7808f0"; 1167 1163 source = fetchFromGitHub { 1168 1164 owner = "alex-pinkus"; 1169 1165 repo = "tree-sitter-swift"; 1170 1166 nativeBuildInputs = [ nodejs tree-sitter ]; 1171 1167 postFetch = "pushd $out && tree-sitter generate && popd"; 1172 - rev = "c88b5d73f193f5b0762b1a5f0299a275e6a728fb"; 1173 - hash = "sha256-OfFMGxL72SPZW4AtHoThhYtjmKWabStLKAB9TxmjMDw="; 1168 + rev = "d7808f030a44dc8768948042baa7566949785e2f"; 1169 + hash = "sha256-7Gjpf2isOpeOV3ZMTMibK+F4C4v8ywOPin2Wv86s+AM="; 1174 1170 }; 1175 1171 }; 1176 1172 sxhkdrc = buildGrammar { ··· 1245 1241 hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; 1246 1242 }; 1247 1243 location = "tsx"; 1248 - 1249 1244 }; 1250 1245 turtle = buildGrammar { 1251 1246 language = "turtle"; ··· 1259 1254 }; 1260 1255 twig = buildGrammar { 1261 1256 language = "twig"; 1262 - version = "6a01f20"; 1257 + version = "035f549"; 1263 1258 source = fetchFromGitHub { 1264 1259 owner = "gbprod"; 1265 1260 repo = "tree-sitter-twig"; 1266 - rev = "6a01f20e73038300d205d370212c361949be3035"; 1267 - hash = "sha256-M+57mGl4Sgn0yUGAyxHxE6ShR+E/ki4m8/x/f/KHetA="; 1261 + rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91"; 1262 + hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20="; 1268 1263 }; 1269 1264 }; 1270 1265 typescript = buildGrammar { ··· 1277 1272 hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; 1278 1273 }; 1279 1274 location = "typescript"; 1280 - 1281 1275 }; 1282 1276 v = buildGrammar { 1283 1277 language = "v"; ··· 1289 1283 hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y="; 1290 1284 }; 1291 1285 location = "tree_sitter_v"; 1292 - 1293 1286 }; 1294 1287 vala = buildGrammar { 1295 1288 language = "vala"; ··· 1313 1306 }; 1314 1307 vim = buildGrammar { 1315 1308 language = "vim"; 1316 - version = "9736af8"; 1309 + version = "4ae7bd6"; 1317 1310 source = fetchFromGitHub { 1318 1311 owner = "vigoux"; 1319 1312 repo = "tree-sitter-viml"; 1320 - rev = "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc"; 1321 - hash = "sha256-cptSrA+EOfntdW9V8qt3pg3PUK7uSwex7OS4XVnwItI="; 1313 + rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f"; 1314 + hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA="; 1322 1315 }; 1323 1316 }; 1324 1317 vue = buildGrammar { ··· 1363 1356 }; 1364 1357 zig = buildGrammar { 1365 1358 language = "zig"; 1366 - version = "b1803f2"; 1359 + version = "d90d38d"; 1367 1360 source = fetchFromGitHub { 1368 1361 owner = "maxxnino"; 1369 1362 repo = "tree-sitter-zig"; 1370 - rev = "b1803f2a665d228f968a831eac4fcc07a377c7bc"; 1371 - hash = "sha256-WLfecfqwCNh/IPPfmZ55XgsY6cLv62ad0Xhh9pUW3nw="; 1363 + rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; 1364 + hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; 1372 1365 }; 1373 1366 }; 1374 1367 }
+24 -2
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
··· 3 3 self: super: 4 4 5 5 let 6 - builtGrammars = callPackage ./generated.nix { 6 + generatedGrammars = callPackage ./generated.nix { 7 7 buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; 8 8 }; 9 9 10 - allGrammars = lib.filter lib.isDerivation (lib.attrValues builtGrammars); 10 + generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; 11 + 12 + # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins` 13 + # for example, for ocaml_interface, the following aliases will be added 14 + # ocaml-interface 15 + # tree-sitter-ocaml-interface 16 + # tree-sitter-ocaml_interface 17 + builtGrammars = generatedGrammars // lib.listToAttrs 18 + (lib.concatLists (lib.mapAttrsToList 19 + (k: v: 20 + let 21 + replaced = lib.replaceStrings [ "_" ] [ "-" ] k; 22 + in 23 + map (lib.flip lib.nameValuePair v) 24 + ([ ("tree-sitter-${k}") ] ++ lib.optionals (k != replaced) [ 25 + replaced 26 + "tree-sitter-${replaced}" 27 + ])) 28 + generatedDerivations)); 29 + 30 + allGrammars = lib.attrValues generatedDerivations; 11 31 12 32 # Usage: 13 33 # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ]) ··· 34 54 35 55 withAllGrammars = withPlugins (_: allGrammars); 36 56 }; 57 + 58 + meta.maintainers = with lib.maintainers; [ figsoda ]; 37 59 } 38 60
+3 -4
pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
··· 4 4 import json 5 5 import re 6 6 import subprocess 7 - from os import getenv 7 + from os import environ 8 8 from os.path import dirname, join 9 9 10 - lockfile = json.load(open(join(getenv("NVIM_TREESITTER"), "lockfile.json"))) 10 + lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json"))) 11 11 12 12 configs = json.loads( 13 13 subprocess.check_output( ··· 98 98 location = info.get("location") 99 99 if location: 100 100 generated += f""" 101 - location = "{location}"; 102 - """ 101 + location = "{location}";""" 103 102 104 103 generated += """ 105 104 };
+25 -3
pkgs/applications/editors/vscode/extensions/default.nix
··· 1244 1244 mktplcRef = { 1245 1245 publisher = "github"; 1246 1246 name = "copilot"; 1247 - version = "1.46.6822"; 1248 - sha256 = "sha256-L71mC0190ZubqNVliu7es4SDsBTGVokePpcNupABI8Q="; 1247 + version = "1.56.7152"; 1248 + sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM="; 1249 1249 }; 1250 - meta = { license = lib.licenses.unfree; }; 1250 + meta = with lib; { 1251 + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; 1252 + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; 1253 + homepage = "https://github.com/features/copilot"; 1254 + license = licenses.unfree; 1255 + maintainers = with maintainers; [ Zimmi48 ]; 1256 + }; 1251 1257 }; 1252 1258 1253 1259 github-vscode-theme = buildVscodeMarketplaceExtension { ··· 1676 1682 changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; 1677 1683 license = licenses.mit; 1678 1684 maintainers = with maintainers; [ kamadorueda ]; 1685 + }; 1686 + }; 1687 + 1688 + maximedenes.vscoq = buildVscodeMarketplaceExtension { 1689 + mktplcRef = { 1690 + publisher = "maximedenes"; 1691 + name = "vscoq"; 1692 + version = "0.3.6"; 1693 + sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek="; 1694 + }; 1695 + meta = with lib; { 1696 + description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; 1697 + downloadPage = "https://marketplace.visualstudio.com/items?itemName=maximedenes.vscoq"; 1698 + homepage = "https://github.com/coq-community/vscoq"; 1699 + license = licenses.mit; 1700 + maintainers = with maintainers; [ Zimmi48 ]; 1679 1701 }; 1680 1702 }; 1681 1703
+2 -2
pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
··· 7 7 mktplcRef = { 8 8 name = "jupyter"; 9 9 publisher = "ms-toolsai"; 10 - version = "2022.5.1001411044"; 11 - sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p"; 10 + version = "2022.9.1202862440"; 11 + sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc="; 12 12 }; 13 13 14 14 nativeBuildInputs = [
+2 -2
pkgs/applications/editors/vscode/extensions/python/default.nix
··· 19 19 mktplcRef = { 20 20 name = "python"; 21 21 publisher = "ms-python"; 22 - version = "2022.15.12711056"; 23 - sha256 = "sha256-bksUMN+ZdkmElVD8BC4ihklQyWlKkcpep2VOwUzISnQ="; 22 + version = "2022.17.13011006"; 23 + sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M="; 24 24 }; 25 25 26 26 buildInputs = [ icu ];
+53 -27
pkgs/applications/networking/browsers/firefox/wrapper.nix
··· 166 166 in stdenv.mkDerivation { 167 167 inherit pname version; 168 168 169 - desktopItem = makeDesktopItem { 169 + desktopItem = makeDesktopItem ({ 170 170 name = applicationName; 171 171 exec = "${launcherName} %U"; 172 172 inherit icon; 173 173 desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; 174 - genericName = "Web Browser"; 175 - categories = [ "Network" "WebBrowser" ]; 176 - mimeTypes = [ 177 - "text/html" 178 - "text/xml" 179 - "application/xhtml+xml" 180 - "application/vnd.mozilla.xul+xml" 181 - "x-scheme-handler/http" 182 - "x-scheme-handler/https" 183 - "x-scheme-handler/ftp" 184 - ]; 174 + startupNotify = true; 185 175 startupWMClass = wmClass; 186 - actions = { 187 - new-window = { 188 - name = "New Window"; 189 - exec = "${launcherName} --new-window %U"; 190 - }; 191 - new-private-window = { 192 - name = "New Private Window"; 193 - exec = "${launcherName} --private-window %U"; 194 - }; 195 - profile-manager-window = { 196 - name = "Profile Manager"; 197 - exec = "${launcherName} --ProfileManger"; 198 - }; 199 - }; 200 - }; 176 + terminal = false; 177 + } // (if libName == "thunderbird" 178 + then { 179 + genericName = "Email Client"; 180 + comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; 181 + categories = [ 182 + "Network" "Chat" "Email" "Feed" "GTK" "News" 183 + ]; 184 + keywords = [ 185 + "mail" "email" "e-mail" "messages" "rss" "calendar" 186 + "address book" "addressbook" "chat" 187 + ]; 188 + mimeTypes = [ 189 + "message/rfc822" 190 + "x-scheme-handler/mailto" 191 + "text/calendar" 192 + "text/x-vcard" 193 + ]; 194 + actions = { 195 + profile-manager-window = { 196 + name = "Profile Manager"; 197 + exec = "${launcherName} --ProfileManger"; 198 + }; 199 + }; 200 + } 201 + else { 202 + genericName = "Web Browser"; 203 + categories = [ "Network" "WebBrowser" ]; 204 + mimeTypes = [ 205 + "text/html" 206 + "text/xml" 207 + "application/xhtml+xml" 208 + "application/vnd.mozilla.xul+xml" 209 + "x-scheme-handler/http" 210 + "x-scheme-handler/https" 211 + ]; 212 + actions = { 213 + new-window = { 214 + name = "New Window"; 215 + exec = "${launcherName} --new-window %U"; 216 + }; 217 + new-private-window = { 218 + name = "New Private Window"; 219 + exec = "${launcherName} --private-window %U"; 220 + }; 221 + profile-manager-window = { 222 + name = "Profile Manager"; 223 + exec = "${launcherName} --ProfileManger"; 224 + }; 225 + }; 226 + })); 201 227 202 228 nativeBuildInputs = [ makeWrapper lndir jq ]; 203 229 buildInputs = [ browser.gtk3 ];
+2 -2
pkgs/applications/networking/cluster/cilium/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "cilium-cli"; 5 - version = "0.12.5"; 5 + version = "0.12.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cilium"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-VChonOHnif9Rz0pLg+nGt5jFT4wLIQq/C64zBlP/w0w="; 11 + sha256 = "sha256-w9U8+TYU9BQ2w/jSbDo6lEAlIuMOoCjO9fWhywyVbEk="; 12 12 }; 13 13 14 14 vendorSha256 = null;
+33
pkgs/applications/science/astronomy/calcmysky/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , wrapQtAppsHook 6 + , glm 7 + , eigen 8 + , qtbase 9 + }: 10 + 11 + stdenv.mkDerivation rec { 12 + pname = "calcmysky"; 13 + version = "0.1.0"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "10110111"; 17 + repo = "CalcMySky"; 18 + rev = "v${version}"; 19 + hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48="; 20 + }; 21 + 22 + nativeBuildInputs = [ cmake wrapQtAppsHook ]; 23 + buildInputs = [ glm eigen qtbase ]; 24 + 25 + doCheck = true; 26 + 27 + meta = with lib;{ 28 + description = "Simulator of light scattering by planetary atmospheres"; 29 + homepage = "https://github.com/10110111/CalcMySky"; 30 + license = licenses.gpl3Only; 31 + maintainers = with maintainers; [ nickcao ]; 32 + }; 33 + }
+35 -9
pkgs/applications/science/astronomy/stellarium/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub 2 - , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv 3 - , qtscript, qtserialport, qttools, qtcharts 4 - , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , perl 6 + , wrapQtAppsHook 7 + , qtbase 8 + , qtcharts 9 + , qtlocation 10 + , qtmultimedia 11 + , qtscript 12 + , qtserialport 13 + , qtwebengine 14 + , calcmysky 15 + , qxlsx 16 + , indilib 17 + , libnova 5 18 }: 6 19 7 20 stdenv.mkDerivation rec { 8 21 pname = "stellarium"; 9 - version = "0.22.2"; 22 + version = "1.0"; 10 23 11 24 src = fetchFromGitHub { 12 25 owner = "Stellarium"; 13 26 repo = "stellarium"; 14 27 rev = "v${version}"; 15 - sha256 = "sha256-FBH5IB1keMzRP06DQK2e7HX8rwm5/sdTX+cB80uG0vw="; 28 + sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE="; 16 29 }; 17 30 18 - nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; 31 + nativeBuildInputs = [ 32 + cmake 33 + perl 34 + wrapQtAppsHook 35 + ]; 19 36 20 37 buildInputs = [ 21 - freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools 22 - qtmultimedia qtlocation qtbase qtcharts 38 + qtbase 39 + qtcharts 40 + qtlocation 41 + qtmultimedia 42 + qtscript 43 + qtserialport 44 + qtwebengine 45 + calcmysky 46 + qxlsx 47 + indilib 48 + libnova 23 49 ]; 24 50 25 51 preConfigure = lib.optionalString stdenv.isDarwin ''
+25
pkgs/applications/science/biology/seqkit/default.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , buildGoModule 4 + }: 5 + 6 + buildGoModule rec { 7 + pname = "seqkit"; 8 + version = "2.3.1"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "shenwei356"; 12 + repo = "seqkit"; 13 + rev = "v${version}"; 14 + sha256 = "sha256-2DWb6PIYT9VfJeqbZ9+E1jk/xJ2+h0GARKF6XWdMhkI="; 15 + }; 16 + 17 + vendorSha256 = "sha256-RQNthtPYuOSCenA0hs5EhybimrftjEJlQNkfnKGXTiM="; 18 + 19 + meta = with lib; { 20 + description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; 21 + homepage = "https://github.com/shenwei356/seqkit"; 22 + license = licenses.mit; 23 + maintainers = with maintainers; [ bzizou ]; 24 + }; 25 + }
+59
pkgs/applications/science/logic/surelog/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , python3 6 + , pkg-config 7 + , libuuid 8 + , openjdk11 9 + , gperftools 10 + }: 11 + 12 + stdenv.mkDerivation rec { 13 + pname = "surelog"; 14 + version = "1.40"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "chipsalliance"; 18 + repo = pname; 19 + rev = "v${version}"; 20 + hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k="; 21 + fetchSubmodules = true; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + cmake 26 + pkg-config 27 + openjdk11 28 + (python3.withPackages (p: with p; [ 29 + psutil 30 + orderedmultidict 31 + ])) 32 + ]; 33 + 34 + buildInputs = [ 35 + libuuid 36 + gperftools 37 + ]; 38 + 39 + doCheck = true; 40 + checkPhase = '' 41 + runHook preCheck 42 + make -j $NIX_BUILD_CORES UnitTests 43 + ctest --output-on-failure 44 + runHook postCheck 45 + ''; 46 + 47 + postInstall = '' 48 + mv $out/lib/surelog/* $out/lib/ 49 + mv $out/lib/pkg $out/lib/surelog/ 50 + ''; 51 + 52 + meta = { 53 + description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler"; 54 + homepage = "https://github.com/chipsalliance/Surelog"; 55 + license = lib.licenses.asl20; 56 + maintainers = with lib.maintainers; [ matthuszagh ]; 57 + platforms = lib.platforms.linux; 58 + }; 59 + }
+49
pkgs/applications/science/logic/uhdm/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , python3 6 + }: 7 + 8 + stdenv.mkDerivation rec { 9 + pname = "UHDM"; 10 + version = "0.9.1.40"; 11 + 12 + src = fetchFromGitHub { 13 + owner = "chipsalliance"; 14 + repo = pname; 15 + rev = "v${version}"; 16 + hash = "sha256-CliKU2WM8B9012aDcS/mTyIf+JcsVsc4uRRi9+FRWbM="; 17 + fetchSubmodules = true; 18 + }; 19 + 20 + nativeBuildInputs = [ 21 + cmake 22 + ]; 23 + 24 + buildInputs = [ 25 + (python3.withPackages (p: with p; [ orderedmultidict ])) 26 + ]; 27 + 28 + doCheck = true; 29 + checkPhase = "make test"; 30 + 31 + postInstall = '' 32 + mv $out/lib/uhdm/* $out/lib/ 33 + rm -rf $out/lib/uhdm 34 + ''; 35 + 36 + prePatch = '' 37 + substituteInPlace CMakeLists.txt --replace \ 38 + 'capnp compile' \ 39 + 'capnp compile --src-prefix=''${GENDIR}/..' 40 + ''; 41 + 42 + meta = { 43 + description = "Universal Hardware Data Model"; 44 + homepage = "https://github.com/chipsalliance/UHDM"; 45 + license = lib.licenses.asl20; 46 + maintainers = with lib.maintainers; [ matthuszagh ]; 47 + platforms = lib.platforms.all; 48 + }; 49 + }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/10/default.nix
··· 11 11 release = "10.3-2021.10"; 12 12 13 13 suffix = { 14 - aarch64-darwin = "mac"; # use intel binaries via rosetta 15 14 aarch64-linux = "aarch64-linux"; 16 15 x86_64-darwin = "mac"; 17 16 x86_64-linux = "x86_64-linux"; ··· 20 19 src = fetchurl { 21 20 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 22 21 sha256 = { 23 - aarch64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; 24 22 aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; 25 23 x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; 26 24 x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; ··· 51 49 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 52 50 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 53 51 maintainers = with maintainers; [ prusnak ]; 54 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 52 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 55 53 }; 56 54 }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/11/default.nix
··· 10 10 version = "11.3.rel1"; 11 11 12 12 platform = { 13 - aarch64-darwin = "darwin-x86_64"; # use intel binaries via rosetta 14 13 aarch64-linux = "aarch64"; 15 14 x86_64-darwin = "darwin-x86_64"; 16 15 x86_64-linux = "x86_64"; ··· 19 18 src = fetchurl { 20 19 url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; 21 20 sha256 = { 22 - aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; 23 21 aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; 24 22 x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; 25 23 x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; ··· 49 47 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 50 48 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 51 49 maintainers = with maintainers; [ prusnak ]; 52 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 50 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 53 51 }; 54 52 }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/6/default.nix
··· 12 12 subdir = "6-2017q2"; 13 13 14 14 suffix = { 15 - aarch64-darwin = "mac"; # use intel binaries via rosetta 16 15 x86_64-darwin = "mac"; 17 16 x86_64-linux = "linux"; 18 17 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 20 19 src = fetchurl { 21 20 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 22 21 sha256 = { 23 - aarch64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; 24 22 x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; 25 23 x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; 26 24 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 50 48 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 51 49 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 52 50 maintainers = with maintainers; [ prusnak ]; 53 - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; 51 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; 54 52 }; 55 53 }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/7/default.nix
··· 12 12 subdir = "7-2018q2"; 13 13 14 14 suffix = { 15 - aarch64-darwin = "mac"; # use intel binaries via rosetta 16 15 x86_64-darwin = "mac"; 17 16 x86_64-linux = "linux"; 18 17 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 20 19 src = fetchurl { 21 20 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 22 21 sha256 = { 23 - aarch64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; 24 22 x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; 25 23 x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; 26 24 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 50 48 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 51 49 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 52 50 maintainers = with maintainers; [ prusnak ]; 53 - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; 51 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; 54 52 }; 55 53 }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/8/default.nix
··· 12 12 subdir = "8-2019q3/RC1.1"; 13 13 14 14 suffix = { 15 - aarch64-darwin = "mac"; # use intel binaries via rosetta 16 15 x86_64-darwin = "mac"; 17 16 x86_64-linux = "linux"; 18 17 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 20 19 src = fetchurl { 21 20 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 22 21 sha256 = { 23 - aarch64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; 24 22 x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; 25 23 x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; 26 24 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); ··· 50 48 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 51 49 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 52 50 maintainers = with maintainers; [ prusnak ]; 53 - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; 51 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; 54 52 }; 55 53 }
+1 -3
pkgs/development/compilers/gcc-arm-embedded/9/default.nix
··· 12 12 subdir = "9-2020q2"; 13 13 14 14 suffix = { 15 - aarch64-darwin = "mac"; # use intel binaries via rosetta 16 15 aarch64-linux = "aarch64-linux"; 17 16 x86_64-darwin = "mac"; 18 17 x86_64-linux = "x86_64-linux"; ··· 21 20 src = fetchurl { 22 21 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 23 22 sha256 = { 24 - aarch64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; 25 23 aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; 26 24 x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; 27 25 x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; ··· 52 50 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 53 51 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 54 52 maintainers = with maintainers; [ prusnak ]; 55 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 53 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 56 54 }; 57 55 }
+25 -8
pkgs/development/compilers/spirv-llvm-translator/default.nix
··· 3 3 , cmake 4 4 , pkg-config 5 5 , lit 6 - , llvm_11 6 + , llvm 7 7 , spirv-headers 8 8 , spirv-tools 9 9 }: 10 10 11 + let 12 + llvmMajor = lib.versions.major llvm.version; 13 + 14 + branch = 15 + if llvmMajor == "15" then rec { 16 + version = "15.0.0"; 17 + rev = "v${version}"; 18 + hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; 19 + } else if llvmMajor == "14" then rec{ 20 + version = "14.0.0"; 21 + rev = "v${version}"; 22 + hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o="; 23 + } else if llvmMajor == "11" then { 24 + version = "unstable-2022-05-04"; 25 + rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0 26 + hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; 27 + } else throw "Incompatible LLVM version."; 28 + in 11 29 stdenv.mkDerivation rec { 12 30 pname = "SPIRV-LLVM-Translator"; 13 - version = "unstable-2022-05-04"; 31 + inherit (branch) version; 14 32 15 33 src = fetchFromGitHub { 16 34 owner = "KhronosGroup"; 17 35 repo = "SPIRV-LLVM-Translator"; 18 - rev = "99420daab98998a7e36858befac9c5ed109d4920"; 19 - sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; 36 + inherit (branch) rev hash; 20 37 }; 21 38 22 - nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ]; 39 + nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ]; 23 40 24 - buildInputs = [ spirv-headers llvm_11 ]; 41 + buildInputs = [ spirv-headers llvm ]; 25 42 26 43 checkInputs = [ lit ]; 27 44 28 45 cmakeFlags = [ 29 46 "-DLLVM_INCLUDE_TESTS=ON" 30 - "-DLLVM_DIR=${llvm_11.dev}" 47 + "-DLLVM_DIR=${llvm.dev}" 31 48 "-DBUILD_SHARED_LIBS=YES" 32 49 "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" 33 50 # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ 34 51 "-DCMAKE_SKIP_BUILD_RPATH=ON" 35 - ]; 52 + ] ++ lib.optionals (llvmMajor != "11") [ "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ]; 36 53 37 54 # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist 38 55 doCheck = false;
+3 -3
pkgs/development/compilers/unison/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "unison-code-manager"; 9 - milestone_id = "M4"; 9 + milestone_id = "M4c"; 10 10 version = "1.0.${milestone_id}-alpha"; 11 11 12 12 src = if (stdenv.isDarwin) then 13 13 fetchurl { 14 14 url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; 15 - sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU="; 15 + sha256 = "sha256-mkzIC/cPkpH0obEBqkvvKVh74LaV6jkfyEMLHmJn/nE="; 16 16 } 17 17 else 18 18 fetchurl { 19 19 url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; 20 - sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4="; 20 + sha256 = "sha256-LfT/pMOvfBAwew6NW0VNvuB5c1AC7b+qKraP25+kytg="; 21 21 }; 22 22 23 23 # The tarball is just the prebuilt binary, in the archive root.
+10 -14
pkgs/development/compilers/yosys/plugins/symbiflow.nix
··· 4 4 , python3 5 5 , readline 6 6 , stdenv 7 - , which 8 7 , yosys 9 8 , zlib 10 9 , yosys-symbiflow 10 + , uhdm 11 + , surelog 11 12 }: let 12 13 13 14 src = fetchFromGitHub { 14 - owner = "SymbiFlow"; 15 - repo = "yosys-symbiflow-plugins"; 16 - rev = "35c6c33811a8de7c80dff6a7bcf7aa6ec9b21233"; 17 - hash = "sha256-g5dX9+R+gWt8e7Bhbbg60O9qa+Vi6Ar0M1sHhYlAre8="; 15 + owner = "chipsalliance"; 16 + repo = "yosys-f4pga-plugins"; 17 + rev = "27208ce08200a5e89e3bd4f466bc68824df38c32"; 18 + hash = "sha256-S7txjzlIp+idWIfp/DDOznluA3aMFfosMUt5dvi+g44="; 18 19 }; 19 20 20 - version = "2022.01.06"; 21 + version = "2022.09.27"; 21 22 22 23 # Supported symbiflow plugins. 23 24 # 24 25 # The following are disabled: 25 26 # 26 27 # "ql-qlf" builds but fails to load the plugin, so is not currently supported. 27 - # 28 - # "UHDM" doesn't currently build, as the work to package UHDM and surelog has 29 - # not (yet) been undertaken. 30 28 plugins = [ 31 29 "design_introspection" 32 30 "fasm" ··· 36 34 # "ql-qlf" 37 35 "sdc" 38 36 "xdc" 39 - # "UHDM" 37 + "systemverilog" 40 38 ]; 41 39 42 40 static_gtest = gtest.dev.overrideAttrs (old: { ··· 50 48 inherit src version plugin; 51 49 enableParallelBuilding = true; 52 50 53 - nativeBuildInputs = [ which python3 ]; 54 - buildInputs = [ yosys readline zlib ] ; 51 + nativeBuildInputs = [ python3 ]; 52 + buildInputs = [ yosys readline zlib uhdm surelog ]; 55 53 56 54 # xdc has an incorrect path to a test which has yet to be patched 57 55 doCheck = plugin != "xdc"; ··· 102 100 maintainers = with maintainers; [ ollieB thoughtpolice ]; 103 101 }; 104 102 })) 105 - 106 -
+3 -2
pkgs/development/libraries/draco/default.nix
··· 16 16 cmakeBool = b: if b then "ON" else "OFF"; 17 17 in 18 18 stdenv.mkDerivation rec { 19 - version = "1.5.3"; 19 + version = "1.5.5"; 20 20 pname = "draco"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "google"; 24 24 repo = "draco"; 25 25 rev = version; 26 - sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ="; 26 + sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g="; 27 27 fetchSubmodules = true; 28 28 }; 29 29 ··· 50 50 meta = with lib; { 51 51 description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; 52 52 homepage = "https://google.github.io/draco/"; 53 + changelog = "https://github.com/google/draco/releases/tag/${version}"; 53 54 license = licenses.asl20; 54 55 maintainers = with maintainers; [ jansol ]; 55 56 platforms = platforms.all;
+40
pkgs/development/libraries/qxlsx/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , qtbase 6 + }: 7 + 8 + stdenv.mkDerivation rec { 9 + pname = "qxlsx"; 10 + version = "1.4.4"; 11 + 12 + src = fetchFromGitHub { 13 + owner = "QtExcel"; 14 + repo = "QXlsx"; 15 + rev = "v${version}"; 16 + hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA="; 17 + }; 18 + 19 + nativeBuildInputs = [ cmake ]; 20 + buildInputs = [ qtbase ]; 21 + 22 + # Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d 23 + postPatch = '' 24 + substituteInPlace QXlsx/CMakeLists.txt \ 25 + --replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE' 26 + ''; 27 + 28 + preConfigure = '' 29 + cd QXlsx 30 + ''; 31 + 32 + dontWrapQtApps = true; 33 + 34 + meta = with lib;{ 35 + description = "Excel file(*.xlsx) reader/writer library using Qt 5 or 6"; 36 + homepage = "https://qtexcel.github.io/QXlsx"; 37 + license = licenses.mit; 38 + maintainers = with maintainers; [ nickcao ]; 39 + }; 40 + }
-1
pkgs/development/python-modules/ibis-framework/default.nix
··· 46 46 }: 47 47 let 48 48 testBackends = [ 49 - "dask" 50 49 "datafusion" 51 50 "duckdb" 52 51 "pandas"
+4 -14
pkgs/development/python-modules/pypcap/default.nix
··· 2 2 , buildPythonPackage 3 3 , dpkt 4 4 , fetchFromGitHub 5 - , fetchpatch 6 5 , libpcap 7 6 , pytestCheckHook 8 7 }: 9 8 10 9 buildPythonPackage rec { 11 10 pname = "pypcap"; 12 - version = "1.2.3"; 13 - 11 + version = "1.3.0"; 14 12 15 13 src = fetchFromGitHub { 16 14 owner = "pynetwork"; 17 15 repo = pname; 18 - rev = "v${version}"; 19 - sha256 = "1zscfk10jpqwxgc8d84y8bffiwr92qrg2b24afhjwiyr352l67cf"; 16 + # No release was tagged and PyPI doesn't contain tests. 17 + rev = "968859f0ffb5b7c990506dffe82457b7de23a026"; 18 + sha256 = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE="; 20 19 }; 21 - 22 - patches = [ 23 - # Support for Python 3.9, https://github.com/pynetwork/pypcap/pull/102 24 - (fetchpatch { 25 - name = "support-python-3.9.patch"; 26 - url = "https://github.com/pynetwork/pypcap/pull/102/commits/e22f5d25f0d581d19ef337493434e72cd3a6ae71.patch"; 27 - sha256 = "0n1syh1vcplgsf6njincpqphd2w030s3b2jyg86d7kbqv1w5wk0l"; 28 - }) 29 - ]; 30 20 31 21 postPatch = '' 32 22 # Add the path to libpcap in the nix-store
+2 -4
pkgs/development/tools/parsing/tree-sitter/default.nix
··· 28 28 # to update: 29 29 # 1) change all these hashes 30 30 # 2) nix-build -A tree-sitter.updater.update-all-grammars 31 - # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit 31 + # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) 32 32 # 4) run the ./result script that is output by that (it updates ./grammars) 33 33 version = "0.20.7"; 34 34 sha256 = "sha256-5ILiN5EfJ7WpeYBiXynfcLucdp8zmxVOj4gLkaFQYts="; ··· 42 42 fetchSubmodules = true; 43 43 }; 44 44 45 - update-all-grammars = import ./update.nix { 46 - inherit writeShellScript nix-prefetch-git curl jq xe src formats lib; 47 - }; 45 + update-all-grammars = callPackage ./update.nix {}; 48 46 49 47 fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; }); 50 48
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
··· 1 1 { 2 2 "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", 3 - "rev": "1a538da253d73f896b9f6c0c7d79cda58791ac5c", 4 - "date": "2022-06-20T17:01:16+02:00", 5 - "path": "/nix/store/6mrkhc8bkfnmfaq94a30am9ygh971y97-tree-sitter-embedded-template", 6 - "sha256": "0j73jk9byrhwddb4qsh67gf5fwj9fgdz6byphh3jj8f0ajzdxrmx", 3 + "rev": "91fc5ae1140d5c9d922312431f7d251a48d7b8ce", 4 + "date": "2022-11-03T14:16:56-07:00", 5 + "path": "/nix/store/6z47mgb533bf76l1x22bh64rck5phq8z-tree-sitter-embedded-template", 6 + "sha256": "161bw6hhx4pgzdav5hah4is5w0rfhyid4q9gak0yp05ylk0040sq", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
··· 1 1 { 2 2 "url": "https://github.com/connorlay/tree-sitter-heex", 3 - "rev": "52b804b1cb2d57e58d90090326d3ef9bd19cf16c", 4 - "date": "2022-10-18T07:22:45-07:00", 5 - "path": "/nix/store/7f1xgx8l68lz8jwvni65j4kcxpl68b36-tree-sitter-heex", 6 - "sha256": "0qiwzkb2ksp2cb87zsda5zwwsbpbqzgvnmysalbm3x0c81gnzv3y", 3 + "rev": "881f1c805f51485a26ecd7865d15c9ef8d606a78", 4 + "date": "2022-09-24T18:53:08-07:00", 5 + "path": "/nix/store/vb6x1b9lc90ys55cwshdz5dxmwvzyjvv-tree-sitter-heex", 6 + "sha256": "00330rgg67fq0d9gk1yswj78d9mn1jvvjmmy1k7cxpvm5993p3sw", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
··· 1 1 { 2 2 "url": "https://github.com/tree-sitter/tree-sitter-julia", 3 - "rev": "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c", 4 - "date": "2022-09-01T18:19:12-07:00", 5 - "path": "/nix/store/qh31867lp801xzb93n6jdmibp25zzli1-tree-sitter-julia", 6 - "sha256": "1vxwwdl98n7ic739hl9mq43di10j6r53fpyjh4a738dvjrjg1pc4", 3 + "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", 4 + "date": "2022-11-01T17:30:42-05:00", 5 + "path": "/nix/store/58qk62ilnkwqbqc5y0ah1ky5z4n4d4xr-tree-sitter-julia", 6 + "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
··· 1 1 { 2 2 "url": "https://github.com/MunifTanjim/tree-sitter-lua", 3 - "rev": "887dfd4e83c469300c279314ff1619b1d0b85b91", 4 - "date": "2022-09-16T01:06:50+06:00", 5 - "path": "/nix/store/nypzx0f8fdlamiycl1vqrj4ifx0bfgij-tree-sitter-lua", 6 - "sha256": "1lv3mp0xm5ac9440gcskcxy0hzsnddvcysix1k5axy1cl4vr8bz6", 3 + "rev": "fb30e8cb605e2ebd6c643e6981325a63fbbde320", 4 + "date": "2022-10-31T13:56:07+06:00", 5 + "path": "/nix/store/ifpy40hx70sg9syjr3d35ngrfkmmqi18-tree-sitter-lua", 6 + "sha256": "1hhffz45ilni4g9idsbpp1aymdjkjnyd4491xbdmr47bglf9cgc1", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
··· 1 1 { 2 2 "url": "https://github.com/tree-sitter/tree-sitter-rust", 3 - "rev": "47b061c1e1ba3a7e9c2f450363a50e87de3f7c61", 4 - "date": "2022-08-18T13:07:47+02:00", 5 - "path": "/nix/store/db0s8jdi3r07y0wsv7a6kkvzrfgnjqqz-tree-sitter-rust", 6 - "sha256": "106406hm5aqwj6p2h70p542dgphian46rw98gj5yf82p1h0k38dz", 3 + "rev": "0431a2c60828731f27491ee9fdefe25e250ce9c9", 4 + "date": "2022-11-03T12:28:18-07:00", 5 + "path": "/nix/store/w0c9d84wvp2d8zx15h7dc3v33n1njmfz-tree-sitter-rust", 6 + "sha256": "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
··· 1 1 { 2 2 "url": "https://github.com/vigoux/tree-sitter-viml", 3 - "rev": "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc", 4 - "date": "2022-10-20T14:10:31+02:00", 5 - "path": "/nix/store/ss7h5sjfkfj5ims3q273ric2yljpz3gz-tree-sitter-viml", 6 - "sha256": "1li2y1cmvf74xjqhfjzfmr8cy3d6fymz4mbgfpnzjfc41yn556vj", 3 + "rev": "4ae7bd67706d7e10afed827ce2ded884ab41650f", 4 + "date": "2022-11-02T08:03:51+01:00", 5 + "path": "/nix/store/k2fsslkwfsxscmcghiz6qqah9v275hy9-tree-sitter-viml", 6 + "sha256": "082yw8qgi4fp9wfjfinnyh60f6rvp7fbyi88yaw6kdx4mjrnl0z6", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+4 -4
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
··· 1 1 { 2 2 "url": "https://github.com/maxxnino/tree-sitter-zig", 3 - "rev": "b1803f2a665d228f968a831eac4fcc07a377c7bc", 4 - "date": "2022-10-14T15:52:08+07:00", 5 - "path": "/nix/store/2sb78vfflr69yj6f2iw3872dvij1vxgf-tree-sitter-zig", 6 - "sha256": "0z6y2sazcqbqs6fndszgqblih2syg6g9kpzk41zxh25hz9qxxdsq", 3 + "rev": "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca", 4 + "date": "2022-11-02T09:17:19+07:00", 5 + "path": "/nix/store/h3wg6zkkzyq1vicp7bi4xkcvjb9himh0-tree-sitter-zig", 6 + "sha256": "0l5703qxyyhp8h2a0ms8ncak6kzgrhp2msvpr8cgxjnlsc5xgmxx", 7 7 "fetchLFS": false, 8 8 "fetchSubmodules": false, 9 9 "deepClone": false,
+11
pkgs/development/tools/parsing/tree-sitter/mypy.ini
··· 1 + [mypy] 2 + disallow_untyped_defs = true 3 + disallow_subclassing_any = true 4 + 5 + no_implicit_optional = true 6 + 7 + warn_redundant_casts = true 8 + warn_unused_ignores = true 9 + warn_no_return = true 10 + warn_return_any = true 11 + warn_unreachable = true
+63 -93
pkgs/development/tools/parsing/tree-sitter/update.nix
··· 1 1 { writeShellScript 2 + , writeText 3 + , writers 2 4 , nix-prefetch-git 3 5 , formats 4 6 , lib 7 + , coreutils 5 8 , curl 6 - , jq 7 9 , xe 8 - , src 9 10 }: 10 11 11 12 # Grammar list: ··· 386 387 387 388 jsonFile = name: val: (formats.json { }).generate name val; 388 389 389 - # check the tree-sitter orga repos 390 - checkTreeSitterRepos = writeShellScript "get-grammars.sh" '' 391 - set -euo pipefail 392 - res=$(${jq}/bin/jq \ 393 - --slurpfile known "${knownTreeSitterOrgGrammarReposJson}" \ 394 - --slurpfile ignore "${ignoredTreeSitterOrgReposJson}" \ 395 - '. - ($known[0] + $ignore[0])' \ 396 - ) 397 - if [ ! "$res" == "[]" ]; then 398 - echo "These repositories are neither known nor ignored:" 1>&2 399 - echo "$res" 1>&2 400 - exit 1 401 - fi 402 - ''; 403 - 404 - # TODO 405 - urlEscape = x: x; 406 - 407 - # generic bash script to find the latest github release for a repo 408 - latestGithubRelease = { orga, repo }: writeShellScript "latest-github-release" '' 409 - set -euo pipefail 410 - 411 - args=( '--silent' ) 412 - if [ -n "''${GITHUB_TOKEN:-}" ]; then 413 - args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) 414 - fi 415 - args+=( "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest" ) 416 - 417 - res=$(${curl}/bin/curl "''${args[@]}") 390 + # implementation of the updater 391 + updateImpl = passArgs "updateImpl-with-args" { 392 + binaries = { 393 + curl = "${curl}/bin/curl"; 394 + nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git"; 395 + printf = "${coreutils}/bin/printf"; 396 + }; 397 + inherit 398 + knownTreeSitterOrgGrammarRepos 399 + ignoredTreeSitterOrgRepos 400 + ; 401 + } 402 + (writers.writePython3 "updateImpl" { 403 + flakeIgnore = ["E501"]; 404 + } ./update_impl.py); 418 405 419 - if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then 420 - echo "rate limited" >&2 421 - fi 422 - release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name' | tr -d \")" 423 - # github sometimes returns an empty list even tough there are releases 424 - if [ "$release" = "null" ]; then 425 - echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 426 - release="HEAD" 427 - fi 428 - echo "$release" 406 + # Pass the given arguments to the command, in the ARGS environment variable. 407 + # The arguments are just a json object that should be available in the script. 408 + passArgs = name: argAttrs: script: writeShellScript name '' 409 + env ARGS="$(< ${jsonFile "${name}-args" argAttrs})" \ 410 + ${script} "$@" 429 411 ''; 430 412 431 - # find the latest repos of a github organization 432 - latestGithubRepos = { orga }: writeShellScript "latest-github-repos" '' 433 - set -euo pipefail 413 + foreachSh = attrs: f: 414 + lib.concatMapStringsSep "\n" f 415 + (lib.mapAttrsToList (k: v: { name = k; } // v) attrs); 434 416 435 - args=( '--silent' ) 436 - if [ -n "''${GITHUB_TOKEN:-}" ]; then 437 - args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) 438 - fi 439 - args+=( 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100' ) 417 + jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON {}); 440 418 441 - res=$(${curl}/bin/curl "''${args[@]}") 442 - 443 - if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then 444 - echo "rate limited" >&2 445 - exit 1 446 - elif [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "Bad credentials" ]]; then 447 - echo "bad credentials" >&2 448 - exit 1 449 - fi 450 - 451 - printf "%s" "$res" | ${jq}/bin/jq 'map(.name)' \ 452 - || echo "failed $res" 419 + # Run the given script for each of the attr list. 420 + # The attrs are passed to the script as a json value. 421 + forEachParallel = name: script: listOfAttrs: writeShellScript "for-each-parallel.sh" '' 422 + < ${writeText "${name}.json" (jsonNewlines listOfAttrs)} \ 423 + ${xe}/bin/xe -F -j5 ${script} {} 453 424 ''; 454 425 455 - # update one tree-sitter grammar repo and print their nix-prefetch-git output 456 - updateGrammar = { orga, repo }: writeShellScript "update-grammar.sh" '' 457 - set -euo pipefail 458 - latest="$(${latestGithubRelease { inherit orga repo; }})" 459 - echo "Fetching latest release ($latest) of ${repo} …" >&2 460 - ${nix-prefetch-git}/bin/nix-prefetch-git \ 461 - --quiet \ 462 - --no-deepClone \ 463 - --url "https://github.com/${urlEscape orga}/${urlEscape repo}" \ 464 - --rev "$latest" 465 - ''; 466 - 467 - foreachSh = attrs: f: 468 - lib.concatMapStringsSep "\n" f 469 - (lib.mapAttrsToList (k: v: { name = k; } // v) attrs); 426 + # The output directory in the current source tree. 427 + # This will depend on your local environment, but that is intentional. 428 + outputDir = "${toString ./.}/grammars"; 470 429 471 430 update-all-grammars = writeShellScript "update-all-grammars.sh" '' 472 431 set -euo pipefail 473 - echo "fetching list of grammars" 1>&2 474 - treeSitterRepos=$(${latestGithubRepos { orga = "tree-sitter"; }}) 475 - echo "checking the tree-sitter repo list against the grammars we know" 1>&2 476 - printf '%s' "$treeSitterRepos" | ${checkTreeSitterRepos} 477 - outputDir="${toString ./.}/grammars" 478 - echo "writing files to $outputDir" 1>&2 479 - mkdir -p "$outputDir" 480 - ${foreachSh allGrammars 481 - ({name, orga, repo}: ''${updateGrammar { inherit orga repo; }} > $outputDir/${name}.json'')} 482 - ( echo "{ lib }:" 483 - echo "{" 484 - ${foreachSh allGrammars 485 - ({name, ...}: '' 486 - # indentation hack 487 - printf " %s = lib.importJSON ./%s.json;\n" "${name}" "${name}"'')} 488 - echo "}" ) \ 489 - > "$outputDir/default.nix" 432 + ${updateImpl} fetch-and-check-tree-sitter-repos '{}' 433 + echo "writing files to ${outputDir}" 1>&2 434 + mkdir -p "${outputDir}" 435 + ${forEachParallel 436 + "repos-to-fetch" 437 + (writeShellScript "fetch-repo" '' 438 + ${updateImpl} fetch-repo "$1" 439 + '') 440 + (lib.mapAttrsToList 441 + (nixRepoAttrName: attrs: attrs // { 442 + inherit 443 + nixRepoAttrName 444 + outputDir; 445 + }) 446 + allGrammars) 447 + } 448 + ${updateImpl} print-all-grammars-nix-file "$(< ${ 449 + jsonFile "all-grammars.json" { 450 + allGrammars = 451 + (lib.mapAttrsToList 452 + (nixRepoAttrName: attrs: attrs // { 453 + inherit nixRepoAttrName; 454 + }) 455 + allGrammars); 456 + inherit outputDir; 457 + } 458 + })" 490 459 ''; 460 + 491 461 492 462 in 493 463 update-all-grammars
+217
pkgs/development/tools/parsing/tree-sitter/update_impl.py
··· 1 + from urllib.parse import quote 2 + import json 3 + import subprocess as sub 4 + import os 5 + import sys 6 + from typing import Iterator, Any, Literal, TypedDict 7 + from tempfile import NamedTemporaryFile 8 + 9 + debug: bool = True if os.environ.get("DEBUG", False) else False 10 + Bin = str 11 + args: dict[str, Any] = json.loads(os.environ["ARGS"]) 12 + bins: dict[str, Bin] = args["binaries"] 13 + 14 + mode: str = sys.argv[1] 15 + jsonArg: dict = json.loads(sys.argv[2]) 16 + 17 + Args = Iterator[str] 18 + 19 + 20 + def log(msg: str) -> None: 21 + print(msg, file=sys.stderr) 22 + 23 + 24 + def atomically_write(file_path: str, content: bytes) -> None: 25 + """atomically write the content into `file_path`""" 26 + with NamedTemporaryFile( 27 + # write to the parent dir, so that it’s guaranteed to be on the same filesystem 28 + dir=os.path.dirname(file_path), 29 + delete=False 30 + ) as tmp: 31 + try: 32 + tmp.write(content) 33 + os.rename( 34 + src=tmp.name, 35 + dst=file_path 36 + ) 37 + except Exception: 38 + os.unlink(tmp.name) 39 + 40 + 41 + def curl_github_args(token: str | None, url: str) -> Args: 42 + """Query the github API via curl""" 43 + yield bins["curl"] 44 + if not debug: 45 + yield "--silent" 46 + # follow redirects 47 + yield "--location" 48 + if token: 49 + yield "-H" 50 + yield f"Authorization: token {token}" 51 + yield url 52 + 53 + 54 + def curl_result(output: bytes) -> Any | Literal["not found"]: 55 + """Parse the curl result of the github API""" 56 + res: Any = json.loads(output) 57 + match res: 58 + case dict(res): 59 + message: str = res.get("message", "") 60 + if "rate limit" in message: 61 + sys.exit("Rate limited by the Github API") 62 + if "Not Found" in message: 63 + return "not found" 64 + # if the result is another type, we can pass it on 65 + return res 66 + 67 + 68 + def nix_prefetch_git_args(url: str, version_rev: str) -> Args: 69 + """Prefetch a git repository""" 70 + yield bins["nix-prefetch-git"] 71 + if not debug: 72 + yield "--quiet" 73 + yield "--no-deepClone" 74 + yield "--url" 75 + yield url 76 + yield "--rev" 77 + yield version_rev 78 + 79 + 80 + def run_cmd(args: Args) -> bytes: 81 + all = list(args) 82 + if debug: 83 + log(str(all)) 84 + return sub.check_output(all) 85 + 86 + 87 + Dir = str 88 + 89 + 90 + def fetchRepo() -> None: 91 + """fetch the given repo and write its nix-prefetch output to the corresponding grammar json file""" 92 + match jsonArg: 93 + case { 94 + "orga": orga, 95 + "repo": repo, 96 + "outputDir": outputDir, 97 + "nixRepoAttrName": nixRepoAttrName, 98 + }: 99 + token: str | None = os.environ.get("GITHUB_TOKEN", None) 100 + out = run_cmd( 101 + curl_github_args( 102 + token, 103 + url=f"https://api.github.com/repos/{quote(orga)}/{quote(repo)}/releases/latest" 104 + ) 105 + ) 106 + release: str 107 + match curl_result(out): 108 + case "not found": 109 + # github sometimes returns an empty list even tough there are releases 110 + log(f"uh-oh, latest for {orga}/{repo} is not there, using HEAD") 111 + release = "HEAD" 112 + case {"tag_name": tag_name}: 113 + release = tag_name 114 + case _: 115 + sys.exit(f"git result for {orga}/{repo} did not have a `tag_name` field") 116 + 117 + log(f"Fetching latest release ({release}) of {orga}/{repo} …") 118 + res = run_cmd( 119 + nix_prefetch_git_args( 120 + url=f"https://github.com/{quote(orga)}/{quote(repo)}", 121 + version_rev=release 122 + ) 123 + ) 124 + atomically_write( 125 + file_path=os.path.join( 126 + outputDir, 127 + f"{nixRepoAttrName}.json" 128 + ), 129 + content=res 130 + ) 131 + case _: 132 + sys.exit("input json must have `orga` and `repo` keys") 133 + 134 + 135 + def fetchOrgaLatestRepos(orga: str) -> set[str]: 136 + """fetch the latest (100) repos from the given github organization""" 137 + token: str | None = os.environ.get("GITHUB_TOKEN", None) 138 + out = run_cmd( 139 + curl_github_args( 140 + token, 141 + url=f"https://api.github.com/orgs/{quote(orga)}/repos?per_page=100" 142 + ) 143 + ) 144 + match curl_result(out): 145 + case "not found": 146 + sys.exit(f"github organization {orga} not found") 147 + case list(repos): 148 + res: list[str] = [] 149 + for repo in repos: 150 + name = repo.get("name") 151 + if name: 152 + res.append(name) 153 + return set(res) 154 + case _: 155 + sys.exit("github result was not a list of repos, but {other}") 156 + 157 + 158 + def checkTreeSitterRepos(latest_github_repos: set[str]) -> None: 159 + """Make sure we know about all tree sitter repos on the tree sitter orga.""" 160 + known: set[str] = set(args["knownTreeSitterOrgGrammarRepos"]) 161 + ignored: set[str] = set(args["ignoredTreeSitterOrgRepos"]) 162 + 163 + unknown = latest_github_repos - (known | ignored) 164 + 165 + if unknown: 166 + sys.exit(f"These repositories are neither known nor ignored:\n{unknown}") 167 + 168 + 169 + Grammar = TypedDict( 170 + "Grammar", 171 + { 172 + "nixRepoAttrName": str, 173 + "orga": str, 174 + "repo": str 175 + } 176 + ) 177 + 178 + 179 + def printAllGrammarsNixFile() -> None: 180 + """Print a .nix file that imports all grammars.""" 181 + allGrammars: list[dict[str, Grammar]] = jsonArg["allGrammars"] 182 + outputDir: Dir = jsonArg["outputDir"] 183 + 184 + def file() -> Iterator[str]: 185 + yield "{ lib }:" 186 + yield "{" 187 + for grammar in allGrammars: 188 + n = grammar["nixRepoAttrName"] 189 + yield f" {n} = lib.importJSON ./{n}.json;" 190 + yield "}" 191 + yield "" 192 + 193 + atomically_write( 194 + file_path=os.path.join( 195 + outputDir, 196 + "default.nix" 197 + ), 198 + content="\n".join(file()).encode() 199 + ) 200 + 201 + 202 + def fetchAndCheckTreeSitterRepos() -> None: 203 + log("fetching list of grammars") 204 + latest_repos = fetchOrgaLatestRepos(orga="tree-sitter") 205 + log("checking the tree-sitter repo list against the grammars we know") 206 + checkTreeSitterRepos(latest_repos) 207 + 208 + 209 + match mode: 210 + case "fetch-repo": 211 + fetchRepo() 212 + case "fetch-and-check-tree-sitter-repos": 213 + fetchAndCheckTreeSitterRepos() 214 + case "print-all-grammars-nix-file": 215 + printAllGrammarsNixFile() 216 + case _: 217 + sys.exit(f"mode {mode} unknown")
+38
pkgs/development/tools/rust/cargo-guppy/default.nix
··· 1 + { lib 2 + , rustPlatform 3 + , fetchFromGitHub 4 + , pkg-config 5 + , openssl 6 + , stdenv 7 + , darwin 8 + }: 9 + 10 + rustPlatform.buildRustPackage rec { 11 + pname = "cargo-guppy"; 12 + version = "unstable-2022-10-29"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "guppy-rs"; 16 + repo = "guppy"; 17 + rev = "448d830de4867c32eaa57911a392e47c81d1a0e0"; 18 + sha256 = "sha256-Ce6WO01gN8Ip5smAyGNEg87vyFXFDIq6ilHTbEStm/c="; 19 + }; 20 + 21 + cargoSha256 = "sha256-DR/k6g2uWCOhM20qROybsH4gTvH+Kd+jaDHGZ4loK7g="; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ 26 + darwin.apple_sdk.frameworks.Security 27 + ]; 28 + 29 + cargoBuildFlags = [ "-p" "cargo-guppy" ]; 30 + cargoTestFlags = [ "-p" "cargo-guppy" ]; 31 + 32 + meta = with lib; { 33 + description = "A command-line frontend for guppy"; 34 + homepage = "https://github.com/guppy-rs/guppy/tree/main/cargo-guppy"; 35 + license = with licenses; [ mit /* or */ asl20 ]; 36 + maintainers = with maintainers; [ figsoda ]; 37 + }; 38 + }
+6 -5
pkgs/development/tools/rust/cargo-hakari/default.nix
··· 1 - { lib, fetchCrate, rustPlatform }: 1 + { lib, rustPlatform, fetchCrate }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-hakari"; 5 - version = "0.9.14"; 5 + version = "0.9.15"; 6 6 7 7 src = fetchCrate { 8 8 inherit pname version; 9 - sha256 = "sha256-C4UBvxGZDpGfYokTzHQNkUkZqBNuKbE4pzOJ04sTDoY="; 9 + sha256 = "sha256-jPvQKc5jDWHIOmJPpgsR9usYzjjCKlSL04N6Opgyiac="; 10 10 }; 11 11 12 - cargoHash = "sha256-eQrRBmlP206MKDlXxcJ64jD6/6mv3V/sv9TsybIx+8Q="; 12 + cargoHash = "sha256-tmBgmIwFW/0+WQUEJFf6rFtRhoGn41BvZUIng8MsxQM="; 13 13 14 14 meta = with lib; { 15 15 description = "Manage workspace-hack packages to speed up builds in large workspaces."; ··· 19 19 and cumulatively by 20-25% or more. 20 20 ''; 21 21 homepage = "https://crates.io/crates/cargo-hakari"; 22 + changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; 22 23 license = with licenses; [ mit asl20 ]; 23 - maintainers = with maintainers; [ macalinao ]; 24 + maintainers = with maintainers; [ figsoda macalinao ]; 24 25 }; 25 26 }
+5 -3
pkgs/games/ldmud/default.nix
··· 7 7 , libiconv 8 8 , pcre 9 9 , libgcrypt 10 + , libxcrypt 10 11 , json_c 11 12 , libxml2 12 13 , ipv6Support ? false ··· 39 40 sourceRoot = "${src.name}/src"; 40 41 41 42 nativeBuildInputs = 42 - [ autoreconfHook pkg-config bison libgcrypt pcre json_c libxml2 ] 43 + [ autoreconfHook pkg-config bison ]; 44 + buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ] 43 45 ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient 44 46 ++ lib.optional postgresSupport postgresql 45 47 ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl 46 - ++ lib.optional pythonSupport python310; 47 - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; 48 + ++ lib.optional pythonSupport python310 49 + ++ lib.optionals stdenv.isDarwin [ libiconv ]; 48 50 49 51 # To support systems without autoconf LD puts its configure.ac in a non-default 50 52 # location and uses a helper script. We skip that script and symlink the .ac
+1 -1
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
··· 27 27 28 28 structuredExtraConfig = with lib.kernel; { 29 29 # AMD P-state driver 30 - X86_AMD_PSTATE = yes; 30 + X86_AMD_PSTATE = lib.mkOverride 60 yes; 31 31 32 32 # Google's BBRv2 TCP congestion Control 33 33 TCP_CONG_BBR2 = yes;
+5 -3
pkgs/os-specific/linux/nvidia-x11/default.nix
··· 55 55 # Vulkan developer beta driver 56 56 # See here for more information: https://developer.nvidia.com/vulkan-driver 57 57 vulkan_beta = generic rec { 58 - version = "515.49.15"; 58 + version = "515.49.24"; 59 59 persistencedVersion = "515.48.07"; 60 60 settingsVersion = "515.48.07"; 61 - sha256_64bit = "sha256-yQbNE+YsbHUc4scXvMZFGuuBRrFTa42g1XoMVZEO/zo="; 62 - openSha256 = "sha256-2RvogIdTA7Rg4oq14TG7Kh31HWuj860xsK7/MYFitpQ="; 61 + sha256_64bit = "sha256-hiTG1gZr02hyetOGvHzY8Be9jaWklhteqe24BRvpw+c="; 62 + openSha256 = "sha256-4NFR4oY728E/yE3FoD3vph8NvSHGD0f0iK2FHqlgK94="; 63 63 settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; 64 64 persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; 65 65 url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; ··· 77 77 sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8="; 78 78 settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE="; 79 79 persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo="; 80 + 81 + broken = kernel.kernelAtLeast "6.0"; 80 82 }; 81 83 82 84 # Last one supporting x86
+2 -2
pkgs/servers/bazarr/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "bazarr"; 5 - version = "1.1.1"; 5 + version = "1.1.2"; 6 6 7 7 sourceRoot = "."; 8 8 9 9 src = fetchurl { 10 10 url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; 11 - sha256 = "sha256-ClVHThhcf4QkYhgJevTKroBe0z0YZX83qKFB0thH6eM="; 11 + sha256 = "sha256-cTSRfnMYAyoOoTy0wx8sxqyS92zP6GZu8aH5hRRTxU4="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ unzip makeWrapper ];
+2 -2
pkgs/servers/dns/pdns/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "pdns"; 8 - version = "4.6.3"; 8 + version = "4.7.2"; 9 9 10 10 src = fetchurl { 11 11 url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; 12 - hash = "sha256-rNBricoB0a32G5BmBGFPDh13oelO7srej/XVOhbbc4k="; 12 + hash = "sha256-TcrjXr3ASRWHLXv24tC8pLBcY1ChAKXPnCnfU7qlPOI="; 13 13 }; 14 14 # redact configure flags from version output to reduce closure size 15 15 patches = [ ./version.patch ];
+4 -1
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
··· 28 28 ''; 29 29 30 30 postInstall = '' 31 + # Compile typescript 32 + npm run build 33 + 31 34 makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \ 32 35 --add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js" 33 36 ··· 39 42 40 43 meta = with lib; { 41 44 description = "Node.js IRC bridge for Matrix"; 42 - maintainers = with maintainers; [ ]; 45 + maintainers = with maintainers; [ rhysmdnz ]; 43 46 homepage = "https://github.com/matrix-org/matrix-appservice-irc"; 44 47 license = licenses.asl20; 45 48 platforms = platforms.linux;
+2 -2
pkgs/servers/monitoring/grafana-agent/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "grafana-agent"; 5 - version = "0.28.0"; 5 + version = "0.28.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 rev = "v${version}"; 9 9 owner = "grafana"; 10 10 repo = "agent"; 11 - sha256 = "sha256-UuDRnpb9JpghGDFsrlU7+iMboqiWVyT7qFSSPlLSFGs="; 11 + sha256 = "sha256-KeajXEeaTrLObgLrIyI2MJK+ap8zIdZ/jIQuVaF4ojg="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-UEQYZbP3dzi7wZwX+InJrgHrFB1wfSUNmUMkit+Y1Lo=";
+3 -3
pkgs/shells/zsh/oh-my-zsh/default.nix
··· 5 5 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: 6 6 7 7 stdenv.mkDerivation rec { 8 - version = "2022-10-30"; 8 + version = "2022-11-03"; 9 9 pname = "oh-my-zsh"; 10 - rev = "50a526f209a182add8a47e362e1c9a3bfd7c5af4"; 10 + rev = "b3b336b0f95644ceda7758871191cdf040b897b2"; 11 11 12 12 src = fetchFromGitHub { 13 13 inherit rev; 14 14 owner = "ohmyzsh"; 15 15 repo = "ohmyzsh"; 16 - sha256 = "1PPLUxFGUTHCxEgJXw8TLAqXOLfzz1oQNwmjLRfhQH4="; 16 + sha256 = "azQ2ceqRnvugNI/1ORZXb+5zrv0PXvwYd2Zc85VXSo4="; 17 17 }; 18 18 19 19 strictDeps = true;
+1 -1
pkgs/tools/backup/duply/default.nix
··· 20 20 mkdir -p "$out/bin" 21 21 mkdir -p "$out/share/man/man1" 22 22 install -vD duply "$out/bin" 23 - wrapProgram "$out/bin/duply" --set PATH \ 23 + wrapProgram "$out/bin/duply" --prefix PATH : \ 24 24 ${lib.makeBinPath [ coreutils python3 duplicity gawk gnupg bash gnugrep txt2man which ]} 25 25 "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" 26 26 '';
+3 -3
pkgs/tools/misc/broot/default.nix
··· 15 15 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "broot"; 18 - version = "1.16.1"; 18 + version = "1.16.2"; 19 19 20 20 src = fetchCrate { 21 21 inherit pname version; 22 - sha256 = "sha256-OiTZAQYVIMJmQXGQkqcMsUykCImbEOCnYcKmwXwXlpQ="; 22 + sha256 = "sha256-5R5pGCn4CJU2kGPiu6PpUBxr0/02hOwN1ikns2pvGA0="; 23 23 }; 24 24 25 - cargoHash = "sha256-sPJ8NrnwAHuCPLPef8tCbU4nM5J04CzGwf58a9J5Gz4="; 25 + cargoHash = "sha256-0d7EMWc/PU9kDgfTVc1SWYYym9UEULwR1X3qIW+zvjM="; 26 26 27 27 nativeBuildInputs = [ 28 28 installShellFiles
+26
pkgs/tools/misc/lemmy-help/default.nix
··· 1 + { lib, fetchFromGitHub, rustPlatform }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "lemmy-help"; 5 + version = "0.9.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "numToStr"; 9 + repo = "lemmy-help"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-VY8sGxS8wwrezTe4ht9xdr4iE2n9fNSNhfCeGDJL5Lo="; 12 + }; 13 + 14 + buildFeatures = [ "cli" ]; 15 + 16 + cargoSha256 = "sha256-yj14kg41EqOco0gx79n8xhf8cyotZ1Mxj2AbNV9TImU="; 17 + 18 + meta = with lib; { 19 + description = "A CLI for generating vim help docs from emmylua comments"; 20 + longDescription = '' 21 + `lemmy-help` is an emmylua parser as well as a CLI which takes that parsed tree and converts it into vim help docs. 22 + ''; 23 + homepage = "https://github.com/numToStr/lemmy-help"; 24 + license = with licenses; [ mit ]; 25 + }; 26 + }
+2 -2
pkgs/tools/typesetting/asciidoctorj/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "asciidoctorj"; 5 - version = "2.5.6"; 5 + version = "2.5.7"; 6 6 7 7 src = fetchzip { 8 8 url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; 9 - sha256 = "sha256-oAakldNmSWMAgbHRZm9jY9QRFdQamrAsDyD0havivr0="; 9 + sha256 = "sha256-LUbzS2XYSsSPyJmyvitS5or0S4o9SB2ycMkuAWyVB8w="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper ];
+13
pkgs/top-level/all-packages.nix
··· 8841 8841 8842 8842 lemmeknow = callPackage ../tools/misc/lemmeknow { }; 8843 8843 8844 + lemmy-help = callPackage ../tools/misc/lemmy-help { }; 8845 + 8844 8846 lethe = callPackage ../tools/security/lethe { 8845 8847 inherit (darwin.apple_sdk.frameworks) Security; 8846 8848 }; ··· 14952 14954 }; 14953 14955 cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; 14954 14956 cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; 14957 + cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; 14955 14958 cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; 14956 14959 cargo-license = callPackage ../development/tools/rust/cargo-license { }; 14957 14960 cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { }; ··· 15215 15218 spasm-ng = callPackage ../development/compilers/spasm-ng { }; 15216 15219 15217 15220 spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; 15221 + 15222 + spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; 15218 15223 15219 15224 sqldeveloper = callPackage ../development/tools/database/sqldeveloper { 15220 15225 jdk = oraclejdk; ··· 27510 27515 calf = callPackage ../applications/audio/calf { 27511 27516 inherit (gnome2) libglade; 27512 27517 }; 27518 + 27519 + calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { }; 27513 27520 27514 27521 calcurse = callPackage ../applications/misc/calcurse { }; 27515 27522 ··· 35270 35277 35271 35278 seqtk = callPackage ../applications/science/biology/seqtk { }; 35272 35279 35280 + seqkit = callPackage ../applications/science/biology/seqkit { }; 35281 + 35273 35282 snpeff = callPackage ../applications/science/biology/snpeff { }; 35274 35283 35275 35284 somafm-cli = callPackage ../tools/misc/somafm-cli { }; ··· 35856 35865 symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; 35857 35866 35858 35867 symfpu = callPackage ../applications/science/logic/symfpu {}; 35868 + 35869 + uhdm = callPackage ../applications/science/logic/uhdm {}; 35870 + 35871 + surelog = callPackage ../applications/science/logic/surelog {}; 35859 35872 35860 35873 mcy = callPackage ../applications/science/logic/mcy {}; 35861 35874
+2
pkgs/top-level/qt5-packages.nix
··· 220 220 221 221 qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; 222 222 223 + qxlsx = callPackage ../development/libraries/qxlsx { }; 224 + 223 225 soqt = callPackage ../development/libraries/soqt { }; 224 226 225 227 telepathy = callPackage ../development/libraries/telepathy/qt { };
+1 -3
pkgs/top-level/wine-packages.nix
··· 12 12 fontconfigSupport = stdenv.isLinux; 13 13 alsaSupport = stdenv.isLinux; 14 14 openglSupport = true; 15 - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. 16 - vulkanSupport = stdenv.isLinux; 15 + vulkanSupport = true; 17 16 tlsSupport = true; 18 17 cupsSupport = true; 19 18 dbusSupport = stdenv.isLinux; ··· 41 40 gphoto2Support = true; 42 41 krb5Support = true; 43 42 ldapSupport = true; 44 - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. 45 43 vkd3dSupport = stdenv.isLinux; 46 44 embedInstallers = true; 47 45 };