diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
| commit | 74d102ce50f5d71e193a27b899e96739dadeed2f (patch) | |
| tree | 333dadf38ed34c5d783422b0d6b9f0c03a2b4a58 /pkgs | |
| parent | 2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (diff) | |
| parent | 12c5150ee5702e3d87049e88f58f35cc88e0dccf (diff) | |
| download | nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.gz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.bz2 nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.lz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.xz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.zst nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs')
58 files changed, 946 insertions, 608 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 36553edc74e..46b389ab805 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -177,8 +177,8 @@ final: prev: src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "db31b4073bd18d7e2d8e09b2752d51da01fc7722"; - sha256 = "1dx7vh8x46jy2f6rz3mqhygvyzxczmz7azrxsdc1z7702yp4qzha"; + rev = "68ff818a5bb7549f90b05e412b76fe448f605ffb"; + sha256 = "075zvc5d088m7zvjmap6c3g1kfnamg7sjjf5s4fcvwg20dn1zp9q"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-03"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "686687585c040529f7efa68aa433282068c9d78b"; - sha256 = "1n6f1i9g90m31s6skkk786hrd5qbafcvshv845adcph6mvs54gbb"; + rev = "80580573cb7be3f9253ff4b4213328074cf15c59"; + sha256 = "0fq73dlyar77ym60szfv62gik70bzldk7djfy5k70w4fbgilfpb1"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "8e4090bf9412e24b05823c771cb3956c2ba72981"; - sha256 = "0rwk63ggp6n7sm4s53zpd292y0lm4gag4gymcp80gbfywj73bl5l"; + rev = "3b89343711d5e2847feaa280ebe418c452a2a923"; + sha256 = "0py7clhanhifi2rrsgq41fvikr2ga33fcb2d7af401bdi9m9vmfw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2023-09-17"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "53b01d6a546384a28f1ccbed41baae58d7341da4"; - sha256 = "1jqsxgys7285m99y553ydvf0cwdkm98s0mi6mnmghzv3q7d9ngik"; + rev = "50e237facda4b9c3761c3f3e9df185cfdf3d91e8"; + sha256 = "1iyxw4j499qwwhygwqspsq5573smrd1rcnyh74vk0sj058d3l03y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -1051,12 +1051,12 @@ final: prev: bigfile-nvim = buildVimPlugin { pname = "bigfile.nvim"; - version = "2023-06-28"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "LunarVim"; repo = "bigfile.nvim"; - rev = "9616b73670ffeb92679677554ded88854ae42cf8"; - sha256 = "09rflfns0qba3r0qrz0p9g0p4vjf5x74phis0nb14fxjalz9cxcc"; + rev = "33eb067e3d7029ac77e081cfe7c45361887a311a"; + sha256 = "1l0ndnlvqj6q8kafpq0piikhqmi7bhzi0y4b88wrh0arcpdc19kx"; }; meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; @@ -1315,12 +1315,12 @@ final: prev: clang_complete = buildVimPlugin { pname = "clang_complete"; - version = "2022-11-30"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "d866f31a6b1cfc725dd015293e0a275a6ae9beb0"; - sha256 = "1fz1mjk049b2f31ymk4ph287km8q3yan9xm5ipj41mjwaavdmzi3"; + rev = "75946deff49f2bd70a8d1180c8e60a88aa056e47"; + sha256 = "1h6zxf5kpja3rssj689pj9vj2kajhx1vzg2qd2ir743619r2sxfh"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-10-27"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "78f32674d42dcf8e5626e105bc8fb93b6c27120b"; - sha256 = "02hxv09k0qy0nkak9n2zcpadhyspml74yb7hv4mgzxlkvn1qgh90"; + rev = "1efe2a2cdf516094bdb211aa8a1d45ef01836207"; + sha256 = "0kn0vrcn1ixa1lw5nchl7ahzmysx80lv6zf1dgqzrmk94miar15k"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-04"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "893b139e6dcdb55dee4c98215d9217d3a1ec69eb"; - sha256 = "01y2ja4h1njqnidnf4b20z4fxsn47lqwc7dd9xjipp9651g4gx9f"; + rev = "e388bd6725d83f83639e24482b9d1bca01c0c040"; + sha256 = "18pim7niv4x8rbfm5bsz2fnnpsskw65qcl0rq7hfhnj7pvb0lb3i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2348,12 +2348,12 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-11-03"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "330a15ca3425a452103bc24c8287a73063089c2f"; - sha256 = "1y8bjhb1m5bbkha7dxnn90706da1j9lqmkc2g35i3hxygfmap7l7"; + rev = "73047082d72fcfdde1f73b7f17ad495cffcbafaa"; + sha256 = "159ghjskc2gydxvxsiijgz4swgad0njkmppalkj685wv5kl46pyg"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2564,12 +2564,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-10-19"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "c71cab740e2add248c54c458b5ca9d6e77c30fa6"; - sha256 = "1xn6ib211p4qd3is5ldgr1g14j7sh8ys50460hx1dh0frb8ra2v2"; + rev = "63df28409d940f9cac0a925df09d3dc369db9841"; + sha256 = "0731yc308jhqwpgabdb69mz8wi75rbnlwa2rh25rrigr28hxin1c"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2660,12 +2660,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-10-23"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "ea7370bf5d323e83ee13ccba35f56e06db5753e1"; - sha256 = "1c105rdj87fbgi1vir9crm3d7ibb3b4hhgkwjbh1gdyym9pqw4fn"; + rev = "8b53173370d3c2285abb34569b8d00b73d06eaa3"; + sha256 = "0qwalcsp7r1yk0mx8agsy2hpg3qia4nla3prkygdvybhk42jvxfi"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3034,24 +3034,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-10-11"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "1f2d1206a03bd3add8aedf6251e4534611de577f"; - sha256 = "19s6d78y6axpq1iqsd8wqmrx8dlmxpnrjgdzpin5wyrwkx4zf9jf"; + rev = "fe3071330a0720ce3695ac915820c8134b22d1b0"; + sha256 = "0a76mkvgya5hygfjbk2wbha18fhwhv6kmkxgvda053z325505mc6"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-11-04"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "570b49fb3c895808046799d16dc97ff3ef90f508"; - sha256 = "00brji6x45qrsni36fw73bi9q03a4hlk714201damgzqb35bygpn"; + rev = "af022e088b98d935d4a12337f7c4bbde6d7a59c9"; + sha256 = "0pawws18fbizavc3vba89lmd4qmdfpi3gqizjbb79c0hk2qgls5v"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3143,12 +3143,12 @@ final: prev: elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-10-19"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "83d3b7946cf1ee2ec7eb69dd23c47092f085cd47"; - sha256 = "1vanmr37zdq38fcjnip9scxjm787j8iw1hl87d4iqrp2apcl5wcw"; + rev = "f98a90e071786c3a99a280c7b11cf6c0a6c00a0b"; + sha256 = "1n1hh0arlhn9jh01m2f9sv19g7hfwz8lg7yhr50n0xcdmg0z4adh"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3300,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-11-02"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "025db63b04ca0b22473871e532d90bf0d8bc1031"; - sha256 = "1qd2aphgk9kyicrkxig7fq8nj5xwb1dbxdjbq9vp68si3fahvlg1"; + rev = "62a9f4fd4fcf46cb87b7868323a1e9aef5b08028"; + sha256 = "19bhhdkqx24jyz1xc7v39563gqa7y8y2aai4pgl7n5mbrvcr9bsy"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3348,12 +3348,12 @@ final: prev: fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-06-10"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "90c22e47be057562ee9566bad313ad42d622c1d3"; - sha256 = "1ga6pxz89687km1mwisd4vfl1bpw6gg100v9xcfjks03zc1bywrp"; + rev = "2f7c08f45639a64a5c0abcf67321d52c3f499ae6"; + sha256 = "0x4vbqbpzsw1pkqnm6l8hymm35vnfpl5vdaa91g6890q9q57csgh"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3637,12 +3637,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-04"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "e5b63a01c884437b206750bcf2c7dcb102bbe8f7"; - sha256 = "1daj63f4ss4m3m18n435430kr566pi70j7315x7h1i04flpm7y39"; + rev = "e1046726cf0cedf15ae0ff40537a421b79968c3e"; + sha256 = "0yh5yrlv0a73yjgwb23vl91lb38h121w4zxf9wavrk262qqkm903"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3733,12 +3733,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-10-19"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "1792125237260dc2a03ba57d31c39179e6049f07"; - sha256 = "1286zylvd10r0kq6g0f1rwrdbdwpy7f7n28kdmlrhsw5h25y5bcf"; + rev = "f07e913b7143f19edd6787229f2d51759b478600"; + sha256 = "0gqr1i3g1afjm2p03vjzs0jiy6jycg6lvqa0fdsqdrb7cyircs5r"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3769,12 +3769,12 @@ final: prev: git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; - version = "2021-12-24"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "d7f4e2584e81670154f07ca9fa5dd791d9c1b458"; - sha256 = "1k446mah5dlqddxwdm7l009251ly8l99ysamncs5q2wpvmv68hm6"; + rev = "f247308e68dab9f1133759b05d944569ad054546"; + sha256 = "0mspffvg2z5lx4ck96d2pnf1azy3s1zq720n6abnxzajadmnh47r"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -3865,24 +3865,24 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-11-04"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "57a3c3e7480031b4c04c11c948ac347f70995f73"; - sha256 = "0ha7ihrfqjdhn5biqk6yiqh0xmr85hwxkif674cdg036w3wr04qp"; + rev = "38f6402fa5362f2c31a31439294d9e24eda46b13"; + sha256 = "143wi05bh6fdcfcm7lrx4x2qh4srdw022c107476p3gcasswkihr"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-09-07"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "74c32eaa520987d195a2594a6efaab61cf9072c8"; - sha256 = "0n5mwyfsmifcfmgs49yc77zvndhkkki2dnka11pk1djvp53bs9ky"; + rev = "e7da918f2f76d1eef490b0a6034b8a4bed5c5f72"; + sha256 = "08937wj7d33k7wpix5676d44k29fn3pln1r6935h4a2p1j8hw9rh"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-10-31"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "1d2f10665927e93eb65913f65860285371d41af5"; - sha256 = "1hz26hcf5cg90ymax82d23207cyyc32p6s0w2yjn3mj27pg8qiw2"; + rev = "4ba45b6a820bd87328c44f7053a00d243a3ff8f1"; + sha256 = "0a0brmxjlggs2rzvjm6sn0k8m4j57icd2cijgzsm1i5ylqaribg1"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4188,11 +4188,11 @@ final: prev: himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2023-09-14"; + version = "2023-11-08"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "950132d1bec1689476be2edc5913ba30bc13555a"; - sha256 = "116a34xy1ml0xrdcwy8jwqj4pw232449hx4v7crhj3cp68yq07n2"; + rev = "17afaa93586d703d60f16ca420f6a626b2479d73"; + sha256 = "0kzp8xf3rnml13x7c6m2736283jlgara3r001wncwkn4dr896l2n"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -4247,12 +4247,12 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-11-01"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "ccf8e08dcc08126b1b12b32c5c76e42f6008ed56"; - sha256 = "07rhdz045pgqi9ypmhgf4grp0cfxgzl24v8qlc72qi5r8np8dgv2"; + rev = "df0b5b693ef8c3d414b5b85e4bc11cea99c4958d"; + sha256 = "19xyzig3wq6k49ky2ki3ffc8f0kjzdl4wir3hs7fa6q4r53p5s7f"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-11-02"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "24369e8595736077e30b3ca5fc233f44abeccb8b"; - sha256 = "16ws4jzh17cmnmb85xy2d5s94dd6zaiscgcqgv4wqqx8nspq6b7d"; + rev = "bb3dc1a9fa34c3577bca627b848625e94a93efe8"; + sha256 = "0ikqzwsfapyq84d2lfdz2cjl83ppxdlg32220fgsxjxad1d2qran"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4792,8 +4792,8 @@ final: prev: src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "32dead0376f83b96728f5c799df64d0f0a325254"; - sha256 = "0i8g9r2yh1h6l05vrpwcl6r3ab8q0c42fhwv7q45zbhb9asl6gag"; + rev = "96584866b9c5e998cbae300594d0ccfd0c464627"; + sha256 = "11s0ddi1zcnyrh1q73jp2a4whvpajiwjd6dv8igfwj4jr21mrl39"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-03"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "5cf2c78e89c8492ccabd96edb580e265107176b1"; - sha256 = "1mqa0jpwyxh7h2c89swfbbva08myxsw7wk2lcw9iyw37ld118d6r"; + rev = "d60c954168caf61e00af1c42dd2eb2d2ec1c1b56"; + sha256 = "05rddkw2n2dpw22inj1af4ycwkgr9dq71zap3dr2wpi6f4gaag69"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5196,12 +5196,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-10-22"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "c51a9104de7fddff2351361d2dbcbd8d08600ef4"; - sha256 = "087z4p8mvmi1c8bvg8k5ay01vydv3npmm0x6vm8mp3d11fv1lm4v"; + rev = "bb874e8d832b66fa734b7b048d52eb9ed736bdcf"; + sha256 = "0m3k26sn52l34gc39gj913470n35bcw6vbp4wciqdhg8l4slliav"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-10-12"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "33250c84c7a552daf28ac607d9d9e82f88cd0907"; - sha256 = "0cgfr6caj309r8qn8dclk1ql2wxkijqkfciwp8r5f306c8i04j2h"; + rev = "9ed85616b772a07f8db56c26e8fff2d962f1f211"; + sha256 = "0vymhx89wzmqw9xzvqj9sni0a86wql88ibn07h08qinqcnsg8kb3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-02"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "7ebd0cc5923c81516c1c050fc9aea70bec23fd02"; - sha256 = "04sg60hnb2vg22rbrvf20jc95hh65g6cwiik90pcsmj73jxz6pjl"; + rev = "8b027966d1d5845831107a2505999d380cb18669"; + sha256 = "10nnrm2ijjycl95r0k01kgamvrai9w4pi1hcy24i01yc0nm8r234"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5424,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-10-26"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "40301e1c74bc0946eece13edf2b1c561cc497491"; - sha256 = "0j6haxvx5ha2a05wjqwlm8pwc5fp4v2a5f7vkwjij65y4vbssw6c"; + rev = "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3"; + sha256 = "143yq3hydkp54m2mw04rirqs7zgl7wp09jdlq5q9nb4v7ll7nmgg"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5448,12 +5448,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2023-10-31"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "eabf6d347fdb75be360d4c0ced1145670a171453"; - sha256 = "02gvv4bv7hl9lnb3g3rpjq8fqhc87i8zaa6lg60f0h8bjbp69pv3"; + rev = "41e75af1f578e55ba050c863587cffde3556ffa6"; + sha256 = "13gbx1nn5yjp13lqxdlalrwhk53b76qsqy662jzfz7scyp5siglz"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-03"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e8a413b1a29f05bb556a804ebee990eb54479586"; - sha256 = "0wlkpbxrpy4m1n1s5vv368x43zc19zi9s7962hljr5a4qink7zaa"; + rev = "e1f49ae456f4e6e8b79e657965f295886fbe2101"; + sha256 = "1nawpz9ssw4igca3q3jm74q1mk16f1r20mgmncpayijvcl1l5nxg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5604,12 +5604,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-10-27"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "1940afc3db7635e60934ca72774626a6c9a525d3"; - sha256 = "0b05l3q2fr95af4056pwzzzgbfk1nyqag5m192c11dy391vqvd75"; + rev = "1bd568305834b7355cd33826e0984d5818f01d11"; + sha256 = "0wx0zdzdfwc7ihglhn978c2i59b7r3b0nazwfcyi2yqsva2y8gb7"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5628,12 +5628,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-10-21"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "f9c28efc13f7a262e27669b984f3839ff5c50c32"; - sha256 = "1r8xf3jphgml0pax34p50d67rglnq5mazdlmma1jnfkm67acxaac"; + rev = "29763c6d49eaa8d0c9c9093a88fb38db34ba4875"; + sha256 = "1hxr0grv8fcaik3kbcd323jz5zgqc0k353n7lrrs0ka2qicz94k5"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -5940,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-10-31"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "76dd1b49c302620f2e11946ac7a7201105180be2"; - sha256 = "1i6mc4lv9bcz4gn18wdhbs1vkj2j4b7srxvf06x3xq8xcif2ljky"; + rev = "b6d8bee23444a267afa8b5dbdb9d82dbf39173ec"; + sha256 = "0vnlg9hswzamdbqy842ymfm4h4mny97ijwsl3fq987ql3cjbpvx3"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5988,12 +5988,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "80487e4f7bfa11c2ef2a1b461963db019aad6a73"; - sha256 = "13ibahs8wf7izl90mb1pdscfw5chrn744grnjhq7szqjf4ib8cki"; + rev = "20f1e5d3c143333bdf5ea48729f7b50660135cb3"; + sha256 = "0zkxq0wkbxq3yk1vgmhnb4cszvf13yx3z8886nfadnbl9v7rhkl5"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6024,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-10-31"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "5a2d4688a80d67dc224375c78e62ffd7dc1e79e6"; - sha256 = "0mf0m5b7zsv4fk625bzzdy8bci11ng7lgzz5li8v78gl8q7if62b"; + rev = "d3c5687a78cffc25026ff31d2fcbd61a2a3e067f"; + sha256 = "02yrcxmgx7va1h2nnabazwm7bwzffl5cmm4cbjssdhpsg6ahb2yk"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6096,12 +6096,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-03"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "98f390d8b0c42e40196ea4d831b42b3908137bc3"; - sha256 = "1f0n1s51i9xslwnlnnc0ncw55n6xz9j9my7jmr5649qxm0m7zzg4"; + rev = "55090798a2eed2dd00fc1b2774bc6bf309a3bd0b"; + sha256 = "1p5372c7n9ihyk8dnkwj4fb1as7q2md5xhqy5j17q7nviskvzq0s"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6241,12 +6241,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-10-30"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "961e538ebcf2c369fcc307420733bdb7b0560d4e"; - sha256 = "1kybzl7r5jriswhl54k7sw63ysmga8n6fbgf3db8i3s53nc1075f"; + rev = "328e8e40eacb2b5b0ea9c1e480644e768dc37df1"; + sha256 = "044zrhjmkxj1as4h91jpwmfjdbdl2bmcflzd3zm4lyyydb8rcxpp"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6697,12 +6697,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-10-27"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "a8413849cf9d648df0ae81a9349c8b125e628919"; - sha256 = "04h6dahcqmk5plviv7ra30ilgj2fgrnf1nc4r5ndkaw7lrqkp5dv"; + rev = "ff99797242f37dbc118baad3d31aa125e08da90f"; + sha256 = "1dnsrk07q3va0p52xq6qsqh0iqxfgxx45xnw0cxhya732i4jlbdk"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6757,12 +6757,12 @@ final: prev: nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-11-02"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "7e2243aef1b62cde443fc10f8baf018f672e2a85"; - sha256 = "1xcgnp045gfshal3v5cka9kaqmnfmcwnzlr2vz3s2z7v5i73akzl"; + rev = "010bedf0b7c01ab4d4e4e896a8527d97c222351d"; + sha256 = "0zy2p9gdyw5kz256ify79s72bc53pq1d3n813nzppxlggkndyn3v"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6817,12 +6817,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-10-25"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "51260c02a8ffded8e16162dcf41a23ec90cfba62"; - sha256 = "0h5n8ks34vxr2b17vddrv4vgjyr649bl7i839awpad21x146krkz"; + rev = "0b751f6beef40fd47375eaf53d3057e0bfa317e4"; + sha256 = "1qp7s2iam9zzdlw5sgkk6c623z7vjgga0rcg63ja0f836l90grba"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6937,12 +6937,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-11-01"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4"; - sha256 = "1i260w3g705blhsjhbsnqpp73phzxs5524ly1wjny7dm71b8sxdg"; + rev = "9d81c11fd185a131f81841e64941859305f6c42d"; + sha256 = "1pwn5c0hjm3wpzzybbakxgpq4bd7f6aygvslhivi4inzn48dla90"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7176,24 +7176,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-03"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "3db31bb52aa1148e466a76d0d5adca1450f7eb5a"; - sha256 = "18m470w3hwamvsmhycxf72hcks1cczhnf32kqm4j4qd37c77p5am"; + rev = "002fa927c9567ba70ab69225fd49f1e70c1290f8"; + sha256 = "1358imc5s0h0z4lyh2zyyiahcy5dl0jlkpc6iscfij6irlqv4jzr"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-03"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "8d2bd9a2d1f0b41c96dfa0c998cc22ba152935ed"; - sha256 = "124ckf0n3fjlw1f9rf1c8mv6jn1qxja5nfpb7l8p2zms8xssaksd"; + rev = "775ae0e5a451dd6c5d15de7a828ea72d2c54e8cf"; + sha256 = "1ldbq4qfajysfrplawba8jv6v6lcvnvfz18pas198npn2gp9kgna"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7224,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-04"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b44737605807023d32e6310b87ba69f4dbf10e0e"; - sha256 = "1dhq2ai09ky724sfdb2lalmbh5xkj53w5v2yrpbybwpw0sxfaa1l"; + rev = "b0852218bc5fa6514a71a9da6d5cfa63a263c83d"; + sha256 = "05qi1yiawvl4nj867q9fh6v9aaafxypx3md00dx5mhcg9jy5hchs"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7452,12 +7452,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-10-11"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "e8befc94ea66194700495d2f71419ba112634b0b"; - sha256 = "0015w0f55xfzbnf0f6pbipdg3k2zbvdcimw34qjbcf86cyllbr90"; + rev = "5af95a6ce8494edb5182b13d140b93dc186a7fa1"; + sha256 = "1ib3azimg2h6v9k91sdppz4s11m44iw579cy54l76fffarpabnkk"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7476,12 +7476,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-10-19"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "318ab244f1e69fff4ebcd95b3aeaa9879c39f299"; - sha256 = "0rv86azx0h31zrh8f8j5139fwz571wxa5jprp2yss35xljdws3ay"; + rev = "815895f3158878d6ef79a167b2f4e7bfe0342393"; + sha256 = "1s5p5q26yl6zp6cqpz4ymgdc5fb6900nf3gxsx3hc6j1ll94zhx4"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7500,24 +7500,24 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-11-03"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "5c3474fbe1028844cfe5a9c238366da04c2e7551"; - sha256 = "0h3f2nm6fc4755kj5fmsyi4img11sxqajl7cs23sbfi6ck65l2fg"; + rev = "3eb207fcafb6522e1ed531d760af3ef896cce030"; + sha256 = "0salsb05vwc72wmghyhw9v12pf000f19hjdivspl3fnp3ksygjf6"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-11-03"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "a12b9e8189d09f1670e6b58b0eecf1cecb97e41c"; - sha256 = "0cgjgrsh67gj9y44wxl7nms8f7g5yfzj49slznv6k7sbffrzi1n5"; + rev = "e0eeac5480704cc3fdd5bdadd4901ca5409d7838"; + sha256 = "09nl8id8adhk8qz8jz7ygwx5dmh96237gkp6fw2qdhvv4x7w843j"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7572,24 +7572,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-10-30"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7e3c0bee7b246ca835d5f7453db6fa19de359bab"; - sha256 = "12r3p0avnrla28mr0zizs4r3gcf0xrmzn4sn37vn2wzgfpwxx1lc"; + rev = "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c"; + sha256 = "1s8y0k8qj1skxa7q5j53wisv6j63104ysvvyfd1p8mbw8f00xq83"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-04"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "bef2c24e23d0da62a8542b1f08b1ac87ec43e93f"; - sha256 = "0xgbrkgj0cwds1igiidlc9nflnzf4p2iqwq364v2gv85rvi7b9jx"; + rev = "04a9a90c2a60c86aa9451c539586326b337b03e5"; + sha256 = "072kziq27h3iz8byh6awyz4q8kf05cnmxb3vs88x9nhflwvlfd68"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7644,12 +7644,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-10-26"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e69a504baf2951d52e1f1fbb05145d43f236cbf1"; - sha256 = "0g5ys17vj88fq17alwn4vvj00imc0niliqj63zwscm2xharqb7sr"; + rev = "dbcd9388e3b119a87c785e10a00d62876077d23d"; + sha256 = "0qprl987ljj9ki24n75g5fvpj8h4rqzx7n6sdicpmw9d91bn169b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7739,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-10-24"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "5de460ca7595806044eced31e3c36c159a493857"; - sha256 = "1ncwiha8ldxzx1g1hfisrgsvnqv05p7c19glbjp5bwbm5ihfsv04"; + rev = "47103b80c38c59f7a1b5408c232b92bf5d018651"; + sha256 = "1lw7zf5qf6rdw9cnwxbim43f5a99spc4ic884s53yw1g75y3wwv7"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7847,24 +7847,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-11-04"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "27d1c6613d6f5047d874c2418939100ee8491626"; - sha256 = "0m6ybgvb5af80cw0byz947d8fx0x9y3mpxqw456dn4ig10vgi8g0"; + rev = "154721cebecde111242377901760b6d175e49d84"; + sha256 = "06503m702f9ff59vpqz7al7my90k9rca1ll7mvwzdfrsfllkpggf"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "2e6996b0757c454a8bbf1eb719d0b0b065442213"; - sha256 = "05sg7h368d92w6ss1d7784k94z6b0capfdcg13jamcbj4m3ac5ni"; + rev = "3727410e4875ad8ba339c585859a9391d643b9ed"; + sha256 = "0h9d24y213bwr0nh3kalmfvsjiqkj3jjq9c81x3vkdy6g12kfdxm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8004,12 +8004,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-11-02"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "d1d6eff89d2ed0909764e13c3dea975051549f56"; - sha256 = "1i8jiyn5505p64i0cynd924gxv6hrqwrbyvd7ygb06l7nfi6b207"; + rev = "e9c08d58c13372981815d207c78763e5beac32d4"; + sha256 = "1rcq9gl29l5925ny1vqrfynzri84c0hn2nw8rd01210jilpsp2d8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8594,12 +8594,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-10-20"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "5831194debd23920a32abd9fefd5dddba44e34fc"; - sha256 = "16kwwfqj2kq8vzjpd6nsx4mxlrmq6f5m7rqivvbn4ccwsn4la8ks"; + rev = "156532476deb10b1b2a32cb38e1078b3f9951c42"; + sha256 = "03xgyfzb2jsz7788k5h122jskq90irgg0m12csbrb2ysd727pyf8"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8762,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-01"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "84b5674489e056598c8080c869b9485f11cb14e4"; - sha256 = "0y221wz44xfwy9i34nx5vq4m0azjlzgy4vybnsg9mwjzbm4xvcci"; + rev = "a355a08d566aaac33374e24b12009cbe0f6a5b90"; + sha256 = "1n8m4icv3ilzdw1la9zbak4x7pn96w0fvwm5qxja3vrz20ir05hm"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9051,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2022-08-03"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "aca7863edb34af45830e422393fa95bd7ea77f4b"; - sha256 = "06qgpqrqskpxaxp7cvra3pqra024i2jicqark7dyvcpc9krp02ry"; + rev = "d4921fcbc2de5d3663747688555dc0379ce4c41b"; + sha256 = "0by1p0aid5rg2wlh7alyshs01q70f6k7v7nkc985c38ag4bsnl24"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9219,12 +9219,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2023-09-02"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "53962443e4dc557e4d4c02b501adfcb5cd1368c3"; - sha256 = "048ybbfgsb7gz6jx7nkkzq30giqv93bnzicbhsa2g9r1hr9yphx4"; + rev = "89e6e2ed2e3d8fc55479ad642d260a95bb731d1a"; + sha256 = "1499ajkpq7vbapwn4s96wcmc5mnxrlidb7p34nhns41cn8kfss3n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9715,12 +9715,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-09-23"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "6e51d0cd6447cf2525412220ff0a2885eef9039c"; - sha256 = "1ksx2w2vaxnjyvj937la3fsiw7z0ary5qjnylxspw0zqp6d2ri9q"; + rev = "3044ff9e38d1ed8d7818d72d9f951ed9d1b0563d"; + sha256 = "0p1k1cfapbws0snf43idcrh326z2zcz3l05m3jv8dg9j7mmaps4w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9836,12 +9836,12 @@ final: prev: telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2023-04-27"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30"; - sha256 = "1amcaf182p3b27hx32m6vj1n3nz97qicwx3h51g5jlaf78z6pa8z"; + rev = "5460c6c60d48618c5c746e5b1cad4c3e8262fdae"; + sha256 = "0mj5sg698idk6lsaw6fd56j206vf0djv5sgaszjm4vffgc7666sb"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -9872,12 +9872,12 @@ final: prev: telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2023-10-11"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "b0015e6e4b46a64192c64b68dec9a9ac5a4e5690"; - sha256 = "1r8c29c6gd870ch7iyiln83y01hp73sgyh2rzq3cfzj4nx7fvgg2"; + rev = "0fc69ebbf178631b8ab76745459fade062156ec5"; + sha256 = "16ri6gxy4pgjf2rxxnd6p0i1ibaz08sd31n2v40n6y84is2nywrd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -9957,12 +9957,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-10-23"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "4522d7e3ea75ffddabdc39957168a8a7060b5df0"; - sha256 = "143bdqxfzlfbjrd80pw4wkz95szp21qs1zn7i230sdavvrq00b3b"; + rev = "20bf20500c95208c3ac0ef07245065bf94dcab15"; + sha256 = "096vv98xxdqy96ipz6lbricfr74bkc3r58x1si1816lnm0j896r5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10065,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-09-03"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "0a8ef564493a850b7646c57d55682e2ba19e50ad"; - sha256 = "184y9s384k5y10j5jr02jykh6h1d5g2wihfflzds1q98ip46zk2j"; + rev = "4df09daa30d2c58bc7baefce1428ed84e2f0fbc3"; + sha256 = "0754x0x1bqk6yn51qdnl8mrv6pc0rn1jqgmcrn0s00jsl1nbpims"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10246,12 +10246,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2023-10-14"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "070e6761d0b11a55446d988a69908f7a0928dbab"; - sha256 = "0svwk7gzvz48xj7rwbda8j2zkw3ymm1ah9m2cvibvi34kx5qg8j2"; + rev = "7b6e1ce4bfd679071a16ed212be6b3b1e0840dd4"; + sha256 = "02n5231gq3097a2ldgl5mflm0182mfcxc7wv801fd6gj3d021ls7"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10426,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ddf15e39b393081a6f41d749a391a66827fca611"; - sha256 = "0p4231w0752hzpc2zrxb5dzaz7d36dsvpl7k3qx98xbkvh72q3lp"; + rev = "790da1ea008bac817ec80eb941286120e3e59b74"; + sha256 = "0q084havhpxkws9ppw4hiv1sjq53w3q1sdfh492rkcrsrpppvgyv"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10498,12 +10498,12 @@ final: prev: venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2022-11-22"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "c114563960b8fb1197695d42798d1f3e7190b798"; - sha256 = "02fcn8h0k750vw8a4pibc3cvy02pbv25c8b01davhcill98nmkia"; + rev = "e4d68341a73dd56c64955058821a58295fb337b1"; + sha256 = "181sr7p8qn67br64ahg5vhb9b7m9mldwlg27nsgs0hc33vagvr1h"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -10522,12 +10522,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-10-27"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c6c818626be306c675fd47d57be045a30cb44303"; - sha256 = "0vbpp775h79c3kkf5saqszckgmd7qafv0d58b9qan310a91dcl7s"; + rev = "1d242f09a4e8cd20589a3cf48f0ac3830246f14d"; + sha256 = "126319l699a16b862y33a03zlpzbackbvn6d4brnabbmanisd56n"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12250,12 +12250,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2023-09-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f7b97666ae36c7b3f262f3190dbcd7033845d985"; - sha256 = "0qwp99ip17r1jf05w974ygbz1d9s69fpckwaccpbg7v3jgh973vm"; + rev = "6efb835aa2de69daaf164e1605decf4987609889"; + sha256 = "1qggjby8878ggcvgwjzfzx673fmn6gcamfwj2a00vpsrk8banqmh"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -12876,12 +12876,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-11-01"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "3451e22daade268f99b1cfeb0d9fe39f4ddc06d5"; - sha256 = "0fyxrp076liypxmbh5jklx1xvv0icmkr9v23mvlj964xq6sdv76s"; + rev = "743cbe28d8e6acd82eb7db6bac11c50661ec16a9"; + sha256 = "16vdabnq8rxkbi5bccr0fjxjhm0n7d3r1sdx1459s4b5h6his9bw"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -12960,12 +12960,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2023-02-23"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "8e735f84d2d954229ee65f4dc71bfc0bec897d98"; - sha256 = "09dl9i2y5drvgnvbid075w5sd0ad7ry1p1am2bfgykjcs1pz3jp1"; + rev = "281346a221434574dd7f8767a352b2bf0b218b74"; + sha256 = "0fa5b41qlall8z2pziwgc43sj24kpavrhdz9amwwsiv2g9wl5cli"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -13249,12 +13249,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-09-02"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "6dbe108230c7dbbf00555b7d4d9f6a891837ef07"; - sha256 = "1c0rkdr0pjrrplvr5adnb0q9vkq11kr7m5mvlggm633g45khjw5l"; + rev = "d30b72d20f01478a8486f15a57c89fe3177373db"; + sha256 = "0zlficdwybcz8mvzv70vp4mkzrwpmvp3v0dq88fyimyajyxi1aqp"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13357,12 +13357,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-10-30"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "d1619fd4a107d835577668abaa3a164683f5c3cb"; - sha256 = "1cf3iqss0kd12k9q752z32b7w8946mzd24s9rnxckdnvxgiqafhb"; + rev = "dae763bc4665516f354c20d84e53355a810682a2"; + sha256 = "1yddbd9wazxh95wrkw5lnb8fmlk3q4zj051f4qjn13rbj4j0ch6l"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -14437,12 +14437,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-10-15"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c65472ec9a7f5b59b39b8a453e409df28a61f19c"; - sha256 = "0m8ydin934k3x156vwy80lxdih5nqc5lyz9m3vkvwykrksjpln63"; + rev = "ce6ffa7d5f3d5faf739c07c0409b5e2035c279cc"; + sha256 = "04w9ybcfc4cyb5ipp8ccpr35r4ja45xasgn149bkqxv747j9hvhp"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14918,12 +14918,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2023-11-03"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "24e870b39556898f6a184fb29d763d9fb4b24af7"; - sha256 = "0y9czcv6vqh5vsp2hwvjajgs8ss6yhizk10qmhkyk1ki31i05pl2"; + rev = "77b37bef259b9979e15fd7fdaf659cc167487f21"; + sha256 = "1xskpb8ah9p5qw5vljc12zq7alm95xjhlcy78jhahb48nkf2b39l"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -15422,12 +15422,12 @@ final: prev: vim_current_word = buildVimPlugin { pname = "vim_current_word"; - version = "2023-05-23"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "dominikduda"; repo = "vim_current_word"; - rev = "52dddbcba60f7276cf66fa0b799ef18b0145569a"; - sha256 = "1fmas87r8kq9g4mzpf4jsjh09dfpfp0c110z1b47bhhi1xmy73zs"; + rev = "967c73804e38e5b2ceaa536328a4f76f1157a482"; + sha256 = "0wsssqw2nbd1nl804wp0iqhhf51fw4fv67s1g4pl3vpgrl8rh5l9"; }; meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; @@ -15554,12 +15554,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-10-03"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "831530b85aad02f2c465047a21452409bfaaf784"; - sha256 = "16s8gvjwxgsasdgb6ljaar2132hnlwki8gfcs2cwpnwkap9rjb29"; + rev = "66617adda22d29c60ec2ee9bcb854329352ada80"; + sha256 = "01sxg72xbvakdzc73ilkziyl8vl5qxkahfb293vlhy37hx3gbbzi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15567,12 +15567,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-10-31"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2ee33217ba76cb875429ceabd2d99c2f59fdfe11"; - sha256 = "04zlvlxia42x7786m2bafmjl0cqw8sp1d4h0idngh6pdy4gkq7sa"; + rev = "7d1dbd0eebe041fbda4d1132622bf051b1546497"; + sha256 = "130v7kqf14r46ndn199lc74fm4dxiky3c14kilx4adnifac7qywb"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16024,12 +16024,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-01"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "40dc9f0621c55bd40da4ad0731fac44d15bb393a"; - sha256 = "1sldlipm5rkx9nwrwjnqahfr5w4i8mangkscqmdx0fqm4narhm4v"; + rev = "d7521f6050b94cb0e23067f63829d86886f870fe"; + sha256 = "0rajb128dxdlbm0fhg5d6v5hhv1a9x6jik87bzdfr964jws05hg9"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 15c4ff61cd7..595601e56e3 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -39,12 +39,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=db929fc"; + version = "0.0.0+rev=ff1045f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "db929fc6822b9b9e1211678d508f187894ce0345"; - hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU="; + rev = "ff1045f5da90344d547022c50f1756be4adaf721"; + hash = "sha256-8qPkmLxe4DrZyVjiEYGTWlLnXDzMV/7ZlDFDAPY+jTE="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -72,12 +72,12 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=90c8d9b"; + version = "0.0.0+rev=4b4b46c"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06"; - hash = "sha256-XbjZtEkJLaecp+j8xgYOVC3ESC1o/rNAZgePsmDdgps="; + rev = "4b4b46c9a44ec7fb9e8c9ce4a010295edc5be8d5"; + hash = "sha256-bHlll+YgRpv4cSxzNAfVhexeMB7rgkzy3pdOZ5DW1ww="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -138,12 +138,12 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=6cb07d9"; + version = "0.0.0+rev=ffe6c2f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693"; - hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik="; + rev = "ffe6c2f3dbf30224479a28ca5d50df594b2486a9"; + hash = "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -204,12 +204,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=c80c219"; + version = "0.0.0+rev=871622a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "c80c219da2086696202cec8fc2501c02f4819a3f"; - hash = "sha256-CN/FKq+ygqraPELaDJRkCSq9DEcVCpNByz5iA2WRAWU="; + rev = "871622a3a483f0baf94923d8495c8e0bb2c09009"; + hash = "sha256-w4dCrAgb7/qQvFvo2RbfN0bRaUO8RKtReKx5i7SbTF8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -437,12 +437,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=9deacbf"; + version = "0.0.0+rev=a3bfa1a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052"; - hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ="; + rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; + hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; }; location = "tree-sitter-dtd"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; @@ -538,12 +538,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=bb06a83"; + version = "0.0.0+rev=35ae91b"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "bb06a83db4f0c176875d9d49756b760d15211134"; - hash = "sha256-IAUX5wrVpAj50cG0hrclhCx9x1hjSKdjqvEUYpe5a+g="; + rev = "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"; + hash = "sha256-sA1Sy2yHBACDlicLYX+BLdcy4cnpleaYYVcjPcgHtW0="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -681,12 +681,12 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=f58a4a4"; + version = "0.0.0+rev=19d554d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "f58a4a4bc55b9b43dfa7c4106257422764f97776"; - hash = "sha256-COCQXia5TiPjJ8/WZELB2lARbn/5YeNvunrm+GHFDQs="; + rev = "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"; + hash = "sha256-/mbnDUMVeyFmkkk/9AdhTvAjSeZcyc2rFgzaPJBiNs4="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; @@ -714,12 +714,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=0589025"; + version = "0.0.0+rev=3f93ccc"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "0589025ee57e335fe0698190a1bc322748d8f026"; - hash = "sha256-/lNo6p4hsl7TiWzIdJOuSHu0RFwPYdZGIVzlcgKOWr4="; + rev = "3f93cccaf278cc4c9cf9a373ea2f6389174d634c"; + hash = "sha256-TjyAaxEtGVjnBdcw1uyeQhotNhZlQKvN1SgbZwKvm3M="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -758,12 +758,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=bbaa67a"; + version = "0.0.0+rev=ff86c7f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "bbaa67a180cfe0c943e50c55130918be8efb20bd"; - hash = "sha256-G7d8CHCyKDAb9j6ijRfHk/HlgPqSI+uvkuRIRRvjkHI="; + rev = "ff86c7f1734873c8c4874ca4dd95603695686d7a"; + hash = "sha256-0oXApYf6Ht9xWrWMMaumac1Rqg52GMYW0bAhRbQ8To0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -813,12 +813,12 @@ }; gpg = buildGrammar { language = "gpg"; - version = "0.0.0+rev=9c26b66"; + version = "0.0.0+rev=18b2690"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gpg-config"; - rev = "9c26b66d6bca0bd0520269e98241709806561bd5"; - hash = "sha256-OybtJVKiQYpftPA+jMyOjswxtkLHvqqyLbmZkKkBFZc="; + rev = "18b2690a15f061a6ff48730589f7a4039af2d002"; + hash = "sha256-KLyXe1Xt1OPHmOMGX+ulVdjDhBpE31lO7/nGNiI4wt0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; }; @@ -1033,12 +1033,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=3c6f947"; + version = "0.0.0+rev=77f8418"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce"; - hash = "sha256-wpiI0KQ4fy7fGTT3+oDfQy9zEuWmF5P/xSc1pLeA++I="; + rev = "77f8418fdba7b402350e4817bbb54816bbc627d2"; + hash = "sha256-WnJ5RvPZx/+BkaOoTHV/yZQ+HFf60Nj9xoylt+3AgqA="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1165,15 +1165,26 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=494fb76"; + version = "0.0.0+rev=0ef8789"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8"; - hash = "sha256-AnUqNfqs8QMeiwltaVNnYGxEnqCeAyTi4nNEyUsH8F0="; + rev = "0ef87892401bb01c84b40916e1f150197bc134b1"; + hash = "sha256-A48osbWX8rkM5UlHcSX3t7PJ97IhsNe+JUTB4fnkDAE="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; + kusto = buildGrammar { + language = "kusto"; + version = "0.0.0+rev=8353a12"; + src = fetchFromGitHub { + owner = "Willem-J-an"; + repo = "tree-sitter-kusto"; + rev = "8353a1296607d6ba33db7c7e312226e5fc83e8ce"; + hash = "sha256-CZCvgOtHjCgyzKFdys+ZvSWCj1I1/b2MnaJcdAtm2aY="; + }; + meta.homepage = "https://github.com/Willem-J-an/tree-sitter-kusto"; + }; lalrpop = buildGrammar { language = "lalrpop"; version = "0.0.0+rev=06ae1b6"; @@ -1308,24 +1319,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=aaf7679"; + version = "0.0.0+rev=cd705f1"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; - hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; + rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94"; + hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=aaf7679"; + version = "0.0.0+rev=cd705f1"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; - hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; + rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94"; + hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1376,12 +1387,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=e2053f7"; + version = "0.0.0+rev=650a8fb"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "e2053f7c8856d91bc36c87604f697784845cee69"; - hash = "sha256-u41Qyyu9bNbcAjfTUoq2W2LvfqPpJ62xzaaAg3VbTsA="; + rev = "650a8fb72013ba8d169bdb458e480d640fc545c9"; + hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1589,12 +1600,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=e99bb52"; + version = "0.0.0+rev=3911403"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "e99bb5283805db4cb86c964722d709df21b0ac16"; - hash = "sha256-PiQIHB94UYvm0fHeBcjJiegcfZ3Rqhs1lxusGdXQ5zI="; + rev = "3911403cba497196fb867a6f1e286e3e1576f425"; + hash = "sha256-/BS3taDAcjTaPfqhKyh6dnA5N9E8n4oSZepdcJVAIsw="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -1655,12 +1666,12 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=d7b43b5"; + version = "0.0.0+rev=374f618"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "d7b43b51f92fb19efe8af45c2246087c611c8f63"; - hash = "sha256-83gE+dY1ldK5zFcEtqY3zZgk+MMrSA8w5alqp2sa/7Y="; + rev = "374f618de179498c2a821136bb86c3edbe221e10"; + hash = "sha256-X6PQQqY7fLB9AvCMfLlZ2cU8dKoCsw1KGjzYup8BoJ8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -1753,6 +1764,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; + purescript = buildGrammar { + language = "purescript"; + version = "0.0.0+rev=5ef5592"; + src = fetchFromGitHub { + owner = "postsolar"; + repo = "tree-sitter-purescript"; + rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c"; + hash = "sha256-V9cuENH/tpXt9mfZqJ2v4dxJvbwEHU8Ri+UxQafWemY="; + }; + meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; + }; pymanifest = buildGrammar { language = "pymanifest"; version = "0.0.0+rev=8953f91"; @@ -2121,12 +2143,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=9dcfe0f"; + version = "0.0.0+rev=6ac08de"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e"; - hash = "sha256-X7zfOxOVZ99vbCqRSt3rhtiaolByRPspldu9XF1B/XY="; + rev = "6ac08decae456ef2fc307977d9210f86d75d4eca"; + hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2187,12 +2209,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=7e4ccc9"; + version = "0.0.0+rev=b3bfaad"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "7e4ccc97a25315022a70b730085deccd5680a39b"; - hash = "sha256-1Uln7GHlgtNd7/3+FSBNDlTCqYodRbUyytPZYf660Nk="; + rev = "b3bfaad89426a062c2a5d971cfebb7262f8cff62"; + hash = "sha256-8rPtZmxfg1jHGqD4oKWfJpsVtk3cPPuwylJOWGXhtB0="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2300,12 +2322,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=7ba226c"; + version = "0.0.0+rev=204e858"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "7ba226cf85280c7917d082940022006e6a3b7b6f"; - hash = "sha256-OszsJIzggkPRor8aulnpHP0vPT+8fVfDtiIdUiAAqFU="; + rev = "204e858899f7dd5713dea7b0148d6aa477d4a18f"; + hash = "sha256-AzCXFr6YAmbmEiBEN6MI+MeBDoEDrJB2vcZl/OEUqmg="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2400,6 +2422,17 @@ }; meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; }; + udev = buildGrammar { + language = "udev"; + version = "0.0.0+rev=baeac48"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-udev"; + rev = "baeac48a999abb9384cdcce320f0182937aec8ba"; + hash = "sha256-XEbCi9Oo5mTiocdh8Uqr5XQ3nqH3MBZjZusGd076NWE="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev"; + }; ungrammar = buildGrammar { language = "ungrammar"; version = "0.0.0+rev=debd26f"; @@ -2447,12 +2480,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=e14fdf6"; + version = "0.0.0+rev=099a85f"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"; - hash = "sha256-ERtjgmnXzXyuKLxVy6Pi89B59BaB87JIzZqaWMZPR9k="; + rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"; + hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2547,12 +2580,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=61ed52f"; + version = "0.0.0+rev=a30e8ec"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "61ed52fa76a1797b7d22b831959b3abbbfdb7a05"; - hash = "sha256-SE4BKB1IKsvNFeqrLAzajSfB9dbLQlSSvSpzOBNChcQ="; + rev = "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05"; + hash = "sha256-B0XQ9C70AsbtDXZfZUcuoQf26rbiPcQrHrobrKjT+FM="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2560,12 +2593,12 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=9deacbf"; + version = "0.0.0+rev=a3bfa1a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052"; - hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ="; + rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; + hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; }; location = "tree-sitter-xml"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 83de6aabbac..ff93512e5c1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -434,7 +434,7 @@ https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, https://github.com/Issafalcon/lsp-overloads.nvim/,main, https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, -https://github.com/VonHeikemen/lsp-zero.nvim/,main, +https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x, https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2f00e4de0c8..2bb15a79b94 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.83.13"; + version = "3.85.17"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.83.13-build-231024j9x7ova5e.AppImage"; - hash = "sha256-ZuwPLYcVcjCCLdWSarY0oq0GUDiOrvNBgK/7ETb8OLg="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage"; + hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index b0feaf38ecc..f874db1e98d 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kismet"; - version = "2022-08-R1"; + version = "2023-07-R1"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E="; + hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc="; }; postPatch = '' @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478 ] ++ lib.optionals (!withNetworkManager) [ "--disable-libnm" ] ++ lib.optionals (!withPython) [ diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch deleted file mode 100644 index 1cef96ea140..00000000000 --- a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/scripts/makedbh b/scripts/makedbh -index 01e4fa5..d6299c6 100755 ---- a/scripts/makedbh -+++ b/scripts/makedbh -@@ -1,4 +1,4 @@ --#!/bin/csh -f -+#!/usr/bin/env tcsh - # - # makes the "database.h" (1st argument, $1) file from "database.h.in" - # (2nd argument, $2), setting various mask operation definitions diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index fc68969bd49..623f0897a7c 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.277"; + version = "8.3.446"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY="; + sha256 = "sha256-Isg8KAHicfTIETTmYoGsCYWt4+sLWdR+pGLaxu11Fe4="; }; nativeBuildInputs = [ python3 ]; @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; - patches = [ - ./0001-strip-bin-prefix.patch - ]; - meta = with lib; { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index ae3d28cc231..a3ea0297673 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -261,14 +261,14 @@ make_deterministic_repo(){ # Remove files that contain timestamps or otherwise have non-deterministic # properties. if [ -f .git ]; then - local dotgit_content=$(<.git) - local dotgit_dir="${dotgit_content#gitdir: }" + local dotgit_content=$(<.git) + local dotgit_dir="${dotgit_content#gitdir: }" else - local dotgit_dir=".git" + local dotgit_dir=".git" fi - pushd "$dotgit_dir" + pushd "$dotgit_dir" >/dev/null rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config - popd + popd >/dev/null # Remove all remote branches. git branch -r | while read -r branch; do clean_git branch -rD "$branch" diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 38ad126e5ce..d84cb848cc7 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-9EGoJ5DoGgVfbhCDeTvn1D7misJEj9jPwuiOK7z95Ts="; - aarch64-linux = "sha256-lO0YOSiO8AUrkbV+3Uyvg6p3bdAcTze3La2g5IcK1f0="; - x86_64-darwin = "sha256-WjvC3pt8Gd4q+BzrOhyGeYwZIbv2m5O3pSXe1N7Najw="; - aarch64-darwin = "sha256-IRm5m/Jaf4pmAzx+MXwmHLejo6Gv2OL56R1IEr/NlZU="; + x86_64-linux = "sha256-6dbgmYyXOUuWGOFXcO9eEZVoRjRLWK906SJh27wZ+PY="; + aarch64-linux = "sha256-cO1+ZVXC25zO5msU6Nbp29vkkNFRQ2jKSxtCZw1H104="; + x86_64-darwin = "sha256-3KMSoFQz7kYinD4QbS82dIq6UDetfdky6ClIfP83ISg="; + aarch64-darwin = "sha256-bj8PVJ4pfrNXo1yn5UbkHflskZMS61+LM9hi9mtdXtk="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.2.104"; + version = "1.4.16"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 5da88e6af8e..ba8d931280a 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; rev = "v${version}"; - hash = "sha256-KX/V1cVZoPtkP/ehnvcTeaQavHlHP6NJ7g+FbOaYKC4="; + hash = "sha256-mwDpdQEIgvdGbcXEtA3TLP1e2yFNRCdcljaOzDEoKjg="; }; - cargoHash = "sha256-skCvIMz50GqveyawVHicpEqMknvZuYNvp1u+gW4wG8A="; + cargoHash = "sha256-hGNfB82m2w9wDiPs8PMUExWOBN9ZQ+XVs1v8jhHuVhA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index a377f966241..f4e94d8f410 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "raft-cowsql"; - version = "0.17.7"; + version = "0.18.2"; src = fetchFromGitHub { owner = "cowsql"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-ZAUC2o0VWpC/zMOVOAxW+CAdiDTXa5JG0gfHirTjm88="; + hash = "sha256-CMcKXX2u+qiroleg5GIovTOVAg9ycXBsRDqfsOCL3yo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 29569d1137a..895e70a544b 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.139"; + version = "1.141"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs="; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8e..059350da7d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 5af34139f93..e655645cd86 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,13 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch -, mesa, libGLU, glfw -, libX11, libXi, libXcursor, libXrandr, libXinerama -, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib -, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +{ stdenv +, lib +, fetchFromGitHub +, cmake +, fetchpatch +, mesa +, libGLU +, glfw +, libX11 +, libXi +, libXcursor +, libXrandr +, libXinerama +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio , sharedLib ? true , includeEverything ? true , raylib-games +, darwin }: - +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; +in stdenv.mkDerivation (finalAttrs: { pname = "raylib"; version = "4.5.0"; @@ -21,11 +36,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ - mesa glfw libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsa-lib + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = [ libGLU libX11 ]; + + propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -33,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_EXAMPLES=OFF" "-DCUSTOMIZE_BUILD=1" ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; passthru.tests = [ raylib-games ]; @@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; - platforms = platforms.linux; + platforms = platforms.all; changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; }) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 2a551b3c9fc..86cc79d6269 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , buildPythonPackage +, colorlog , fetchFromGitHub , pint , poetry-core @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.3.1"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-/nixEjCQED1R2Z+iNs+bvxa6T+bPJ0b5Hn5vMO+v46Y="; + hash = "sha256-2wdgG22/Cln5uWQoT3Fs9tOLgB1X8J6AEqxV5R+lqno="; }; postPatch = '' @@ -37,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + colorlog pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index c6d705337d7..99264bbae49 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.13.1"; + version = "2.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ay/NaJ/u/XG9XQ7C2dzmJKs/j1s/vDHUnaE/qDhho9Q="; + hash = "sha256-IT18r7LKOVuiCuE/QzW6X/jkr5EK8sSR038i4LR1bcs="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 78dfe237e10..1f9bedd3715 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-0qVbHZ8ADyZDb4wLqEb7zgl3MHZz+8DSLGCMGlt0+eE="; + hash = "sha256-4AhxvUkLiej7OSj9Y19tJnVCzNlC5PF6KB5zTHN8gLA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index d25daaf21bc..353e2c0e053 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -24,6 +24,7 @@ # tests , nettools +, unixtools , mock , magic-wormhole-transit-relay , magic-wormhole-mailbox-server @@ -72,7 +73,8 @@ buildPythonPackage rec { magic-wormhole-mailbox-server pytestCheckHook ] - ++ passthru.optional-dependencies.dilation; + ++ passthru.optional-dependencies.dilation + ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; disabledTests = lib.optionals stdenv.isDarwin [ # These tests doesn't work within Darwin's sandbox diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 90d063a5114..3b039936561 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -3,24 +3,26 @@ , fetchFromGitHub , niapy , nltk +, numpy , pandas , poetry-core , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-kWOJfADqtC8YdZUlifKeiaS2a2cgcsMgCf0IHJt4NKY="; + hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les="; }; nativeBuildInputs = [ @@ -30,7 +32,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ niapy nltk + numpy pandas + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; disabledTests = [ diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 8d3ea92339b..626d87b796a 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -1,47 +1,57 @@ { lib , fetchFromGitHub , buildPythonPackage +, setuptools , setuptools-scm +, gpib-ctypes , pyserial , pyusb , pyvisa , typing-extensions +, psutil +, zeroconf , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.7.0"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288="; + hash = "sha256-zsa4TGDvvPAogOC0ljXC9uwWC9mteldUYprLmwrXNMQ="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ - pyserial - pyusb pyvisa typing-extensions ]; + passthru.optional-dependencies = { + gpib-ctypes = [ gpib-ctypes ]; + serial = [ pyserial ]; + usb = [ pyusb ]; + psutil = [ psutil ]; + hislip-discovery = [ zeroconf ]; + # vicp = [ pyvicp zeroconf ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; - postConfigure = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { description = "Module that implements the Virtual Instrument Software Architecture"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 5b240104ca8..c1464c233a9 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.28.1"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ebZayF5VGHXjBFO3k2KegCNqAFygB3BXKvdvr8mF/Ss="; + hash = "sha256-cIfX9MpRMXtBfLKHKTzCLkv31fBIyanTQHEs8hHk7aQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl-thumbnail/default.nix index dedd7864f24..2337d6b940c 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl-thumbnail/default.nix @@ -1,28 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, setuptools , setuptools-scm +, django }: buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.9.0"; - disabled = isPy27; + version = "12.10.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM="; + hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + buildInputs = [ + django + ]; + + env.DJANGO_SETTINGS_MODULE = "sorl.thumbnail.conf.defaults"; + # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; + pythonImportsCheck = [ + "sorl.thumbnail" + ]; + meta = with lib; { homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/"; description = "Thumbnails for Django"; + changelog = "https://github.com/jazzband/sorl-thumbnail/blob/${version}/CHANGES.rst"; license = licenses.bsd3; }; - } diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 123b1a2c508..475a9c6540a 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.2"; + version = "1.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xfUePKLmR1Arhs0c1ZNjca6klJdGL0o2DdGLsejE6zw="; + hash = "sha256-Q8oV0mw8POFscFcdsYZfTkavNVQyqWdLAdb4lDX4ahM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 06d2534eb23..e4ac317418a 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.10.3"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLObject"; inherit version; - hash = "sha256-pbXO+gXgKD2ycuG6RirEnQnGmBJpUkorptBrS4b8FS4="; + hash = "sha256-QrGyrM6e1cxCtF4GxoivXU/Gj2H8VnG7EFcgimLfdng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c70241afeb3..88c2ccf4596 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "6.5.0"; + version = "7.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9fTHare5AfJjHvd3QdBpMg8zKMHjGRjax+20qgSssP0="; + hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index c473a3755fe..6bcdde6c739 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -1,35 +1,49 @@ { lib , buildPythonPackage -, python , fetchPypi , defusedxml , requests , packaging , requests-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.26"; + version = "0.28"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vn7A7n0Z4kTtrm8MEoUJiv94K3qA/4Kx8lElhDM/LlI="; + hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA="; }; - propagatedBuildInputs = [ defusedxml requests packaging ]; + propagatedBuildInputs = [ + defusedxml + requests + packaging + ]; - checkInputs = [ requests-mock ]; + nativeCheckInputs = [ + requests-mock + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + # Tests attempt to create some file artifacts and fails + doCheck = false; - doCheck = false; # it attempts to create some file artifacts and fails + pythonImportsCheck = [ + "tableauserverclient" + ]; - meta = { - description = "A Python module for working with the Tableau Server REST API."; - homepage = "https://pypi.org/project/tableauserverclient/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + meta = with lib; { + description = "Module for working with the Tableau Server REST API"; + homepage = "https://github.com/tableau/server-client-python"; + changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index daf4db447c4..fe840bcd4e2 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.6"; + version = "3.9.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CMgqZePM67IejwYy+x6vfFSPpAA5NRUp5KRD1lEq7io="; + hash = "sha256-A59b7qr9Y4LuIwP51ci7k1019/T+qNcDYPDNCkmqpi4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 6b7598a386b..3a5486ff86e 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+3bxc0ryHtbEJkB+EqjJhW+yWJWxMkxlSav4v6D3/gw="; + hash = "sha256-K3JpAVkw6njUT2AGGLL3ACagPK0K6Ny4PvCsbmuNvTo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 39c71da1776..016ed7de737 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.4.1"; + version = "4.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU="; + hash = "sha256-LLky4lSSMUmLEf+qHwgPvDu0DZhG4WWZ1aFSXqFm1BA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 638a00c6090..81be449f7f0 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GF3YDuyhnEx0JpOxU/tRAnFu+98p0TF5NCU1CXnR2bE="; + hash = "sha256-JVtG3t6rkZ5nrttMlryqdcU35DSblNe3MfvlqLqHJp0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index adc2718554a..41e92d025d3 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.9"; + version = "0.19.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-vVno8ql7e9N0Xj+GALDtgAZBRrN1NxVcUIJuKNJIZDA="; + hash = "sha256-YowjnLt7eCBzBfklBOEEDRClp/ToA3KLi+xuftUoti4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index 74b85c6e4a4..45d4c9bedf1 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.0.0.3"; + version = "10.1.0.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-rgyHfTY9o0m7uCxUY8nngDcpDMB9NxTLDOr10vf1yCU="; + hash = "sha256-UlwcXuZ7CsFyHEDSvGGCJu8hI8NH5SfhTgW5IHIaE7k="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index e644b715544..1004c671a1c 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.2"; + version = "4.24.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WYuyKQubDqZfT2NWmgneqkR17de7DYWJBXo43rCxn08="; + hash = "sha256-V6tCyxcd/bosdLtbUMJQR4U4zDxe2VuLNokprQyfkKU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 76691b13b12..b7f751a0cca 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.2.0.2"; + version = "23.3.0.0"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0="; + hash = "sha256-X/sHf+cLaZyI1cqrmZroDhkv4ov2zaeYm355seTi3NM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 1b59386174e..c2e0e055132 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.7"; + version = "4.6.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KMQVPdtcnU8Q3vRKJFRnPDYdLV/DzYZ887sVIPP1mjg="; + hash = "sha256-qn+190NTRQDydN3xGrHJEKrhAgSBhlo2t5nh1n3iqvM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 3ba0e22f83a..d1ba11d15ec 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.24.1"; + version = "3.25.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4HM1DCG9TcpcDqxd1dlftHQnjHFaryBB44LYa7dRisg="; + hash = "sha256-iU33APwfCpMvo3ACn2RK9AYvhxgCb9pa0HZH01fZUWc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix new file mode 100644 index 00000000000..895b00231ae --- /dev/null +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-dottedname"; + version = "6.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.dottedname"; + inherit version; + hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/dottedname/tests.py" + ]; + + pythonImportsCheck = [ + "zope.dottedname" + ]; + + pythonNamespaces = [ + "zope" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.dottedname"; + description = "Resolver for Python dotted names"; + changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix deleted file mode 100644 index bb9f527555e..00000000000 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "zope.dottedname"; - version = "5.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; - }; - - meta = with lib; { - homepage = "http://pypi.python.org/pypi/zope.dottedname"; - description = "Resolver for Python dotted names"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 39400d5b4bc..a8286ef5df9 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -25,7 +25,6 @@ , quickemu , testers , installShellFiles -, fetchpatch }: let runtimePaths = [ @@ -51,23 +50,15 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.9"; + version = "4.9.1"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-ZCHGZb4mdtnNfFBcSqZJRW7fmkTBrWrVko3iwEhO1RY="; + hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4="; }; - patches = [ - # https://github.com/quickemu-project/quickemu/pull/815 - (fetchpatch { - url = "https://github.com/quickemu-project/quickemu/commit/2b9d95a746fd85be0cea48e5544b18dc3ae18d27.patch"; - hash = "sha256-fTJEd3o7LznT1mGwfxXWlW8XM1BmIeId+j8pGjIfIcE="; - }) - ]; - postPatch = '' sed -i \ -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 8fb37a9f666..35f1c9980b4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -22,6 +22,7 @@ , file , substituteAll , writeTextFile +, writeShellApplication }: let @@ -128,6 +129,17 @@ let defaultShellPath = lib.makeBinPath defaultShellUtils; + bashWithDefaultShellUtils = writeShellApplication { + name = "bash"; + runtimeInputs = defaultShellUtils; + text = '' + if [[ "$PATH" == "/no-such-path" ]]; then + export PATH=${defaultShellPath} + fi + exec ${bash}/bin/bash "$@" + ''; + }; + platforms = lib.platforms.linux ++ lib.platforms.darwin; system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; @@ -420,8 +432,8 @@ stdenv.mkDerivation rec { # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. substituteInPlace "$path" \ - --replace /bin/bash ${bash}/bin/bash \ - --replace "/usr/bin/env bash" ${bash}/bin/bash \ + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \ + --replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \ --replace "/usr/bin/env python" ${python3}/bin/python \ --replace /usr/bin/env ${coreutils}/bin/env \ --replace /bin/true ${coreutils}/bin/true @@ -436,17 +448,17 @@ stdenv.mkDerivation rec { # bazel test runner include references to /bin/bash substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash for i in $(find tools/cpp/ -type f) do substituteInPlace $i \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF @@ -523,7 +535,7 @@ stdenv.mkDerivation rec { in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches; - buildInputs = [buildJdk] ++ defaultShellUtils; + buildInputs = [buildJdk bashWithDefaultShellUtils] ++ defaultShellUtils; # when a command can’t be found in a bazel build, you might also # need to add it to `defaultShellPath`. diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 6cb2b540f4a..34ef5c80143 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, raylib }: +{ lib, stdenv, fetchFromGitHub, raylib, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ]; + buildInputs = [ raylib ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index 471882ae1b4..01607be58fc 100644 --- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "linux-wifi-hotspot"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "lakinduakash"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCVJPEAZZzOGCf45oo1J7wWtYn/IJfcASHnKR+R0Ge4="; + sha256 = "sha256-u9OdSpdxnjHOrK6PP/SFvGRtezssoZSoJFGVdRbOIPU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index e41ec383a9b..e0a66d136db 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-1EdDMSlC6hh1iNmra63DTLG6TAkmpZ/lIjvdfLJuC74="; - arm64-linux_hash = "sha256-CZj/zg6SkHmpiIbEIpxYMtlSLsDTFLBJYqr2pUpSu94="; - x64-osx_hash = "sha256-NRMbHLffx093gEb24I/fdp2fYioDehQ5gBMpZciX+ts="; + x64-linux_hash = "sha256-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc="; + arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k="; + x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.8.2267"; + version = "0.3.10.2287"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 7c7aa252bd6..c8f2d806184 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.2.12"; + version = "23.2.14"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-Sg41XXn/L1YglD2ryEC4AT70rv0hjZtTCf7O1Lwmqwo="; + sha256 = "sha256-VvbyVAcNPe1UOEfX+HSY4OaOBS78YZuFgpIYo2s1kXo="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-DNtkva6t3Arja6I20rgyw7Ty1OX32nkDMOABPwu2GIQ="; + vendorHash = "sha256-mLMMw48d1FOvIIjDNza0rZSWP55lP1AItR/hT3lYXDg="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index 2ca2f1bd8d7..cefa00d4163 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -11,64 +11,64 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js"; - sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js"; + sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI="; }; tablerCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css"; - sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; + sha256 = "sha256-lS3nKxMMZiKIRJG7UgUonOHYuvHgW5eckEjvHMYxb9Q="; }; tablerVendorsCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css"; - sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css"; + sha256 = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY="; }; tablerJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js"; - sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js"; + sha256 = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ="; }; listJsFixed = fetchurl { - url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js"; - sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s="; + url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js"; + sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg"; - sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg"; + sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY="; }; in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.9.5"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s="; + hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ "$(cat ${tablerCss})" substituteInPlace sqlpage/sqlpage.css \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \ "$(cat ${tablerVendorsCss})" substituteInPlace sqlpage/sqlpage.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \ "$(cat ${tablerJs})" substituteInPlace sqlpage/sqlpage.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" ''; - cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw="; + cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index bd0d85fc676..63d02c8f085 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -3,6 +3,43 @@ stdenv: let + # Lib attributes are inherited to the lexical scope for performance reasons. + inherit (lib) + any + assertMsg + attrNames + boolToString + chooseDevOutputs + concatLists + concatMap + concatMapStrings + concatStringsSep + elem + elemAt + extendDerivation + filter + findFirst + flip + head + imap1 + isAttrs + isBool + isDerivation + isInt + isList + isString + mapAttrs + mapNullable + optional + optionalAttrs + optionalString + optionals + remove + splitString + subtractLists + unique + ; + checkMeta = import ./check-meta.nix { inherit lib config; # Nix itself uses the `system` field of a derivation to decide where @@ -115,7 +152,7 @@ let # Including it then would cause needless mass rebuilds. # # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909 - configurePlatforms ? lib.optionals + configurePlatforms ? optionals (stdenv.hostPlatform != stdenv.buildPlatform || config.configurePlatformsByDefault) [ "build" "host" ] @@ -168,7 +205,7 @@ let # Policy on acceptable hash types in nixpkgs assert attrs ? outputHash -> ( let algo = - attrs.outputHashAlgo or (lib.head (lib.splitString "-" attrs.outputHash)); + attrs.outputHashAlgo or (head (splitString "-" attrs.outputHash)); in if algo == "md5" then throw "Rejected insecure ${algo} hash '${attrs.outputHash}'" @@ -183,12 +220,12 @@ let doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; - outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; + outputs' = outputs ++ optional separateDebugInfo' "debug"; # Turn a derivation into its outPath without a string context attached. # See the comment at the usage site. unsafeDerivationToUntrackedOutpath = drv: - if lib.isDerivation drv + if isDerivation drv then builtins.unsafeDiscardStringContext drv.outPath else drv; @@ -198,9 +235,9 @@ let ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; - hardeningDisable' = if lib.any (x: x == "fortify") hardeningDisable + hardeningDisable' = if any (x: x == "fortify") hardeningDisable # disabling fortify implies fortify3 should also be disabled - then lib.unique (hardeningDisable ++ [ "fortify3" ]) + then unique (hardeningDisable ++ [ "fortify3" ]) else hardeningDisable; supportedHardeningFlags = [ "fortify" "fortify3" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; # Musl-based platforms will keep "pie", other platforms will not. @@ -212,19 +249,19 @@ let # - static armv7l, where compilation fails. !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) then supportedHardeningFlags - else lib.remove "pie" supportedHardeningFlags; + else remove "pie" supportedHardeningFlags; enabledHardeningOptions = if builtins.elem "all" hardeningDisable' then [] - else lib.subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); + else subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". - erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); + erroneousHardeningFlags = subtractLists supportedHardeningFlags (hardeningEnable ++ remove "all" hardeningDisable); checkDependencyList = checkDependencyList' []; - checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: - if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep - else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep - else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); + checkDependencyList' = positions: name: deps: flip imap1 deps (index: dep: + if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep + else if isList dep then checkDependencyList' ([index] ++ positions) name dep + else throw "Dependency is not of a valid type: ${concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; @@ -233,20 +270,20 @@ else let doCheck = doCheck'; doInstallCheck = doInstallCheck'; buildInputs' = buildInputs - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck installCheckInputs; + ++ optionals doCheck checkInputs + ++ optionals doInstallCheck installCheckInputs; nativeBuildInputs' = nativeBuildInputs - ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh - ++ lib.optionals doCheck nativeCheckInputs - ++ lib.optionals doInstallCheck nativeInstallCheckInputs; + ++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh + ++ optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ optionals doCheck nativeCheckInputs + ++ optionals doInstallCheck nativeInstallCheckInputs; outputs = outputs'; references = nativeBuildInputs ++ buildInputs ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; - dependencies = map (map lib.chooseDevOutputs) [ + dependencies = map (map chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild)) (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs')) @@ -260,7 +297,7 @@ else let (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget)) ] ]; - propagatedDependencies = map (map lib.chooseDevOutputs) [ + propagatedDependencies = map (map chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated)) (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs)) @@ -276,26 +313,26 @@ else let ]; computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) + concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraNativeBuildInputs ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies); + ++ concatLists dependencies); computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (lib.concatLists propagatedDependencies); + concatMap (input: input.__propagatedSandboxProfile or []) + (concatLists propagatedDependencies); computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + unique (concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraNativeBuildInputs ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies)); + ++ concatLists dependencies)); computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (lib.concatLists propagatedDependencies)); + unique (concatMap (input: input.__propagatedImpureHostDeps or []) + (concatLists propagatedDependencies)); - envIsExportable = lib.isAttrs env && !lib.isDerivation env; + envIsExportable = isAttrs env && !isDerivation env; derivationArg = (removeAttrs attrs @@ -306,8 +343,8 @@ else let "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"] - ++ lib.optional (__structuredAttrs || envIsExportable) "env")) - // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { + ++ optional (__structuredAttrs || envIsExportable) "env")) + // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let # Indicate the host platform of the derivation if cross compiling. @@ -315,7 +352,7 @@ else let # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the # hash can't be the same. See #32986. - hostSuffix = lib.optionalString + hostSuffix = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) "-${stdenv.hostPlatform.config}"; @@ -324,17 +361,17 @@ else let # nix and nixStatic. This should be also achieved by moving the # hostSuffix before the version, so we could contemplate removing # it again. - staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; + staticMarker = optionalString stdenv.hostPlatform.isStatic "-static"; in lib.strings.sanitizeDerivationName ( if attrs ? name then attrs.name + hostSuffix else # we cannot coerce null to a string below - assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null."; + assert assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null."; "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); - }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // { + }) // optionalAttrs __structuredAttrs { env = checkedEnv; } // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; @@ -351,22 +388,22 @@ else let __ignoreNulls = true; inherit __structuredAttrs strictDeps; - depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; - nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; - depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; - depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; - buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; - depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; + depsBuildBuild = elemAt (elemAt dependencies 0) 0; + nativeBuildInputs = elemAt (elemAt dependencies 0) 1; + depsBuildTarget = elemAt (elemAt dependencies 0) 2; + depsHostHost = elemAt (elemAt dependencies 1) 0; + buildInputs = elemAt (elemAt dependencies 1) 1; + depsTargetTarget = elemAt (elemAt dependencies 2) 0; - depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; - propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; - depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; - depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; - propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; - depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; + depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0; + propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1; + depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2; + depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0; + propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1; + depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0; # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck - configureFlags = let inherit (lib) optional elem; in + configureFlags = configureFlags ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" @@ -374,21 +411,21 @@ else let cmakeFlags = cmakeFlags - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ - "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" - ] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [ + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ + "-DCMAKE_SYSTEM_NAME=${findFirst isString "Generic" (optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" + ] ++ optionals (stdenv.hostPlatform.uname.processor != null) [ "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" - ] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [ + ] ++ optionals (stdenv.hostPlatform.uname.release != null) [ "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin) [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.system != null) [ "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.processor != null) [ "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.release != null) [ "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" - ] ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DCMAKE_CROSSCOMPILING_EMULATOR=env" ]); @@ -403,7 +440,7 @@ else let crossFile = builtins.toFile "cross-file.conf" '' [properties] bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] - needs_exe_wrapper = ${lib.boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} + needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} [host_machine] system = '${stdenv.targetPlatform.parsed.kernel.name}' @@ -415,7 +452,7 @@ else let llvm-config = 'llvm-config-native' rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] ''; - crossFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; in crossFlags ++ mesonFlags; inherit patches; @@ -423,28 +460,28 @@ else let inherit doCheck doInstallCheck; inherit outputs; - } // lib.optionalAttrs (__contentAddressed) { + } // optionalAttrs (__contentAddressed) { inherit __contentAddressed; # Provide default values for outputHashMode and outputHashAlgo because # most people won't care about these anyways outputHashAlgo = attrs.outputHashAlgo or "sha256"; outputHashMode = attrs.outputHashMode or "recursive"; - } // lib.optionalAttrs (enableParallelBuilding) { + } // optionalAttrs (enableParallelBuilding) { inherit enableParallelBuilding; enableParallelChecking = attrs.enableParallelChecking or true; enableParallelInstalling = attrs.enableParallelInstalling or true; - } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { + } // optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { + } // optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; - } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + } // optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; - # TODO: remove lib.unique once nix has a list canonicalization primitive + # TODO: remove `unique` once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; - final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + final = concatStringsSep "\n" (filter (x: x != "") (unique profiles)); in final; - __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); + __propagatedSandboxProfile = unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ "/dev/zero" "/dev/random" @@ -471,21 +508,21 @@ else let # to be built eventually, we would still like to get the error early and without # having to wait while nix builds a derivation that might not be used. # See also https://github.com/NixOS/nix/issues/4629 - lib.optionalAttrs (attrs ? disallowedReferences) { + optionalAttrs (attrs ? disallowedReferences) { disallowedReferences = map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; } // - lib.optionalAttrs (attrs ? disallowedRequisites) { + optionalAttrs (attrs ? disallowedRequisites) { disallowedRequisites = map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; } // - lib.optionalAttrs (attrs ? allowedReferences) { + optionalAttrs (attrs ? allowedReferences) { allowedReferences = - lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; } // - lib.optionalAttrs (attrs ? allowedRequisites) { + optionalAttrs (attrs ? allowedRequisites) { allowedRequisites = - lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; meta = checkMeta.commonMeta { inherit validity attrs pos references; }; @@ -493,20 +530,20 @@ else let checkedEnv = let - overlappingNames = lib.attrNames (builtins.intersectAttrs env derivationArg); + overlappingNames = attrNames (builtins.intersectAttrs env derivationArg); in - assert lib.assertMsg envIsExportable + assert assertMsg envIsExportable "When using structured attributes, `env` must be an attribute set of environment variables."; - assert lib.assertMsg (overlappingNames == [ ]) - "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}"; - lib.mapAttrs - (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v || lib.isDerivation v) + assert assertMsg (overlappingNames == [ ]) + "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${concatStringsSep ", " overlappingNames}"; + mapAttrs + (n: v: assert assertMsg (isString v || isBool v || isInt v || isDerivation v) "The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v) env; in -lib.extendDerivation +extendDerivation validity.handled ({ # A derivation that always builds successfully and whose runtime @@ -555,7 +592,7 @@ lib.extendDerivation # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) - (derivation (derivationArg // lib.optionalAttrs envIsExportable checkedEnv)); + (derivation (derivationArg // optionalAttrs envIsExportable checkedEnv)); in fnOrAttrs: diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 76b8b8f8f52..d838181a9c7 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-bYrn1Ok1yyhiKPUBdvUvTKVeAwsWAwbNoK3IburOAuU="; + hash = "sha256-Wj7zKszVtaTwcIoTtjHasShEnSDoiZ53Gnz38Ci31Hs="; }; vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; diff --git a/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch b/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch new file mode 100644 index 00000000000..4ddd18bbd46 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch @@ -0,0 +1,45 @@ +--- + setup.py | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index 985d28d..933f3df 100755 +--- a/setup.py ++++ b/setup.py +@@ -24,13 +24,9 @@ import shutil + # finding os platform + os_type = platform.system() + +-if os_type == 'Linux' or os_type == 'FreeBSD' or os_type == 'OpenBSD': +- from setuptools import setup, Command, find_packages +- setuptools_available = True +- print(os_type + " detected!") +-else: +- print('This script is only work for GNU/Linux or BSD!') +- sys.exit(1) ++from setuptools import setup, Command, find_packages ++setuptools_available = True ++print(os_type + " detected!") + + # Checking dependencies! + not_installed = '' +@@ -100,6 +96,7 @@ else: + print('paplay is found!') + + # sound-theme-freedesktop ++notifications_path = '' + if os_type == 'Linux': + notifications_path = '/usr/share/sounds/freedesktop/stereo/' + elif os_type == 'FreeBSD' or os_type == 'OpenBSD': +@@ -139,7 +136,7 @@ if sys.argv[1] == "test": + + DESCRIPTION = 'Persepolis Download Manager' + +-if os_type == 'Linux': ++if os_type in ['Linux', 'Darwin']: + DATA_FILES = [ + ('/usr/share/man/man1/', ['man/persepolis.1.gz']), + ('/usr/share/applications/', ['xdg/com.github.persepolisdm.persepolis.desktop']), +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch b/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch new file mode 100644 index 00000000000..50252c8cd72 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch @@ -0,0 +1,41 @@ +--- + persepolis/scripts/mac_notification.py | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +diff --git a/persepolis/scripts/mac_notification.py b/persepolis/scripts/mac_notification.py +index 4d69929..9a9a7cf 100644 +--- a/persepolis/scripts/mac_notification.py ++++ b/persepolis/scripts/mac_notification.py +@@ -15,20 +15,13 @@ + + # native notification on mac! needs Xcode (latest version) installed and pyobjc + # library from pip +-import Foundation +-import AppKit +-import objc +- +-NSUserNotification = objc.lookUpClass('NSUserNotification') +-NSUserNotificationCenter = objc.lookUpClass('NSUserNotificationCenter') +- +- + def notifyMac(title, subtitle, info_text, delay=0): +- notification = NSUserNotification.alloc().init() +- notification.setTitle_(title) +- notification.setSubtitle_(subtitle) +- notification.setInformativeText_(info_text) +- notification.setDeliveryDate_(Foundation.NSDate.dateWithTimeInterval_sinceDate_( +- delay, Foundation.NSDate.date())) +- NSUserNotificationCenter.defaultUserNotificationCenter( +- ).scheduleNotification_(notification) ++ print(f""" ++Warning: Persepolis was installed from nixpkgs, which currently breaks notifications ++ on macOS. Until https://github.com/NixOS/nixpkgs/issues/105156 is resolved, ++ this cannot be fixed. The notification that should've been displayed was: ++ ++ title: {title} ++ subtitle: {subtitle} ++ info_text: {info_text} ++ """) +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch b/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch new file mode 100644 index 00000000000..ab3c957ef4b --- /dev/null +++ b/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch @@ -0,0 +1,29 @@ +--- + persepolis/scripts/download.py | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/persepolis/scripts/download.py b/persepolis/scripts/download.py +index aaabb35..69676d3 100644 +--- a/persepolis/scripts/download.py ++++ b/persepolis/scripts/download.py +@@ -72,16 +72,8 @@ def startAria(): + + # in macintosh + elif os_type == 'Darwin': +- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False: +- +- cwd = sys.argv[0] +- current_directory = os.path.dirname(cwd) +- aria2d = os.path.join(current_directory, 'aria2c') + +- else: +- aria2d = aria2_path +- +- subprocess.Popen([aria2d, '--no-conf', ++ subprocess.Popen(['aria2c', '--no-conf', + '--enable-rpc', '--rpc-listen-port=' + str(port), + '--rpc-max-request-size=2M', + '--rpc-listen-all', '--quiet=true'], +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch b/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch new file mode 100644 index 00000000000..800f7bddd40 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch @@ -0,0 +1,34 @@ +--- + persepolis/scripts/mainwindow.py | 2 +- + persepolis/scripts/useful_tools.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py +index d21f3f4..a0e3674 100644 +--- a/persepolis/scripts/mainwindow.py ++++ b/persepolis/scripts/mainwindow.py +@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread): + + else: + pipe = subprocess.Popen( +- [ffmpeg_path, '-version'], ++ ['ffmpeg', '-version'], + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, +diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py +index b780967..31733eb 100644 +--- a/persepolis/scripts/useful_tools.py ++++ b/persepolis/scripts/useful_tools.py +@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary): + current_directory = os.path.dirname(cwd) + ffmpeg_path = os.path.join(current_directory, 'ffmpeg') + +- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path, ++ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path, + '-i', audio_file_path, + '-c', 'copy', + '-shortest', +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index a4ba2b4f04a..35727c13e69 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib +, stdenv +, buildPythonApplication +, fetchFromGitHub , aria +, ffmpeg , libnotify , pulseaudio , psutil @@ -9,7 +13,7 @@ , setuptools , sound-theme-freedesktop , wrapQtAppsHook -, youtube-dl +, yt-dlp }: buildPythonApplication rec { @@ -26,10 +30,27 @@ buildPythonApplication rec { # see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130 doCheck = false; - preBuild='' + preBuild= + # Make setup automatic + '' substituteInPlace setup.py --replace "answer = input(" "answer = 'y'#" + '' + + # Replace abandoned youtube-dl with maintained fork yt-dlp. Fixes https://github.com/persepolisdm/persepolis/issues/930, + # can be removed if that issue is fixed and/or https://github.com/persepolisdm/persepolis/pull/936 is merged + '' + substituteInPlace setup.py ./persepolis/scripts/video_finder_addlink.py --replace \ + "import youtube_dl" "import yt_dlp as youtube_dl" ''; + patches = lib.optionals stdenv.isDarwin [ + # Upstream is abandonware, the last commit to master was on 2021-08-26. + # If it is forked or picked up again, consider upstreaming these patches. + ./0001-Allow-building-on-darwin.patch + ./0002-Fix-startup-crash-on-darwin.patch + ./0003-Search-PATH-for-aria2c-on-darwin.patch + ./0004-Search-PATH-for-ffmpeg-on-darwin.patch + ]; + postPatch = '' sed -i 's|/usr/share/sounds/freedesktop/stereo/|${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/|' setup.py sed -i "s|'persepolis = persepolis.__main__'|'persepolis = persepolis.scripts.persepolis:main'|" setup.py @@ -46,7 +67,7 @@ buildPythonApplication rec { # feed args to wrapPythonApp makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" + "--prefix PATH : ${lib.makeBinPath [ aria ffmpeg libnotify ]}" "\${qtWrapperArgs[@]}" ]; @@ -58,14 +79,13 @@ buildPythonApplication rec { setproctitle setuptools sound-theme-freedesktop - youtube-dl + yt-dlp ]; meta = with lib; { description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; - broken = stdenv.isDarwin; # Upstream’s build scripts check and fail on Darwin. license = licenses.gpl3; - maintainers = [ ]; + maintainers = with maintainers; [ iFreilicht ]; }; } diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index e3ff230c1e6..648f7883788 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "refs/tags/v${version}"; - hash = "sha256-hO6m4WsoK50tLBr7I9ui7HE3rxKpOES8IOugi04yeQo="; + hash = "sha256-dyqZXc5k76BwF2Kh2vm9d+dpvgpXK/8VQeGjx1UzA6k="; }; - vendorHash = "sha256-c3HHfcWppAUfKjePsB+/CvxJWjp5zV6TJvsm3yKH4cw="; + vendorHash = "sha256-S1mJMVfQSy49Lm4q3v05kjbXBlBgBt/AAzLOoQkk75A="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index c27416e29d2..d8a48cf65ab 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-QiK+ixVURf5Fsx9YPgzYCuCy1wYjxTUXGVr4FIn41Xc="; + hash = "sha256-CFavEtv6wL6jiUayjyU27OkdToXIM4EP7v5ONFdAJ5w="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-0379IX5W51Z48CffK1F2ZCPGLUq0g8lZXIQqaupC5io="; + vendorHash = "sha256-BLK8IJWL2sZ5bdnJU48/XhplSGUOL8gE7pY8rL+rVFk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index af052e3831e..d381be73e0f 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.8"; + version = "0.7.9"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-HvT2B0pahQbwa0atN2o9rc93QkCIaPttV859wOyHQzY="; + hash = "sha256-CWoVVvhprqBW4bmcAHtgJbbOPxGbBsikNu6bwyDdIcc="; }; postPatch = '' diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 41231ae1b18..133723cc391 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -70,7 +70,7 @@ let # group the specified outputs specified = builtins.partition (p: p.outputSpecified or false) all; - specifiedOutputs = builtins.groupBy (p: p.tlOutputName or p.outputName) specified.right; + specifiedOutputs = lib.groupBy (p: p.tlOutputName or p.outputName) specified.right; otherOutputNames = builtins.catAttrs "key" (builtins.genericClosure { startSet = map (key: { inherit key; }) (lib.concatLists (builtins.catAttrs "outputs" specified.wrong)); operator = _: [ ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 678057c0aff..ae6679f42ae 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -402,6 +402,7 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 + sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 SPARQLWrapper = sparqlwrapper; sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11 @@ -461,6 +462,7 @@ mapAliases ({ zope_component = zope-component; # added 2023-07-28 zope_contenttype = zope-contenttype; # added 2023-10-11 zope_deprecation = zope-deprecation; # added 2023-10-07 + zope_dottedname = zope-dottedname; # added 2023-11-12 zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11 zope_proxy = zope-proxy; # added 2023-10-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0153f7cc0b8..b00169dca01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13092,7 +13092,7 @@ self: super: with self; { sopel = callPackage ../development/python-modules/sopel { }; - sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + sorl-thumbnail = callPackage ../development/python-modules/sorl-thumbnail { }; sortedcollections = callPackage ../development/python-modules/sortedcollections { }; @@ -16089,7 +16089,7 @@ self: super: with self; { zope-deprecation = callPackage ../development/python-modules/zope-deprecation { }; - zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + zope-dottedname = callPackage ../development/python-modules/zope-dottedname { }; zope_event = callPackage ../development/python-modules/zope_event { }; |