diff options
Diffstat (limited to 'pkgs')
69 files changed, 2456 insertions, 473 deletions
diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index f1b932013a6e2..1bcd06eec4250 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -8,6 +8,7 @@ , qtgraphicaleffects , qtquickcontrols2 , wrapQtAppsHook +, makeWrapper }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake wrapQtAppsHook + makeWrapper ]; buildInputs = [ @@ -36,7 +38,9 @@ stdenv.mkDerivation (finalAttrs: { # wrapQtAppsHook doesn't automatically find noson-gui dontWrapQtApps = true; + preFixup = '' + wrapProgram "$out/bin/noson-app" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} wrapQtApp "$out/lib/noson/noson-gui" ''; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index bbc3411580d11..fe42b61f1a6ed 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-08-22"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b56b6ac795d988fa3522b279674990120e76b231"; - sha256 = "19mm3qh28ckg0ppra4f55969ai5l1zc4czy1664f8szj9pacqgvn"; + rev = "c7c6353db3208608786503cbade1e9f8d3531f15"; + sha256 = "1nji29s3gjdrfdj21x1vpsfs7ai7q1a8k76mk90nppf2dx15ixpw"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,24 +365,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2023-06-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "3e37187e1e5731d7d36980db3f92e7332406813a"; - sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z"; + rev = "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591"; + sha256 = "1c57cpdkhq15yzzfpk4pi2d5bjmb9j2gx1np3v23wgmfzhmkj6d1"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-08-09"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "100aa31e52b13e69d61caeb1796581e4bbb3b9ca"; - sha256 = "1ygswc0l9q8m3h3b42ik5zkhf820xpzs1iiivf2x7wpqc8589j2v"; + rev = "7e81ce1019626977f7dbab44fb2abb5517993359"; + sha256 = "11pz313swwv065nkvk2z7hgakijjg696dq7g1a056abk33hs9rh9"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-08-16"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "7a6b9487dba044a43fde534bf5036f0fda5b6b23"; - sha256 = "11yp7zncby1wmic5hji1vb6b62l2xvi30cycbds05y11xycgdcm0"; + rev = "63a860e7ed3ae41ee92481ea65a48fb35431ae21"; + sha256 = "0mns3cymfisnd603mwxc30psbsm9m41gwqaai1r3w9iijy5axfkz"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -931,12 +931,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-07-05"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "8cca17ea0ced3ba564e5da972a25600edafe7d7b"; - sha256 = "1fr0207nxmcdpc7whlmmryy4qs7nl5mp1p6h1qi0jv51r705xrpw"; + rev = "352c09f3e59065299a6e66386f0fe11bb8d5c601"; + sha256 = "1j0iyfybczlnf07fkp7479aiv1q6h2h4mb0r7h2cg3h0i6vprvq0"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1303,12 +1303,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "5c8a7d6311ae6b0ed1e1fc66569fe67278a418fc"; - sha256 = "0vxrkyymhmf29xdkfffxbp1z66in6cf2yajmrj0mssy6d1ag9cvj"; + rev = "323b00de2ee18cad1ac45eb95e680386c4ff4366"; + sha256 = "1q0ah3q15cfybrb2anf7c1jc0v72r5f2fmnc01dsm9y3wyyix8ch"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -2023,12 +2023,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-08-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "61bae002b0c93b9375b1a8f8f54641d479b5cf7d"; - sha256 = "1b8yk4bzw1mkddba3zfj7fy39wij40glv87i29k1vz2lsv1akc4s"; + rev = "0b4a13613c871c66648fd1e1f33a4911a0b15e72"; + sha256 = "0b70q4k5jc0id4wryg3qzrm1aa8r44qlkb6r8ddh7x6pyrkwny65"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2311,12 +2311,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-08-21"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "4f6329cd3c94ad367088cdab3310739eded5acea"; - sha256 = "1wxpf20ddcjs9c90lfbr3z5pb3j6kb89msrdm75lxlydqqyc5van"; + rev = "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6"; + sha256 = "1m0kchzg84rps19fiwb3sddhf6gzmfyzcpdh7h9b34ma4qdga5gv"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2527,12 +2527,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-07-26"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "c17d3210b3dec8798b4fc82a11c542989251f85d"; - sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9"; + rev = "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb"; + sha256 = "09mys6n9hwlbwy48nxndjrr6y0bg67nai36fpjxydqq2i3ijq897"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2623,12 +2623,12 @@ final: prev: denops-vim = buildVimPluginFrom2Nix { pname = "denops.vim"; - version = "2023-08-06"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "9f1b8cf0d516ee0a0e26f50bdbd935c29a8f4588"; - sha256 = "0a1q365cs3p90x0b8rdqja9ssgcl7ndqpb37pqldrmwccxik953c"; + rev = "bfdc079db08ed99a68f5a4b0d046fcea1b5e5515"; + sha256 = "0rbbk7in33s28g4rdsb97mlg5ix7jc8r45d7mvrz02s1cay7g4l1"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3094,12 +3094,12 @@ final: prev: efmls-configs-nvim = buildVimPluginFrom2Nix { pname = "efmls-configs-nvim"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "4571a29202ea3af8c6b519e086e106b42eb996df"; - sha256 = "1kkgvdnfpnff17jwvf38gq83kla790jff7qxrcs62sbf7jwkpkzi"; + rev = "cd8876b5afe602f90e53e5d92555980e6b379be4"; + sha256 = "0rjrn0ak3v3q1j8sc7yslxrzp8c5zs0p9ii65483ggvi4fdmyzw7"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "6813ad3c49b74fbeb5bc851c7d269b611fc86dd3"; - sha256 = "0xk7pyysmq1w1dicq2pml3ls08wwzxaa9fq7fyhziivy7a8qv2ps"; + rev = "b362e13e22a452db913aab1fb2ee2d8546526d90"; + sha256 = "10vxc5bk0zykfg5dhgmsqmw2k6701b7ppg80y3krnn7phzi3hwr8"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3768,12 +3768,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "749267aaa863c30d721c9913699c5d94e0c07dd3"; - sha256 = "1ysc9igrzxin0s16bk71l72ql1jzilhps0pc6mbj9padk3xi3iy4"; + rev = "79127db3b127f5d125f35e0d44ba60715edf2842"; + sha256 = "1dhgvcrnx9mph46mjc1m7h49xyny5gzmwbrii8v0cc40hbqgqnwq"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4008,12 +4008,12 @@ final: prev: hardtime-nvim = buildVimPluginFrom2Nix { pname = "hardtime.nvim"; - version = "2023-08-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "74b0ae0552e67648332854386e8b810569a136d3"; - sha256 = "00r28xpj35fjwjb9930d6a5fq3s8pgnyjfjzaj2asvw3ibsmi3gx"; + rev = "3548e7d08c659308d9923effdaa8fa4cc0725c9a"; + sha256 = "1xqd92ihzi37c9kkbdbxfws8hb4c1r8fi8sqmz4m4wj9nr4siqwr"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4043,12 +4043,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-08-06"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a5481383f82a8f866552bc75b4295351ea3ad905"; - sha256 = "16a41a9b31x5hax5iqyj1lxc4fxhcrp4ig54f77s4czwfd08qj2j"; + rev = "7f87f2eecb0be3fcc92750ffc2c5ec8966e6f19c"; + sha256 = "1by2jkpizwbw8fiw16v9p5h8s68l3fl7glc6sbfkggfmpjfq6mav"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -5147,12 +5147,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-08-08"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "fc3a15047a5b831c83143d90cd25d0b7bcfd0111"; - sha256 = "0rzipjbzb57hwgclbpjww9vgn3x2arp8a831lfc4a0ij8cr223cc"; + rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; + sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5218,12 +5218,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "4cad6da6e05b7651ca8f66ec1fb3a824395ada68"; - sha256 = "0r8648j9486jj4wmm567gifj8ylmzz7mjwmqv5d58hclk5y85fh3"; + rev = "ff88be60da8712b5bd9c3d1c6be0eee3b4bbd804"; + sha256 = "1csm7wb2n0cvdgls5068y35vnd4pdc7v340d026yzydxxq01cdl3"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5495,12 +5495,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ff00eec0fe5e897aab3b88d3499c4eb7a8cd9ad8"; - sha256 = "1fk49zpka9a781grmxl8c2xd8ax56nl3ihs5m414l779gxywvvqb"; + rev = "06bf1784d88b112de14ce29aa604e2ae3fe1e359"; + sha256 = "0z37zk6zlph8cl7wknzkgan0rppyq0kk7qngc4g2ibw12qc1z5wa"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5555,12 +5555,12 @@ final: prev: modicator-nvim = buildVimPluginFrom2Nix { pname = "modicator.nvim"; - version = "2023-06-29"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59"; - sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257"; + rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; + sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5867,12 +5867,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-08-21"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "70ab62c8cc5d039766c039597c7c33a76d74fd11"; - sha256 = "1847ryln9yckk6n9385syxjxa3s2zyy4n3mw9c7w73ri95s9glpr"; + rev = "8a0f795bac6618e4fe59eda61b15f8c95d9625ad"; + sha256 = "167qs1djqi5yf9sr0j9wl46hmylrlqxjr6h41anzw0s9fyz4651n"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5915,12 +5915,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "f8a4200951189f7c831cfb698a2e05791e9fd83c"; - sha256 = "1rqmxxqaa098s7c500pk5j1chiqw3dg1iwzl4sgxbrbvkqb1nakg"; + rev = "e6598ad9b6287d7aac2c41f338fc1a6db9df6e5b"; + sha256 = "1vg8bqg0ra9m0gfc5r453a8lb243yvhc7n2sgqggdrxzw58q4clf"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5951,12 +5951,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "00b4486197e7ad7cf98e128a3c663d79a2cc962f"; - sha256 = "0l4k4c1i8ylshvh8cwqxsqxgi8kyq2aryxs14sdxlig7xrrbqadv"; + rev = "d764b406a1a6f3db13a28bef10e139a09fcc14dd"; + sha256 = "1akqk8vkvq5cib42vlblp80d7xlqd656damhky16l3hwvg598c74"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6228,24 +6228,24 @@ final: prev: neotest-python = buildVimPluginFrom2Nix { pname = "neotest-python"; - version = "2023-07-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "054f22129405e747adfc2cbeddfcc59537df50ba"; - sha256 = "163p8wqx81dsxj1vjgpkdk0sj8hgf725rfrhx70rfdrx8sn2cdv9"; + rev = "81d2265efac717bb567bc15cc652ae10801286b3"; + sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "e3ca0279b721a704cf1fb9f3560fc2474256d3a4"; - sha256 = "0bp65cbkljnl7aa5s15va982w4xa7wabsa4h3bv32w9d7bc81ahz"; + rev = "5638880f0adcdb5366fe57a477dfa94074463709"; + sha256 = "17104fdfiv8iw9g2l2yvkakmqa1pkyb6dj6yh5qnczpylwilkgci"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6600,24 +6600,24 @@ final: prev: numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2023-03-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; - sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; + rev = "3f7d4a74bd456e747a1278ea1672b26116e0824d"; + sha256 = "1h4ap13q85vy7mz44z1q8wzzvs7arbafkml9nwfx5vhyfyw4c8sn"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-10"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d3d9aa251a9dd94881cdbc48c5852b3eaba969b8"; - sha256 = "0wcigy2xbffx45gzdj383y8y671x8hnj1fb123l22i8whb6vd69w"; + rev = "9c013a6aac6925172e88d2ca17fbd8c1a548560d"; + sha256 = "07cijykmj79hxpkzhmi0hgl0v6cr9fr6f88rc8d9l95rj8s8ck9l"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6852,12 +6852,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-08-21"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "897c433ff2fbcf6f71a57bf18460d810e173d1e0"; - sha256 = "000yzgdg9xjx64mv2vd1dw38z7m8r6znvzna8sagw9acrfj6rsi4"; + rev = "4377a05b9476587b7b485d6a9d9745768c4e4b37"; + sha256 = "0mvlh0wdycdk07384i68gyxsafy437pbyryaqf3zbnw95r0z1va9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7091,12 +7091,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-08-23"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "8f0ec4e1fe9df05b14b95ebdab4c0ffea35762e5"; - sha256 = "0nkgnwxswqb8m3w1x9zr5pmqkph3rhf2plqg84r8n97g1d0ycgnn"; + rev = "29df35ea2ac5af0f85d8f0f40bddbd7fdaa8c492"; + sha256 = "162lq8vzl2hswjb6pw7315ziskan1walix9fimagvp9qcdv34m28"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7131,8 +7131,8 @@ final: prev: src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "1cfb96490c3889a2c57d1ef5e1acc59e9b47c455"; - sha256 = "0nkzp80llimjfppb82ag67af799cc50fqyr091ravra1yyxnhk6m"; + rev = "f7922e59aeb9bc3e31a660ea4e7405ffa3fc2c3a"; + sha256 = "008jx1hnb6xn85wx1c0brlmvzp6flyk4b7id30ccsv78h6s9bqfx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7343,12 +7343,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-08-23"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "d2764f4d56e1a6a059dfe52e082e3a74b54dc8e5"; - sha256 = "150qps936nk1g3xka7blvz56pdnnswj2v5a5qzd8ppa818pq2zgn"; + rev = "25b46b2dd55aa52e78e73d22f48a743eb75cced4"; + sha256 = "0c84klbi7z94ck3pq3dskaqa6lzzdyyv6cy7a3mclqqckpqmy2g6"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7391,12 +7391,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7"; - sha256 = "0lbdbcck08bca9pgm6kspwfpqpjlyv6295cfdjy1936yfiia5gpc"; + rev = "411cee67fe3f8242023eb8d9edafefbbfb2d06f1"; + sha256 = "0xsyca5sw0shql0d1lf8vrr2pfmr0a0k1cl7sspan2f56qsckb2y"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7475,12 +7475,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "05fe2c38a3bd4f889ac13f1735685ab348d95346"; - sha256 = "0fsx1d8fhb7dpb6p85c35vnanz1xyfcbr0p93ixwk9w1hz2b3sz2"; + rev = "4d41d9bfb09dd0836ce6910404e3cd570500c9ca"; + sha256 = "05b9dfphqm726x3619vfm702q0csjnvr9011xix07074hmg0ygxl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7535,12 +7535,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "56272167a6dead91c47c02dbdbfe1ae5643c59f5"; - sha256 = "0jxsmg1xw0jfy8i9y3anpbdr8c1smcab82kh22nz9www6pa4m2xs"; + rev = "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609"; + sha256 = "1458q2a7xvvf12fa7az6gnq7bhnci2czqpazljjqz181pp2wcrl0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7666,14 +7666,14 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2023-07-05"; + version = "2023-08-24"; src = fetchFromGitHub { - owner = "haringsrob"; + owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "f44f46ecad6e6983fd04dac84c5a5c03815d3427"; - sha256 = "0a8bdi6d58m5v851gkyph4qngxzsa5saizhsp1klpjnj57akz078"; + rev = "44e34d85238e5d964848854ba8b30f986a00ea21"; + sha256 = "1phy6qb7048dklyi17fvw51pxln2r25y37sdx0gwbqfpmy62d0mp"; }; - meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; + meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { @@ -7726,24 +7726,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-06-30"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256"; - sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v"; + rev = "3d749d3f2466870bae996c0a2d44f7517b1da2b0"; + sha256 = "11y3vvxq1mi3d6l151hjw24vqzmmpwii1xhi2qqjjicqr2mc09da"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "bfa0e8705eb83a0724aed6d5dc9d21aa62a8986b"; - sha256 = "12rkdmyvh05l46zcy209xb1h7r6nrqw0jyn41pyv0l0mjr5lfxxd"; + rev = "2fde9d84fcead6c61a59388fe29bd3135c39fa94"; + sha256 = "0cbbwgb6pqz7xdfmc3n70ibgqwqarwn93z4jfacazpidcg9dassy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7775,12 +7775,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-08-07"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "09b71d84bd2524438e48c0aa5b54d855cc72af32"; - sha256 = "1crlzkgdpxsvcvc1djc9ai3abm1szkrwrsknzxa7zdx4w1jlvpvs"; + rev = "7bd3558c17045b95c961d28861c1b3bd9bdc992a"; + sha256 = "0nf1x635a2g8jj16mq1w3gsbidg7paglivasizspa8dsfxw36rag"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7883,12 +7883,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-07-25"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; - sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; + rev = "6f2e3904c76e946259e130ae7fa9b9e7ec735d73"; + sha256 = "1d9jkyvjaqk8yjg0wk3d3asln6jhj1chrb8bjqhcjdj5k00cwf80"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7944,12 +7944,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2023-08-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "90f794d01dd5f50404f8ef6e1d22377ba5180787"; - sha256 = "0mhg4z99ksbnf1hhcnyg7v9rsrzsmr81z3jry1jifflwcc9s7fcw"; + rev = "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3"; + sha256 = "0lvpflpm7mhv39dglxdvmilj72xgxx5j614ll06mcxycv2k3xcvw"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -8100,12 +8100,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-07-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb"; - sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1"; + rev = "0dbe561ae023f02c2fb772b879e905055b939ce3"; + sha256 = "0j42b4q25l8yypa92zkdf9jargjszyvw5f83l3qxbh0vy9ly1j2d"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8304,6 +8304,18 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; + quarto-nvim = buildVimPluginFrom2Nix { + pname = "quarto-nvim"; + version = "2023-07-17"; + src = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto-nvim"; + rev = "35f86035e7b3846dbf168267ffe0021c3d312259"; + sha256 = "0a46bqca0f8rqd71kym07nn3vq4qfasw20fhi6s8gywmd658hx9k"; + }; + meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2023-08-08"; @@ -8364,6 +8376,17 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; + rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + pname = "rainbow-delimiters.nvim"; + version = "2023-08-25"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + rev = "f30dd6c58eddca41ed9a9b112aa4be4828939c4d"; + sha256 = "19717p6rqfzkm4hycc1jh70gsidd651pkbd0vp7cdky7mqf59nrb"; + }; + meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + }; + rainbow_parentheses-vim = buildVimPluginFrom2Nix { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; @@ -8438,12 +8461,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "b1cc851bcb4e3c624abbe2a725237eef6bea765c"; - sha256 = "1y13ayb48hnz7fpw3ani56pbibkbq99fdaf3llbh0gs4m1j23923"; + rev = "2cfd6ddb0acece95d9658560ae9740b98ef70dbb"; + sha256 = "1pcfxl5350qwrlrr5j784pzy4w5b1v9w1yjjcpk0fghv2wi99isk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8762,12 +8785,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "acfa19889d1cb703ea385d805a4a59836d51f3a8"; - sha256 = "1ydcrss131v84772a4r5irzlha0xxmly4d9hmdv4d4gd3w6yqy71"; + rev = "fb2a7ba26ae56961886d0048879dac30e07aca59"; + sha256 = "13rzia4zky9zsjkdv9g1pf57l6z1rkjsrbj7hg8z4ssjz99yrnq0"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9003,12 +9026,12 @@ final: prev: sphinx-nvim = buildVimPluginFrom2Nix { pname = "sphinx.nvim"; - version = "2022-10-27"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "sphinx.nvim"; - rev = "ec53a6e7104c6bef75982fce15bcab546c590f7e"; - sha256 = "15pxzq74sx9zwwpcfy478mq558s2kwv78pgzqz4jw03hd0ms2c1k"; + rev = "d4eceb35975d379c6b380111627c5d4531f77d08"; + sha256 = "0j4v1ckc7p5bsh81yhcc35yv1lqkn2kicy84pbk556ksx60pgvgs"; }; meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; @@ -9064,12 +9087,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2023-08-23"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "7af2f97ce2562cfef38f6207035b9eaff8361192"; - sha256 = "06mfdrhvdysby0rb5a72ni9q54l1m026s0s71751pmqz2clgmaal"; + rev = "cb1647d170eaa76d7a1919e38a7b6f89a77a3a87"; + sha256 = "1i27s2gxky3l2wxfg22gi1dj9hjx41xff2211fhbwxmswwlkjj1v"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9522,12 +9545,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-08-13"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "3aee7e0c6b05f85729cfae2fb62941088e47fe53"; - sha256 = "1byf6biwmcbawnwp03ms42kn41g9c3abgij8y9yxmdia5pms0zm2"; + rev = "e7825aaf576c22045b7a181ba89b9019104319cf"; + sha256 = "01l3d0ip8fid0jppn5iiwwf1c586s18z66v7byfiyx5gb8f6ybpr"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10041,12 +10064,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-08-13"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7ee1250292491dfdd8ac7eda4e1d373a8c2be7de"; - sha256 = "1yqm5f4g3r02a6pkvpx35v9ls45j3hj0qgdmh2wdw72lq8c6ww4x"; + rev = "bff8c32b826e188fa558e94c7c93ac17a8ef0365"; + sha256 = "0m30d7d9bgs7ni2npgzd7h83l47a9phi4qs3g1za4znqsjj2wmbd"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10209,12 +10232,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "0657e4af76043cc5501877249f6594e2aac15d05"; - sha256 = "15l7x72s7pm0b5n9cgarmfdkmw8yp03lyxjhy0j29qc68psp64jr"; + rev = "9882d5445cdaca7fc5975f7a703492ba42ed9ab1"; + sha256 = "0xcmhykvxwmk4fxdb6q0gyim8jwlinyrjfn0zsk17hxvachff9cy"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10305,12 +10328,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-08-13"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "38acf1128b0bd4f8b2f79c8644d1cda9dc297d9d"; - sha256 = "1n023my6hb856l8369sgqs6mc36lr47acjlimyadfd4m9s555sya"; + rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; + sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10701,12 +10724,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2022-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "8911f86284315cd574e807424bcea62fd99c588a"; - sha256 = "013f2p7jf9gj4xxs789906zrflpjv2kqa1whbg7y4viqs6j62y9l"; + rev = "31c593b8025f62f184418dd658c3a358a8d0ef70"; + sha256 = "14l7v8jg4kq8qh9j64nxir4a7d9ls0zp6zk3rjzbzf9viqyw1bp5"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -12671,12 +12694,12 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2023-08-23"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "36bfe2c6a5893d573290da24eae8f93013b58717"; - sha256 = "1m429mcbq57fj6bk656qs0y6y35r1b49fi21dd0qm52xq33flqyc"; + rev = "bb3191b134ade9d1f01014e17c3df91e8911dd5c"; + sha256 = "0sv05v6q1lkc4xklqly0hf2p4w4schan3gvcf1s6493697hvcc4h"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -12971,12 +12994,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2023-07-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "00f8620cd53f569dca26594e9c94534f03fe16d6"; - sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z"; + rev = "7df6d0e918b610b798368a5af33825b787e0d20f"; + sha256 = "0814n9jqcv62hky04fywgby86ibfp434w4ij03vk5y2z9hgii8bd"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -14328,12 +14351,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "845798bbebe893dcb0c8ebfb40be778433db7ba4"; - sha256 = "1l37lcc2jirg0g7rz8xrc2sn64341l6k3d3qx34jr02zic6bx0rj"; + rev = "d37486881a0a771b844a235bc3e025046088690d"; + sha256 = "0f16mlg18i6gp51w8pmq18dkvbylfnz916za4ahjjpwwcg7sg6ni"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -15662,12 +15685,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2023-08-12"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "8878bdd7fc01eec647267d4433a763474b6a5db4"; - sha256 = "0070r63v9kjl3cx9w8xsilyww9nwyharc6l274y7mg4bfhddpbr3"; + rev = "2b6950c7143790e6930b8cf32d60c6858a50d47c"; + sha256 = "0385gak2sil6z8n20s5kdmnnpyw7ds5c2qcfr0pmyaz3dlyfx2ih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -15807,12 +15830,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-08-23"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "da8f4875bdc4d73ff039c2e42a3ef931414e50bd"; - sha256 = "1iyb3g225mv33ffii1mx7mnh8jm8rfkcvzpjis39i3s3mf4qc1rz"; + rev = "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46"; + sha256 = "0h8byffxzd0kjj01j928hj0jkqkq0rjwz90fpq0si9n0yk2zdlnj"; }; 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 f919c733dc67c..db68d7e52fe76 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -60,12 +60,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=f6eacf3"; + version = "0.0.0+rev=8e286e7"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f6eacf39e5a4f2c05e70ce2ab861700a1e979227"; - hash = "sha256-bZTLEBzf51V+pbls5Vdu16r2F25tdXFLISyvSSUzmqg="; + rev = "8e286e7673e3fa7ad94ab3159c2b83395d302af4"; + hash = "sha256-hM5joJjLxThJBStiTLE71MpIDXblgkRS8G4fmMvKdeY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -337,12 +337,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=e398400"; + version = "0.0.0+rev=bcef6d5"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "e398400a0b785af3cf571f5a57eccab242f0cdf9"; - hash = "sha256-+DFqJFR5raOnNG1oyGfO+tzpBXYBk0BBc8GbEkpEBhU="; + rev = "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"; + hash = "sha256-wTeHw/7og4GJSXISCBSL6foxzecFFB/fK03bzGup0sM="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -845,12 +845,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=9bf4ae4"; + version = "0.0.0+rev=4a36c9a"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "9bf4ae444a8779839ecbca3b6b896dee426b10ae"; - hash = "sha256-ghknZmki1eBSzxY9omZN6wgLpvoJEYXBpvkVxxqLiIc="; + rev = "4a36c9a388505180da6ee0eda1d8afb8c83481c8"; + hash = "sha256-6gdAxNI81jbN8XZALRw31kFQRZg8ge/O7QRprLZpWOg="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -977,23 +977,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=2a15634"; + version = "0.0.0+rev=38be6ec"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "2a156343a9e8521c1ff73ef0982cf13c51a905eb"; - hash = "sha256-gBAxApZQONRjxycZUo7PXNR4DvccgFW7qZ/yofKcEL4="; + rev = "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"; + hash = "sha256-0kOLAVsrCUfpU8sZGRVrr+D3bGWj8bH2qce/ygrIw2w="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=c69aaba"; + version = "0.0.0+rev=f1e5a09"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "c69aabab53609d00e8e198ab902e4fde4b8e449f"; - hash = "sha256-6cyKT4yASueb+nNj8EqZbF7LZYZasMOYvq5ki2a0zQk="; + rev = "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"; + hash = "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1686,6 +1686,17 @@ }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; + re2c = buildGrammar { + language = "re2c"; + version = "0.0.0+rev=47aa19c"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-re2c"; + rev = "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"; + hash = "sha256-Mwnm8kN0xfAdGG00aUYrqPU0zyWbc6QH9Zlgb4on+do="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; + }; regex = buildGrammar { language = "regex"; version = "0.0.0+rev=2354482"; @@ -1776,12 +1787,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=afb6000"; + version = "0.0.0+rev=39eaeb4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "afb6000a71fb9dff3f47f90d412ec080ae12bbb4"; - hash = "sha256-ywjox/LG+5R2F49DxnJ+x9ndIYxIdUgxmF0Y+MaqZN4="; + rev = "39eaeb41e17572c17e35bb050d6bf2da17568dbf"; + hash = "sha256-2WPL7ap2fHEi0+pNnJlHLxKBqPrHsve+DzJSCqw/gpw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2290,12 +2301,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=5f56442"; + version = "0.0.0+rev=8efecc2"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "5f56442a8f1c1b41371c7033e6dc50addab78ba5"; - hash = "sha256-9QDNaZGdLmCUqJUEsg1kMWS9OsHPs3bvV3khkQZjj50="; + rev = "8efecc27b58d3266e3946ea5c8fb8b3ef853914d"; + hash = "sha256-A/GXdXvOkSu9DI6h1EZNrfciYGtsSJ68uU0M2akaUKU="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b39c69846b915..e5be182529f7d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,7 +966,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-MUEn/OBKWVtcyaANlNdUXgWITEZaKpUStoi12Fknu38="; + cargoHash = "sha256-qwllMt4va9j8Sfh2+xYcfRtQgypNKZLDT3gRD7dUQ+w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cd397e5d84713..638f22515c0fe 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -628,7 +628,7 @@ https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, -https://github.com/romgrk/nvim-treesitter-context/,, +https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, @@ -696,11 +696,13 @@ https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, +https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4a05bc4e3a510..82eb6fce2549c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.19.0"; + version = "2.20.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-/sP5Z52fWkRcv+Wj45HTV1Ckve+jA92m91kGGJwdC6s=" "zip"; - i686-linux = fetch "linux_386" "sha256-UGPWk0I/nCaqWWz/rwG/TSDie0/tarKroGi+7Ge7kE4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-rSZM0GuroSqVokhkjPtk3+2+C9w5/Tkh2cvB+kShyHY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-3zVD8LUdxhzroLlnQCiCVELEQMPmCriRff85ZlfgSKI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-D9cPNtHiofY/Fb2EO+AGexRSqY+AidZm0D9+9W9dCUY=" "zip"; + i686-linux = fetch "linux_386" "sha256-sY8kI4InFGZIFoz5rfvNMxA9C4u6Qcg3vNTsoY7X6OY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-TkfEh75k3KzvvInPAsYDhS2OIKQpBOCaT6qRIld+wQ8=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-kytAXelvvP+SBaniHlo9JTK1LLRrefgLuWPhC8sC7U8=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 39630f12c0f6c..44c36281fadd9 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -17,13 +17,13 @@ let ''; in mkDerivation rec { pname = "deadd-notification-center"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; rev = version; - hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg="; + hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU="; }; isLibrary = false; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index fa11f77162198..49e9f9df8cdd1 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -1,12 +1,12 @@ -{ appimageTools, lib, fetchurl, stdenv }: +{ appimageTools, lib, fetchurl, nix-update-script, stdenv }: let pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; - hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag="; + url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage"; + hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY="; }; appimageContents = appimageTools.extract { inherit pname src version; }; @@ -24,12 +24,14 @@ appimageTools.wrapType2 { cp ${appimageContents}/gc.png $out/share/pixmaps/ ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = !stdenv.isx86_64; - maintainers = with maintainers; [ gador ]; - license = licenses.gpl2Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ gador adamcstephens ]; + license = lib.licenses.gpl2Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index f13cf8a21d42c..1345dc51593d7 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, nix-update-script, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; + hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; }; buildInputs = [ @@ -72,10 +72,12 @@ in mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; - platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ adamcstephens ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 9083103561220..c7a2c1637e150 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -41,9 +41,9 @@ version = "2023-06-09"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8"; + sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk"; + version = "116.0.5845.110"; }; ungoogled-chromium = { deps = { @@ -54,12 +54,12 @@ version = "2023-06-09"; }; ungoogled-patches = { - rev = "116.0.5845.96-1"; - sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr"; + rev = "116.0.5845.110-1"; + sha256 = "1dj8zjnd105lmrfb033hgcvw3a2jaxlp97aqnj0wzx6jw7q9y4p1"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8"; + sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk"; + version = "116.0.5845.110"; }; } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ee31f79a5752c..4cece29ef949e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -47,7 +47,7 @@ # Hardening , graphene-hardened-malloc # Whether to use graphene-hardened-malloc -, useHardenedMalloc ? true +, useHardenedMalloc ? null # Whether to disable multiprocess support , disableContentSandbox ? false @@ -56,7 +56,10 @@ , extraPrefs ? "" }: -let +lib.warnIf (useHardenedMalloc != null) + "tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues" + +(let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ @@ -268,7 +271,7 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ @@ -477,4 +480,4 @@ stdenv.mkDerivation rec { license = licenses.free; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index 2ab0ae308d92d..3d5ab7d8dc8ec 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.14"; + version = "0.12.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-8zXcW1jVNVpFWpVYONjc0cwRQr8YTVbLYIH1IYCe9Nw="; + sha256 = "sha256-7eO4QCCgsNWXoo/H0JdMIS7e74p+Ph62OpjBtjmvJKY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 677405c5a295b..9bd90ad928c91 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , makeWrapper , nixosTests @@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; + patches = [ + (fetchpatch { + # PIL update fix + url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; + sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; + }) + ]; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index c88e86c529fd6..ba22a71eebd3e 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.85.1"; + version = "1.86.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-WfV7n4AgZoD8rOd6UVBFRqOz9qs1frjSGLUhjxqTG08="; + hash = "sha256-peWcgME+OCa9feNKLtTmZIGCpNxl+EdQfYDXV2BbclI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-EkB8GjWtOO3Yi0PFFE8G8swwzYmw6D6LDO24vnSrkLs="; + vendorHash = "sha256-sBez/IQzRIGQdOXr4Ikxh+dT8IQxtbxau5vo9VqGJvE="; meta = with lib; { description = "Command-line tool for Storj"; diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index 900d770ba41e6..4c71a6a38a43e 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-VFV2eHBvBdKrI4Zt+GCtAOSZt0++hYDWYR7AN42p85I="; + sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/workstyle-Cargo.lock b/pkgs/applications/window-managers/i3/workstyle-Cargo.lock new file mode 100644 index 0000000000000..a1bfdd08c4938 --- /dev/null +++ b/pkgs/applications/window-managers/i3/workstyle-Cargo.lock @@ -0,0 +1,1140 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyprland" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d341e36a776cd092622daf2439a484247f3dc7d25eab7b286cc88ac85120d3" +dependencies = [ + "async-trait", + "derive_more", + "doc-comment", + "futures", + "hex", + "hyprland-macros", + "lazy_static", + "num-traits", + "paste", + "regex", + "serde", + "serde_json", + "serde_repr", + "strum", + "tokio", +] + +[[package]] +name = "hyprland-macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0088021091c08e29e9d1f735142ab811bd4d4d7f82fd4d4673407cb96fffb062" +dependencies = [ + "quote", + "syn 2.0.15", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.141" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "lockfile" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0adecf427f5b6ac140a0d1c5bc9dd0eb81b6f462486b78402c0a689a317b55dc" +dependencies = [ + "log", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "proc-macro2" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "serde_json" +version = "1.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "swayipc" +version = "3.0.1" +source = "git+https://github.com/pierrechevalier83/swayipc-rs.git?branch=fix_crash_when_using_without_i3_or_sway#e8eb2d8efba285b577c5e585af203baf9096b85f" +dependencies = [ + "serde", + "serde_json", + "swayipc-types", +] + +[[package]] +name = "swayipc-types" +version = "1.3.0" +source = "git+https://github.com/pierrechevalier83/swayipc-rs.git?branch=fix_crash_when_using_without_i3_or_sway#e8eb2d8efba285b577c5e585af203baf9096b85f" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "tokio" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.45.0", +] + +[[package]] +name = "tokio-macros" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "workstyle" +version = "0.8.2" +dependencies = [ + "anyhow", + "clap", + "dirs", + "env_logger", + "hyprland", + "indexmap", + "itertools", + "lockfile", + "log", + "once_cell", + "serde", + "serde_derive", + "signal-hook", + "swayipc", + "toml", +] diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix index 3f7c252c2c33b..5bbac8a3c65db 100644 --- a/pkgs/applications/window-managers/i3/workstyle.nix +++ b/pkgs/applications/window-managers/i3/workstyle.nix @@ -5,16 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "workstyle"; - version = "unstable-2021-05-09"; + version = "unstable-2023-08-23"; src = fetchFromGitHub { owner = "pierrechevalier83"; repo = pname; - rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1"; - sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx"; + rev = "8bde72d9a9dd67e0fc7c0545faca53df23ed3753"; + sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU="; }; - cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2"; + cargoLock = { + lockFile = ./workstyle-Cargo.lock; + outputHashes = { + "swayipc-3.0.1" = "sha256-3Jhz3+LhncSRvo3n7Dh5d+RWQSvEff9teuaDZLLLEHk="; + }; + }; doCheck = false; # No tests diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ecfcc0cd52c5f..e3c67d03dfa11 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -200,7 +200,7 @@ runCommand substitute ${./wrapper.sh} $out/bin/$progname \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var prog chmod +x $out/bin/$progname done @@ -219,7 +219,7 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index e8eecb8c86966..44762bd4582b0 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -4,16 +4,17 @@ IFS=: newLoadPath=() newNativeLoadPath=() -added= +addedNewLoadPath= +addedNewNativeLoadPath= if [[ -n $EMACSLOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewLoadPath ]] then newLoadPath+=(@wrapperSiteLisp@) - added=1 + addedNewLoadPath=1 fi newLoadPath+=("$entry") done <<< "$EMACSLOADPATH:" @@ -22,14 +23,19 @@ else newLoadPath+=("") fi +# NOTE: Even though we treat EMACSNATIVELOADPATH like EMACSLOADPATH in +# this wrapper, empty elements in EMACSNATIVELOADPATH have no special +# meaning for Emacs. Only non-empty elements in EMACSNATIVELOADPATH +# will be prepended to native-comp-eln-load-path. +# https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n599 if [[ -n $EMACSNATIVELOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewNativeLoadPath ]] then newNativeLoadPath+=(@wrapperSiteLispNative@) - added=1 + addedNewNativeLoadPath=1 fi newNativeLoadPath+=("$entry") done <<< "$EMACSNATIVELOADPATH:" diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index af496df582c1f..a9384d9b2b8b3 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: -# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 -# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: -# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 -# If you're updating this derivation, check the link above to see if it's been fixed upstream -# and try replacing all occurrences of jdk11 with jre and test whether it works. +{ fdupes +, fetchzip +, icoutils +, imagemagick +, jdk17 +, lib +, makeDesktopItem +, stdenv +}: + let iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.1"; + version = "6.9.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; + sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick ]; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; desktopItem = makeDesktopItem { name = "STM32CubeMX"; exec = "stm32cubemx"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ angaz wucke13 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 414bccfb85230..936caafaffa76 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-6bbz8FH87MahD3R7G3cmsJD0461L4OoCbFejyXsuER0="; + hash = "sha256-4h+c5ke4MZuIMiCaLBt6RsRe9PWAn6VqW2Z6Wnh7X30="; fetchSubmodules = true; }; - cargoHash = "sha256-QbKYnKdJK9zImZDl057l8/Za4A+N82WrqQCzrOsc6fE="; + cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ba9a0610bde0b..4ed5cc06cf0ad 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.7"; + version = "1.89.8"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; + sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; }; dontBuild = true; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index e7e8d2032ed56..44f82f15852a5 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , python , cmake +, ninja }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ]); + pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; + sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; }; outputs = [ "out" "py" ]; nativeBuildInputs = [ cmake + ninja ]; # Not a propagatedBuildInput because only the $py output needs it; $out is @@ -31,33 +33,16 @@ stdenv.mkDerivation rec { python ]; - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - substituteInPlace setup.py \ - --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]" - ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES - - runHook postBuild + postBuild = '' + pushd /build/source/api/python + ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + popd ''; - # I was unable to find a way to build the library itself and have it install - # to $out, while also installing the Python bindings to $py without building - # the project twice (using cmake), so this is the best we've got. It uses - # something called CPack to create the tarball, but it's not obvious to me - # *how* that happens, or how to intercept it to just get the structured - # library output. - installPhase = '' - runHook preInstall - - mkdir -p $out $py/nix-support - echo "${python}" >> $py/nix-support/propagated-build-inputs - tar xf build/*.tar.gz --directory $out --strip-components 1 + postInstall = '' + pushd /build/source/api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py - - runHook postInstall + popd ''; meta = with lib; { @@ -65,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus genericnerdyusername ]; }; } diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index e4240028638b6..fd2cb0f29f594 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "adax"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; - rev = version; - hash = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; + rev = "refs/tags/${version}"; + hash = "sha256-y4c1RBy/UxmKP7+mHXi86XJ2/RXGrqkj94I2Q699EJU="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "adax" ]; + pythonImportsCheck = [ + "adax" + ]; meta = with lib; { description = "Python module to communicate with Adax"; homepage = "https://github.com/Danielhiversen/pyAdax"; + changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index d6d69c6ee466d..e1781a9bf324a 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -2,13 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools +, pyjwt }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.0.2"; + version = "0.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,16 +18,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + rev = "refs/tags/v${version}"; + hash = "sha256-RgIwA5/W7qtgI9ZTF4oDPuzSc+r04ZV3JOaNNFjS0pU="; }; + patches = [ + # Remove time, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "remove-time.patch"; + url = "https://github.com/milanmeu/aioaseko/commit/07d7ca43a2edd060e95a64737f072d98ba938484.patch"; + hash = "sha256-67QaqSy5mGY/22jWHOkymr0pFoiizVQAXlrqXRb3tG0="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + pyjwt ]; # Module has no tests @@ -38,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; + changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 6832a3626132b..ae4d8615c7579 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -1,44 +1,31 @@ { lib , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchFromGitHub -# native build inputs , hatchling -# build input -, networkx -# check inputs -, pytestCheckHook -# optional dependencies -, pygraphviz -, requests , mkdocs-material , mkdocs-mermaid2-plugin , mkdocstrings +, networkx +, pygraphviz +, pytestCheckHook +, pythonOlder +, requests }: -let + +buildPythonPackage rec { pname = "canals"; - version = "0.2.2"; - optional-dependencies = { - graphviz = [ pygraphviz ]; - mermaid = [ requests ]; - docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; - }; -in -buildPythonPackage { - inherit version pname; + version = "0.6.0"; format = "pyproject"; - # Pypi source package doesn't contain tests + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "deepset-ai"; repo = pname; - rev = "v${version}"; - hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM="; }; - disabled = pythonOlder "3.8"; - nativeBuildInputs = [ hatchling ]; @@ -47,18 +34,37 @@ buildPythonPackage { networkx ]; - passthru = { inherit optional-dependencies; }; + passthru.optional-dependencies = { + graphviz = [ + pygraphviz + ]; + mermaid = [ + requests + ]; + docs = [ + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + ]; + }; nativeCheckInputs = [ pytestCheckHook - ] ++ optional-dependencies.mermaid; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - # requires internet connection to mermaid.ink + # Test requires internet connection to mermaid.ink "test/pipelines/integration" ]; - pythonImportsCheck = [ "canals" ]; + disabledTests = [ + # Path issue + "test_draw_pygraphviz" + ]; + + pythonImportsCheck = [ + "canals" + ]; meta = with lib; { description = "A component orchestration engine"; diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index 04ea80c1a83ce..b1b088c44c072 100644 --- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; rev = "refs/tags/v${version}"; - hash = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; + hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 6f38f7264e685..6a4afe7a577a8 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -2,19 +2,24 @@ , fetchFromGitHub , lib , setuptools -, requests +, aiofiles , click +, h2 +, httpx +, lxml +, requests +, socksio }: buildPythonPackage rec { pname = "duckduckgo-search"; - version = "2.8.5"; + version = "3.8.5"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; rev = "v${version}"; - hash = "sha256-UXh3+kBfkylt5CIXbYTa/vniEETUvh4steUrUg5MqYU="; + hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU="; }; format = "pyproject"; @@ -22,9 +27,16 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - requests + aiofiles click - ]; + h2 + httpx + lxml + requests + socksio + ] ++ httpx.optional-dependencies.brotli + ++ httpx.optional-dependencies.http2 + ++ httpx.optional-dependencies.socks; pythonImportsCheck = [ "duckduckgo_search" ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 6ac240e4b61e5..9d05bf5e09301 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, flitBuildHook , google-auth , google-auth-oauthlib +, pytest-vcr +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "gspread"; - version = "5.9.0"; - format = "setuptools"; + version = "5.10.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NLl4NLvvrM9ySXcCuuJtEvltBoXkmkGK/mqSqbvLnJw="; + src = fetchFromGitHub { + owner = "burnash"; + repo = "gspread"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; }; + nativeBuildInputs = [ + flitBuildHook + ]; + propagatedBuildInputs = [ - requests google-auth google-auth-oauthlib + requests ]; - # No tests included - doCheck = false; + nativeCheckInputs = [ + pytest-vcr + pytestCheckHook + ]; pythonImportsCheck = [ "gspread" diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1e0410d3153e1..a730b8c48b7bf 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.10"; + version = "2023.8.11"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Piy/yUIK+IuEVbkkB18Z1iGNcE67eowff3IimI43E+s="; + hash = "sha256-EDpOCZlWIb1WChO4/k37WDkA4LT4Wy8tcMpThMgCQoU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpath/default.nix b/pkgs/development/python-modules/jsonpath/default.nix index 383df6e2652e9..00205eb1907af 100644 --- a/pkgs/development/python-modules/jsonpath/default.nix +++ b/pkgs/development/python-modules/jsonpath/default.nix @@ -1,21 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonpath"; - version = "0.82"; + version = "0.82.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4"; + hash = "sha256-2H7yvLze1o7pa8NMGAm2lFfs7JsMTdRxZYoSvTkQAtE="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonpath" + ]; + + pytestFlagsArray = [ + "test/test*.py" + ]; + meta = with lib; { description = "An XPath for JSON"; homepage = "https://github.com/json-path/JsonPath"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 3ac61c1a1888a..a25a632f5150d 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -47,7 +47,7 @@ let package = buildPythonPackage rec { pname = "mdformat"; - version = "0.7.16"; + version = "0.7.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -55,8 +55,8 @@ let src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = version; - hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + rev = "refs/tags/${version}"; + hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; }; nativeBuildInputs = [ @@ -93,6 +93,7 @@ let meta = with lib; { description = "CommonMark compliant Markdown formatter"; homepage = "https://mdformat.rtfd.io/"; + changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab aldoborrero ]; mainProgram = "mdformat"; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index ca0d947d37b1c..4573e25a22b23 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml -, pytestCheckHook, setuptools +, pytestCheckHook }@args: import ../pillow/generic.nix (rec { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index d7edcc18d0ae2..f1489e1f458d2 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,7 +6,7 @@ , fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 -, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook # for passthru.tests , imageio, matplotlib, pilkit, pydicom, reportlab }@args: diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 5186e8a476bb3..95ecce0522c34 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -39,8 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; - nativeBuildInputs = [ setuptools ]; - buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] ++ lib.optionals (isPyPy) [ tk libX11 ]; diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index 89b1eef76b9f0..79700a7bdc7f0 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; + hash = "sha256-oPklCB54aHn33ewTiSlXgx38T0RzLure5OzGuFwsLNo="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index fe663c3f265b5..df1ae78c8612b 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-m0CCi1j7esK/8pzBRlk0rfQ08Q3VoQj2BTXe5SZgpj0="; + hash = "sha256-UxGzaeBUaSD85GTDv5RbVevnWhJ1aPbWFelLiJE0AUk="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; # markers don't get added when docker is not available (leads to warnings): - # https://github.com/pytest-dev/pytest-testinfra/blob/8.1.0/test/conftest.py#L228 + # https://github.com/pytest-dev/pytest-testinfra/blob/9.0.0/test/conftest.py#L223 preCheck = '' export HOME=$(mktemp -d) sed -i '54imarkers = \ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix new file mode 100644 index 0000000000000..00ebb5123e3ce --- /dev/null +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-html5lib +}: + +buildPythonPackage rec { + pname = "types-beautifulsoup4"; + version = "4.12.0.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + }; + + propagatedBuildInputs = [ + types-html5lib + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bs4-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for beautifulsoup4"; + homepage = "https://pypi.org/project/types-beautifulsoup4/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix new file mode 100644 index 0000000000000..843b1a108c851 --- /dev/null +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-html5lib"; + version = "1.1.11.15"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gOGiBi0io6/+XCjZfaML/786B205PID8bxZxIWwb1JI="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "html5lib-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for html5lib"; + homepage = "https://pypi.org/project/types-html5lib/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 709271d0905ff..f8242d34f4c2d 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2w1D0380ljgRa5NSPAUlUPFTmGzjl79hyLwirmuHmGo="; + hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index 40924e195de5f..0b0b7e47ba93d 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-chx37D0y05nIlXmP4SsWvsO+36BV7drTYpJCgMIl5xA="; + hash = "sha256-1ThEJ8VEcXNScY4zmmXz7BVYs6irE1h9HDxkVvmVq1k="; }; - cargoHash = "sha256-VfuBee2F2FxhcTE1JwosFgQI9+stzDuOHfpLv25rcNw="; + cargoHash = "sha256-3myUFgKktvD9S0Bp7ixsZb59p3iDwmiEKUFD7wB+7IM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 67c2d0db0b846..261438324222e 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -812,7 +812,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "anyhow", "clap", @@ -876,8 +876,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2064,7 +2066,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2128,6 +2130,7 @@ dependencies = [ "typed-arena", "unicode-width", "unicode_names2", + "uuid", "wsl", ] @@ -2164,7 +2167,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2340,6 +2343,7 @@ dependencies = [ "insta", "is-macro", "itertools", + "memchr", "once_cell", "ruff_formatter", "ruff_python_ast", @@ -2399,6 +2403,7 @@ dependencies = [ "ruff_text_size", "rustc-hash", "static_assertions", + "test-case", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -3344,9 +3349,26 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] [[package]] name = "valuable" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index e1e39f1bfbdbc..fc5520be15b85 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.285"; + version = "0.0.286"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-n5FjzngdVSHHnBpVGFXzPlUAEMx96JqjYqgKwymTMzA="; + hash = "sha256-5bMfOju1uJV4+a4UTzaanpzU6PjCSK9HHMdhvKVaNcg="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/genemichaels/Cargo.lock b/pkgs/development/tools/rust/genemichaels/Cargo.lock new file mode 100644 index 0000000000000..56b9df484a6d5 --- /dev/null +++ b/pkgs/development/tools/rust/genemichaels/Cargo.lock @@ -0,0 +1,553 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cargo-manifest" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce38d2d1efbe0e7180766a872570bc07cd5430a42e713b01006d4afa89912fe" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "genemichaels" +version = "0.1.21" +dependencies = [ + "anyhow", + "cargo-manifest", + "clap", + "derive_more", + "markdown", + "proc-macro2", + "quote", + "structre", + "syn", + "threadpool", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "litrs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "markdown" +version = "1.0.0-alpha.5" +source = "git+https://github.com/wooorm/markdown-rs?rev=af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7#af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7" +dependencies = [ + "log", + "unicode-id", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structre" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31eab0dcebb0d631c93629c0da9fdce1448123aa15e5e4c08fcd71d4f4fd5f4" +dependencies = [ + "anyhow", + "once_cell", + "regex", + "structre_proc_macros", +] + +[[package]] +name = "structre_proc_macros" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e7698a9d57b3a475ce1d6cc37b1be9ee8ed188ec596603c863c06c9e06cf7e" +dependencies = [ + "litrs", + "proc-macro2", + "quote", + "regex-syntax", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-id" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/development/tools/rust/genemichaels/default.nix new file mode 100644 index 0000000000000..673519aeabc48 --- /dev/null +++ b/pkgs/development/tools/rust/genemichaels/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "genemichaels"; + version = "0.1.21"; + src = fetchFromGitHub { + owner = "andrewbaxter"; + repo = pname; + rev = "158bb8eb705b073d84562554c1a6a63eedd44c6b"; + hash = "sha256-rAJYukxptasexZzwWgtGlUbHhyyI6OJvSzVxGLBO9vM="; + }; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes."markdown-1.0.0-alpha.5" = "sha256-pjIKzXvRKoMfFVIyIXdm+29vvUzCHiJ0rrZgr4K+Ih8="; + }; + meta = { + description = "Even formats macros"; + homepage = "https://github.com/andrewbaxter/genemichaels"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index cdb66d46caacd..4520cbd22c132 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.8.0"; + version = "0.8.1"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-fJwzGgPzBQeV80Btl16N8zDnmcWq60EUbs0IkpLLgtA="; + hash = "sha256-R0+2MevBE98WNsjGsfBrMJyvc0jadLQ9lJIvoekGiBk="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-C/JlybeZ1daTBWCAtKcxmN90QSDvII+YuX5/UU/aTL4="; + hash = "sha256-fdn3yEavJUEwcUiyr9vd/0yVzkuJLwTvVeIaLcZkKhs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-4VZ5VgwtKQgAoky0zWDjEV3Nk5nMnD018Q2kJYCMc9c="; + hash = "sha256-dGu06A/6d/OtyXcmJCVZsODkLIvP7Zd0w6vnuLWuI1I="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-kzlxhUegVmra3zAyF/0KP2Nb9+uIV/UhwlnN2PMenS8="; + hash = "sha256-BZ1Ymu2WexC4Ad3cS0Zo9K6WtYL8rlqIYWprk1MyOsg="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80d3c1a189f72..230cc2f916819 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.3"; + version = "2023.8.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 307aa6e637558..96bce463bcb22 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -295,7 +295,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.3"; + hassVersion = "2023.8.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fbuNDP604G7YIL61+7LALPdD0blA4n2/meG0PnKnNQU="; + hash = "sha256-Mu3DyCtF/bTrTvRKPLVEGSZfWZrF7QQy/ZvBi5IIH3s="; }; # Secondary source is git for tests @@ -319,7 +319,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-eDA4FWFhfwlUM2skq/Yrua6RFEbmX5x1uC/QE/PhgTQ="; + hash = "sha256-N06e2QSt34l4T0hulndZR/czjaPcmw8YXF0iAN/XmgQ="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b8259e5736730..fa2bdee5f89f1 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.3"; + version = "2023.8.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI="; + hash = "sha256-Oxge6gZ7m0ZFuJKIy6X9YgmC7aK2/oQWJAYCFTclZ/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 10cafd2019c7e..954cab9bda134 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.18.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM="; + hash = "sha256-EGnamJBotPDatsWG+XLI/QhF2464aphkB9oS631oj+c="; rev = "v${version}"; }; - vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w="; + vendorHash = "sha256-gjRUt8/LECFSU2DG4ALi7a3DxKAGFoW98eBgeE5i2+s="; nativeBuildInputs = [ pkg-config gobject-introspection ]; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index b63fa8c655053..ed5c267ad0c2d 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + homepage = "https://gitlab.com/mailman/mailman-web"; description = "Django project for Mailman 3 web interface"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss m1cr0man ]; diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/servers/seafile-server/default.nix index af3e8c4ea8c21..e1c9d0b0858ee 100644 --- a/pkgs/servers/seafile-server/default.nix +++ b/pkgs/servers/seafile-server/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "seafile-server"; - version = "9.0.6"; + version = "9.0.10"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "881c270aa8d99ca6648e7aa1458fc283f38e6f31"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-M1jIysirtl1KKyEvScOIshLvSa5vjxTdFEARgy8bLTc="; + rev = "079a8b65a543bfbc48e7671c3dbbffe19fd02944"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-F1n4E6ajpri3CVM7B28UKoTV1oOLr5nTy6Lw0E5tCrc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 625d68dabc0ac..a583662138d5e 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -5,7 +5,7 @@ let overrideAzureMgmtPackage = package: version: extension: hash: # check to make sure overriding is even necessary - package.overrideAttrs(oldAttrs: rec { + package.overridePythonAttrs(oldAttrs: rec { inherit version; src = fetchPypi { diff --git a/pkgs/tools/audio/headsetcontrol/default.nix b/pkgs/tools/audio/headsetcontrol/default.nix index 294b2cc7b931b..99434f9ca7382 100644 --- a/pkgs/tools/audio/headsetcontrol/default.nix +++ b/pkgs/tools/audio/headsetcontrol/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "headsetcontrol"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Sapd"; repo = "HeadsetControl"; rev = version; - sha256 = "sha256-SVOcRzR52RYZsk/OWAr1/s+Nm6x48OxG0TF7yQ+Kb94="; + sha256 = "sha256-tAndkfLEgj81JWzXtDBNspRxzKAL6XaRw0aDI1XbC1E="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; /* - Test depends on having the apropiate headsets connected. + Tests depend on having the appropriate headsets connected. */ doCheck = false; diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index 46a6717072591..9860430515e4e 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -18,8 +18,11 @@ stdenvNoCC.mkDerivation rec { nativeCheckInputs = [ shellspec ksh mksh yash zsh ] ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; + # Disable checks against yash, since shellspec seems to be broken for yash>=2.54 + # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054) preCheck = '' sed -i '/shellspec -s posh/d' Makefile + sed -i '/shellspec -s yash/d' Makefile '' + lib.strings.optionalString stdenvNoCC.isDarwin '' sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/tools/misc/ncdu/1.nix index 742ef587138a1..09289ea745da9 100644 --- a/pkgs/tools/misc/ncdu/1.nix +++ b/pkgs/tools/misc/ncdu/1.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.17"; + version = "1.18.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; + sha256 = "sha256-fA+h6ynYWq7UuhdBZL27jwEbXDkNAXxX1mj8cjEzJAU="; }; buildInputs = [ ncurses ]; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; + mainProgram = "ncdu"; }; } diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index cf1f41dfdc6e0..67151cd060e5f 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-YTr4vxPsZAQmzE1aE7PAgUEqEyr6pywAQO4VCZ4SZoM="; + hash = "sha256-SvGJb/XosR8T/bg7nhjXR15Ba1MLaerJvoetYDtgHiM="; }; - cargoHash = "sha256-sUT05qY1eI0kw/kDvKcD93Zg2ZcKlHu+DSQIhFChf0I="; + cargoHash = "sha256-O/Xp+dZ+Pv1/yNS/KYbF2wQguq/udtJlRPeP4v3U0Vs="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index ed45be67d2009..9768b33c5ce9f 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-DfND2lIHQc+7+8lM86MMOdFKhbUAOnSlkpLwxo10EI4="; + sha256 = "sha256-r2N+MmZI2KCuYarrFL2Xn5hu4FO3n5MqADRuTXMOtk0="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix index c7275db6c0a6a..5c3f4c976b415 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "Clash.Meta"; rev = "v${version}"; - hash = "sha256-QXNMplVy4cDRbUUDwidto7jxgjStX5PmCLdAIW7Edn8="; + hash = "sha256-gOUG+XtLfkgnbTj1yUun50pevOh+aPXfIlof5/U2ud8="; }; - vendorHash = "sha256-lMeJ3z/iTHIbJI5kTzkQjNPMv5tGMJK/+PM36BUlpjE="; + vendorHash = "sha256-My/fwa8BgaJcSGKcyyzUExVE0M2fk7rMZtOBW7V5edQ="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 1fa275ab2b53f..1968d866c91f5 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo118Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -35,7 +35,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo118Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d52b52b62217c..f62588de9e481 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.30" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.31" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index fe3c7d2c88389..f608b1b2fd486 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e15c05b0bd8774e33c33c100965ec7e301e4f295 - ref: refs/tags/6.3.30 + revision: a97e8a0e2a3b15f3b3710f04def1178139ae0fa2 + ref: refs/tags/6.3.31 specs: - metasploit-framework (6.3.30) + metasploit-framework (6.3.31) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -41,6 +41,7 @@ GIT mqtt msgpack (~> 1.6.0) nessus_rest + net-imap net-ldap net-smtp net-ssh @@ -104,25 +105,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7) - actionview (= 7.0.7) - activesupport (= 7.0.7) + actionpack (7.0.7.2) + actionview (= 7.0.7.2) + activesupport (= 7.0.7.2) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7) - activesupport (= 7.0.7) + actionview (7.0.7.2) + activesupport (= 7.0.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7) - activesupport (= 7.0.7) - activerecord (7.0.7) - activemodel (= 7.0.7) - activesupport (= 7.0.7) - activesupport (7.0.7) + activemodel (7.0.7.2) + activesupport (= 7.0.7.2) + activerecord (7.0.7.2) + activemodel (= 7.0.7.2) + activesupport (= 7.0.7.2) + activesupport (7.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -133,13 +134,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.806.0) - aws-sdk-core (3.180.3) + aws-partitions (1.811.0) + aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.399.0) + aws-sdk-ec2 (1.402.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.32.0) @@ -151,8 +152,8 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sdk-ssm (1.156.0) @@ -172,6 +173,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) + date (3.3.3) dnsruby (1.70.0) simpleidn (~> 0.2.1) domain_name (0.5.20190701) @@ -271,6 +273,9 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) + net-imap (0.3.7) + date + net-protocol net-ldap (0.18.0) net-protocol (0.2.1) timeout @@ -317,9 +322,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7) - actionpack (= 7.0.7) - activesupport (= 7.0.7) + railties (7.0.7.2) + actionpack (= 7.0.7.2) + activesupport (= 7.0.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -331,7 +336,7 @@ GEM recog (3.1.2) nokogiri redcarpet (3.6.0) - reline (0.3.7) + reline (0.3.8) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -407,7 +412,7 @@ GEM tilt (~> 2.0) sqlite3 (1.6.3) mini_portile2 (~> 2.8.0) - sshkey (2.0.0) + sshkey (3.0.0) strptime (0.2.5) swagger-blocks (3.0.0) thin (1.8.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e98c4a25c1215..9cfc107eceefd 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.30"; + version = "6.3.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-j2tgBXn5PP4WegSk4NU5aVfrWVKYcYUS8fHFF5kuCJc="; + sha256 = "sha256-X0QJ4edzqLh01qAhmpcdiuk8xdAkccoJAZmxeTh3q48="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 1f4f9687e1a48..d713e28fc444e 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; + sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; + sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; + sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; + sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; + sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; addressable = { groups = ["default"]; @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072z18xbl8n793w4irrsmgh788csvmfkvw1iixsrmdzlzrjjagqx"; + sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; type = "gem"; }; - version = "1.806.0"; + version = "1.811.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; + sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; type = "gem"; }; - version = "3.180.3"; + version = "3.181.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2gdlqgq9y5r83svl4g7jpijpw3a6p7xsfdvhklb36mgmf61a0n"; + sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; type = "gem"; }; - version = "1.399.0"; + version = "1.402.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; + sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; type = "gem"; }; - version = "1.132.1"; + version = "1.134.0"; }; aws-sdk-ssm = { groups = ["default"]; @@ -299,6 +299,16 @@ }; version = "1.4.1"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dnsruby = { groups = ["default"]; platforms = []; @@ -644,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e15c05b0bd8774e33c33c100965ec7e301e4f295"; - sha256 = "15q85scigigiy498awcqa9cynmv977ay1904g8bgwg7rg42n0swg"; + rev = "a97e8a0e2a3b15f3b3710f04def1178139ae0fa2"; + sha256 = "13xbfww7kccr044wlw94s32krsca3nbrl8d0srsbia3kwzhhji2z"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.30"; + version = "6.3.31"; }; metasploit-model = { groups = ["default"]; @@ -771,6 +781,16 @@ }; version = "0.1.6"; }; + net-imap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + type = "gem"; + }; + version = "0.3.7"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1037,10 +1057,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; + sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; rake = { groups = ["default"]; @@ -1097,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj"; + sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; rex-arch = { groups = ["default"]; @@ -1418,10 +1438,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "1k8i5pzjhcnyf0bhcyn5iixpfp4pz0556rcxwpglh6p0sr8s6nv5"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; strptime = { groups = ["default"]; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 44ecbd39d4714..1ab520cefac45 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -11,14 +11,15 @@ , udev , addOpenGLRunpath , amd ? true +, intel ? true +, msm ? true , nvidia ? true }: let - pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia"; nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop"; libPath = lib.makeLibraryPath [ libdrm ncurses udev ]; - amd-postFixup = '' + drm-postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ @@ -26,14 +27,14 @@ let ''; in stdenv.mkDerivation rec { - pname = "nvtop" + pname-suffix; - version = "3.0.1"; + pname = "nvtop"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; + hash = "sha256-SHKdjzbc3ZZfOW2p8RLFRKKBfLnO+Z8/bKVxcdLLqxw="; }; cmakeFlags = with lib; [ @@ -43,17 +44,19 @@ stdenv.mkDerivation rec { ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF" + ++ optional (!intel) "-DINTEL_SUPPORT=OFF" + ++ optional (!msm) "-DMSM_SUPPORT=OFF" ++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF" - ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" + ++ optional (amd || msm) "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit - ++ optional amd libdrm + ++ optional (amd || msm) libdrm ; # ordering of fixups is important - postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup); + postFixup = (lib.optionalString (amd || msm) drm-postFixup) + (lib.optionalString nvidia nvidia-postFixup); doCheck = true; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs. + It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index f78ddaf9c8290..c26966a158170 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.25.0"; + version = "2.25.2"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-/V9xp5ew+oL3AIBsgDaAa6LE5Ko/ae7VW47QATtqG1I="; + hash = "sha256-JZWgI4yAsk+jtTyS3QZBxdAOPYmUxb7pn1SbcUeCh6Y="; }; - cargoHash = "sha256-pWMsmQ4JqlHgdP5TUgwZ6fwdEjKrilI5Rla6XLjaBF8="; + cargoHash = "sha256-Z33CGF02rPf24LaYh+wEmmGgPPw+oxMNCgMzCrUEKqk="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46c281874e0b0..9e451ba0c98d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17726,6 +17726,8 @@ with pkgs; expr = callPackage ../development/interpreters/expr { }; + genemichaels = callPackage ../development/tools/rust/genemichaels { }; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -24266,8 +24268,30 @@ with pkgs; nvitop = callPackage ../tools/system/nvitop { }; nvtop = callPackage ../tools/system/nvtop { }; - nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; }; - nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; }; + nvtop-amd = (callPackage ../tools/system/nvtop { + amd = true; + intel = false; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-amd"; }; + nvtop-intel = (callPackage ../tools/system/nvtop { + amd = false; + intel = true; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-intel"; }; + nvtop-msm = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = true; + nvidia = false; + }).overrideAttrs { pname = "nvtop-msm"; }; + nvtop-nvidia = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = false; + nvidia = true; + }).overrideAttrs { pname = "nvtop-nvidia"; }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aff0e71fcca11..e720a70fafc35 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4273,19 +4273,23 @@ with self; { }; }; - Connector = buildPerlPackage { + Connector = buildPerlModule { pname = "Connector"; - version = "1.35"; + version = "1.47"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.35.tar.gz"; - hash = "sha256-Qdl2bubNdaGcFsdeuQ3GT9/dXbp22NIJdo37FeVm3Eo="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.47.tar.gz"; + hash = "sha256-I2R4pAq53cIVgu4na6krnjgbP8XtljkKLe2o4nSGeoM="; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; + buildInputs = [ ModuleBuildTiny ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. rm t/01-proxy-http.t rm t/01-proxy-proc-safeexec.t + + # crypt() tests that use DES + rm t/01-builtin-password.t + rm t/01-builtin-password-scheme.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36c7f74c66142..09bdb2475da6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13118,6 +13118,8 @@ self: super: with self; { types-appdirs = callPackage ../development/python-modules/types-appdirs { }; + types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { }; + types-colorama = callPackage ../development/python-modules/types-colorama { }; types-dateutil = callPackage ../development/python-modules/types-dateutil { }; @@ -13134,6 +13136,8 @@ self: super: with self; { types-futures = callPackage ../development/python-modules/types-futures { }; + types-html5lib = callPackage ../development/python-modules/types-html5lib { }; + types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; types-mock = callPackage ../development/python-modules/types-mock { }; |