diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 5a2a1a0e8ac8..70e265a65a60 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -33,10 +33,12 @@ with lib; ffmpeg_4 = super.ffmpeg_4-headless; ffmpeg_5 = super.ffmpeg_5-headless; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + gpsd = super.gpsd.override { guiSupport = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = false; }; libva = super.libva-minimal; + limesuite = super.limesuite.override { withGui = false; }; msmtp = super.msmtp.override { withKeyring = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 668413bacf6f..595920bc0bce 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "ce7599398d8a5e3427d0344861006ed03b737fe4"; - sha256 = "0bc5ddgrdg97ir5xsgdk2nfzg48jai00i81s5f2xg58hak2g2ff9"; + rev = "c1198dd914bfe7af1754c67beff441b0475e51ee"; + sha256 = "17nil4vnlvq6qmsgmbrn0ci48p2pfyv1wf2p31da2ld3hjp52wbm"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-12-13"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "a440fea38f8055f0704537a6eea2fae3c04970b6"; - sha256 = "018mg6iw7ynnnd9ikcj6mqxwyz5l5byq3g7b6fvr8a10pa017194"; + rev = "a2e7d6ebd26e647469135d4096dfa89da4f070e5"; + sha256 = "0jli6pba08n20n97h0wh6h36pkca9bwq93h9dipmb0q4a2zqb37m"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "da7a11e6d4493a16458359c84b207b1df21d0a44"; - sha256 = "1wy02vmxkwqnmd2z13wrsxc0hngz6wkg72phv2wmj4lkinwdmqy4"; + rev = "9f294b2f5890210293e59a1702c3ee504ec7704e"; + sha256 = "1yj9bh04c6pgzz2kisjd2zx1xhg33626snp7307ma65cpr7pbqbx"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -547,12 +547,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-12-10"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8bcbb2995822c4062d00cb41df713fd76092f04f"; - sha256 = "0n7adhyc30778zd0l1pfml0xna8zfxcahzr9fxryqkx0ragp94jn"; + rev = "1e398202b9a63fcd91808a3205d3422b79435fa0"; + sha256 = "013wm78jv848ni8c5nar6qnnzgw8vm5lwxdb3jv1dymnjwl22b4j"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -823,12 +823,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-12-07"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "50b3c69a39f70d7b99661d82f37bb9b04eca25bd"; - sha256 = "0p69khfwlgcqrq8d6d2xrr4913vpc7hywz498h3ig5mqaik6bsy5"; + rev = "894bd7a132832bba4d09155567f9e8114d9cc8d4"; + sha256 = "1xabr17md3hwjs92rcaxqhm60hl3pfz0kzj3i966z6vqs9dfnzmb"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -967,12 +967,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-11-16"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "4ecfa81e470a589e74adcde3d5bb1727dd407363"; - sha256 = "0l2d28bh85cv722c25qda74nkwmd19nifyyqmsn5ac2s027pasd8"; + rev = "877e778afd2dbbe52b9847d9ea473a29a0c3646d"; + sha256 = "1qvlp7p39fy6pmbixlzd7h588bcmym37frciy7y5vansim7q44bn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1747,12 +1747,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-18"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "661896cd660a3f9dafe1a10a532ddf1e796344ce"; - sha256 = "0wxmqp8agzkx5zwdx8lsnvrwy2y51m17ihghl02yxxcxhdbsnfwh"; + rev = "28feeffa7daa1cfe0373c00b1d58f9d293691a1e"; + sha256 = "0pqcglvvkkcnnqrlzzbws4lqdqv5vj6lql4z081ghp3a0c9ffd4b"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2023,36 +2023,36 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-12-06"; + version = "2022-12-19"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "2f4f9259a5c0f927b31c4256cd3e4d7c6df87662"; - sha256 = "0sl6n0hi3y7hw7yyd4p93dpqxq8vvgl4h89640579k28hms22i45"; + rev = "324ec9eb69e20971b58340d0096c3caac7bc2089"; + sha256 = "1zmzca9brdm9css41m9yc6vqc9033c86whcs9ykz4v4f148kyxvg"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "1e919d72bbd2024e5c2bd7f443180e5e6b619720"; - sha256 = "04p42j1w87c7ajw463ivz0i99bmwnvbn3s51srmrl0lwyjpgp6ls"; + rev = "42a63a90f93a457f5f1c40320bdc017c626ec653"; + sha256 = "1vd6plbhyc1cfm73gmi71m04h1h8v7jd72y096g8ngw7zrxv7z87"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "0db68c19330bd30a8a719ef3d6bab52a21fd1a81"; - sha256 = "17qb1pxqzygl4k6sfj9bmjd6x6z3qnpxl74vc7w6r32qplzq67s3"; + rev = "d717f8d0383be382ffd4b461abcff0af2336ffa6"; + sha256 = "0a9kydl976zcs07g8ll72fyir95k69xy5rq2wc3pc6k60mifarya"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2071,12 +2071,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b6167b2b4ca791d866ce174aa623e77750784efd"; - sha256 = "15zd018306yhb0009phd2ypmvxnmqcmgq7zq2ib7yrclmmimcgm6"; + rev = "0207a61d2bdb35eea0bf316da0f1287aadcc1f86"; + sha256 = "03j6yg0gm9k9hidvcywp5xq1m0gmg0blfzqm41kc74myjsscy5ym"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2215,12 +2215,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-11-22"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "5ccce7b50c8ce81c01956864ff51b455ee6933c4"; - sha256 = "09zmv2s5fnpvjlkcy5hrjkqq58s5c10d321gx6ip7qhpaps3vgv0"; + rev = "115b9f9cec10e31aff39c077bf5a4881bc840916"; + sha256 = "0xvwsk6sl2yikppmx962hvgziib3wyybp1z528zvrl7a4xrfwx9n"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2589,24 +2589,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-12-19"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "538c6180d11d45170e69e279347cab70a8e1ee33"; - sha256 = "09z0lvi165n66qmhpslnb9kq12mppcmdmp48qns2a5hm5z1sryal"; + rev = "61afb28f61ba090a67a88186f7bc8a94212e509a"; + sha256 = "0zzmgyl0j9ajmmyiwbpyp5js0ssz8gnlll6kbyk421jybjy17l6n"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-12-16"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "aeca09694168f4800add10f2d031b372aa5c693d"; - sha256 = "1j2ngdx0dv96vclvb5a7hd6glm0q539n8nfm2mfg21q5c8hv39xl"; + rev = "3812e296d3977a24db62f7c18025755b40968d3a"; + sha256 = "0xqpbsv2pahdc4zxqwkv9r6n5vm3g0c60q3klg96k7cn737k8cyn"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2637,12 +2637,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-12-12"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "1ee6072c6638de86abc9aef43ac315fd7eede6aa"; - sha256 = "0xq0m5qy3c48bvc6rrhr9w3rzy51a0gl2wi4y64mxp96aapz7j6h"; + rev = "9195c478cf05c3369131a7a9c606cbbc5247b0c6"; + sha256 = "12288w7071d9s4sfv0bd7bzahrmwds9yabqzfpapassr8958w84j"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2673,12 +2673,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-12-13"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "a60ef7702c77288e79cc4c2bcd6fddf96e100db1"; - sha256 = "17z2y8dwzn7ildd6gjbrfink4jy48h1di7b40d1csbci4ayfa2fc"; + rev = "255b8a1e6c3c2a24afb625274dd61a08edcf2db6"; + sha256 = "0lp6fiyv4b289qn0835sznva59515vwih4xp0mbfnp6n5fv8c811"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2759,12 +2759,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-12-13"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "8c1f892e31d22a0d99876793788d323eed68f3cd"; - sha256 = "0npczribj3lv0irpb0ka001r3sfqx93d981hm8aqi4wd1nsaqbvh"; + rev = "34c9fbc6f9777c4b1e5a65e590f0fa614c1e747c"; + sha256 = "1vla0d4gxw5664hbzw3ykp44vkdwxxpcq42gg43v1786jslx24zx"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2819,12 +2819,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-12-04"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "573e6d1e213de976256c84e1cb2f55665549b828"; - sha256 = "0m54mdxkpx4ds7clydiclq8m41vcf1sg6689r3kyp3q537kmc9k1"; + rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c"; + sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2976,12 +2976,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-11-08"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "804b96c0b7fea538af1a0a31daa2dabed0b16ad4"; - sha256 = "13wxjyzr1hq8iaa85yxqsa53ja4ccrq395q2gsk3g4vvjxcsw9wy"; + rev = "8a4c961330cc4688087f23d18fa7d2f1af9a4902"; + sha256 = "1s7ckv8xj8pjbl99niz3bb15ybhjvhqhs0vxj1a0vanfi8n4pjlb"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3108,24 +3108,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-12-13"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "b1dea843c2f4c623ac974afc074ce832a29f8548"; - sha256 = "1gfxk41h5ywv0i3xwf05mrrvnjs8h253saazm32if0sci7m6x99s"; + rev = "5abf66f63bf08121dd4e917488b59ccb693eee12"; + sha256 = "0nf3gqvzsk4cda5r0afa979cxfsjq9smy4dyjpw2dhyxrm32a5cc"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-09-22"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "9ceac718026fd39498d95ff04fa04d3e40c465d7"; - sha256 = "1zyypxi8kv3gcc8crwkd52c1nnp06yqdyz9ici02sq121lpdfklg"; + rev = "fd7fab77b20fdf09180cabdd660d8c3b7fe7ca1a"; + sha256 = "1shljxj04vrifkrqk5mzldl5qwxf196h01bvxpa03kf20yl39wvd"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3396,24 +3396,24 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat.nvim"; - version = "2022-10-17"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "45d485921bc667956d843ee6777da7071ebca5d8"; - sha256 = "1bhyz70alv9mmm32xpa1aqjrnrczamwpjc7f27y1ia5h6wga8g5d"; + rev = "172269867994c0da7adcf02e89a068cda85eb805"; + sha256 = "10wamh4f8kkydgj0wckbaajzc1cyc04q9bidkz612vj14809dc6w"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-12-13"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "dca3fbce664de8d52ed5fcfbc0f0bc09d2f8a560"; - sha256 = "114zhhi9amkrdb9q6amasd81qbal7hlh9ywj4fvhgrqka7l5qazb"; + rev = "f4b9fd3b4795fe138aea93dd098112442108d277"; + sha256 = "13nphydsbp8vldjfffxc6l5x818lb3ciamiidf77nij50pi6dyx3"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -3491,12 +3491,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-12-18"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "7b08e213020adb934aa7799bbeadd500c6577887"; - sha256 = "1cpdrmvv5s57557m4hqyqsa92sphb29d1ybhcv1kdzaxkkq44hqa"; + rev = "1125fedcc96b7bc9d532d564f8ae4b09a82b0cf3"; + sha256 = "1l8qp4g1cfc2dbnp28ax6dnnymj39h9zq76kn7s5jskqi5p2cj45"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4029,6 +4029,18 @@ final: prev: meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; + lazy-nvim = buildVimPluginFrom2Nix { + pname = "lazy.nvim"; + version = "2022-12-23"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lazy.nvim"; + rev = "a973c2edc2167012d4721a784a0da46906cf005c"; + sha256 = "1cjm24n295hm4ijpccyx1sns35n6rmz3ic07n15hvs8p2rgbk65b"; + }; + meta.homepage = "https://github.com/folke/lazy.nvim/"; + }; + lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; version = "2022-11-05"; @@ -4091,12 +4103,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-12-19"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "bad9d4cb20ad2e542a9e4eecad7ba2f2834d1c03"; - sha256 = "1y8is1pczrymkbhxsld6bicjnnjik4g0hns1ypjpj796xsmwi9l3"; + rev = "f53ef425b1b6cb9dc907a054755138345fd2fd57"; + sha256 = "1jyakdsn285l7mqxvr80sd4p175s17xd44pslqmgippwqbdgj8ns"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4450,12 +4462,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-12-15"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e528f7313dc67aa1f8caa796a56232af5a569871"; - sha256 = "16cfgkring4g01aam7plw0rgrqvq8xxkmlvax0kfbjlviw4qfbwl"; + rev = "1979f1118e2b38084e7c148f279eed6e9300a342"; + sha256 = "0di84pidxf0mx2gcna3lhisx3drc1i2wajcrrc2dv7n122fv17yy"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4510,24 +4522,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-11-28"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "bfa0d99ba6f98d077dd91779841f1c88b7b5c165"; - sha256 = "1yr4p08s0yll3g39k62735g0bz21v0vg5f0vxizwhyy2cx49n90f"; + rev = "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3"; + sha256 = "08yz4p6y5pg8ak4dkpggsk89n6f6lv78rglh1q88zh5ymjbqs8mv"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-12-11"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8b25e74761eead3dc47ce04b5e017fd23da7ad7e"; - sha256 = "0jf85bynp91dyg4xx06w4ha0cim6m5v26g5wxpml3flmwglj58fa"; + rev = "5570fd797eae0790affb54ea669a150cad76db5d"; + sha256 = "0052rkqyhniz6djz7gkblmdlndllwv9jhcl6kh973qq23pdb00n4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4607,23 +4619,23 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-11-20"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "2a80aea83a69d54c69fa1bb9b7c27ae396bf2390"; - sha256 = "1l3vvf09wvqhrrk3ww99mc4zbajjr4hmr4g7cm8v6z71r6s0rp00"; + rev = "0560abaac9369d1027169a50e5219c3e069d00f3"; + sha256 = "190cw0fzrswigq1vc43nmf28mzhbn82wg2xhiq5rymbdf1lvpm2m"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2022-09-14"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7"; + rev = "bdccc06f963d722111fc8887b22473997750b2de"; sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; @@ -4643,12 +4655,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-12-11"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "82e04074117635ebe7ae2202953a0c3d78db5146"; - sha256 = "1rr5xb4nkwm4vjk8v2065dy7d55qgh8wr6fhgash2gzrfjvm7b8a"; + rev = "c18abb4d0f1e2507676c22fdb9e4af4705c2a808"; + sha256 = "1zm30nraa6n89nri9487bf9vhllvgmpxlfzwqhn3s83w5zw1b899"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5003,12 +5015,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-19"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "e62f10e850aa0ce72fc780716084650c33c89d45"; - sha256 = "1yi52zd35w547cgf5899177zaj15kq8g4rmqv8czi6h1cvari9qw"; + rev = "dd35a9b9172ae0f87eb407111dec754cf321002a"; + sha256 = "0ly5bx508iar3qgc6gx79hca9s47wd13d9pyr9h0xryqyrgsm027"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5027,12 +5039,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-18"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "dd32488b379ddbcaabd0e35831f0d6a5af7b917b"; - sha256 = "1h3d2p7b0i36v0fh7bjg0ga3kw62hvxd8zzak8shjkany8kljgzm"; + rev = "c5f0a814abf89b5b1e3cfed95322813939bdc0c5"; + sha256 = "0aji887c2rmn9286jdx5wf1nj4gpyr0n1aar7rwx77k4va5fm06a"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5111,12 +5123,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-12-05"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "a79bf5969e27a3f1f1478c9b05c187815f2b2390"; - sha256 = "1a8w2f5s50j4zzwkshxmj48lch7vd680hmmq3scl4q0knvjdyd9h"; + rev = "2c18f831effb5f3f383b2049902be23ea0dd7a8e"; + sha256 = "10lwjrwxjmag2jbhpzfv9g6zpl7mlmv646gr062pragb2cphrm7n"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5339,24 +5351,24 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2022-12-18"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "37c9b1c979b4948478eb27249d32bc506801fc5c"; - sha256 = "16h07md3pvsc6h5glispab4miwahm7s78678jr0aya174lkjrbhk"; + rev = "8f67460e1ae721b91a9439243af5e42d6f3930d6"; + sha256 = "1f8rpchb7gr2wzl1xy1ja74h052bc0cig05a8549l5f8kg3x0qip"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; nlua-nvim = buildVimPluginFrom2Nix { pname = "nlua.nvim"; - version = "2021-12-14"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "tjdevries"; repo = "nlua.nvim"; - rev = "3603ee35ed928acd961847aeac30c92a3a048997"; - sha256 = "0bdpplmgn0cvlgw37jn8qhl91qx4sjsyl88r1qzp6c0gjn0qfwi6"; + rev = "01aa428ff00605d52d0c0ece560f6a6d7971726b"; + sha256 = "1v80qmhhqc1frpvnz42wa84qaz6xkasyrz59aisifp1vqcn01lgk"; }; meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; @@ -5375,12 +5387,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-12-19"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "e4a4290aa2ed33c8748b518feee77eb45a3de623"; - sha256 = "0fw0wwz95vqb3ysh7q0pkcwxrwvsqarb4mrcf95iafffigqnyl40"; + rev = "585d24ec6e3fb4288414f864cfe2de7d025e8216"; + sha256 = "0z7d3nfr5vydk2pwjhl0zlw0ipnbqhbw02sbk6j7vrcw6l0aqd7f"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5399,12 +5411,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-12-17"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "3583173d54ceb189ffde5f96b6f99261b1f52e95"; - sha256 = "04r42hbw58mppgfzxz7hg8yvwwnamr8hnkdfycnaq6rmz7njn2wc"; + rev = "418e2507dcff84a7cb993ae4f37697b98e0c92ca"; + sha256 = "0zjlxq8xa7and5952lxz0irklxsrmh7k4bn905ggcd62hbpd5q6v"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5435,24 +5447,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-12-17"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "37e0511f189cd19eabd0e71841f10c3a39bbb62d"; - sha256 = "08xf4kmrgvm4hp8dg196qcdnyrgi0vdkx8jw5dlrc81fm2jcck8r"; + rev = "5d1ca66829d8fac9965cd18fcc2cd9aa49ba1ea5"; + sha256 = "17qddgg15abmigj45lilfircf0rq78hl48va56ay53sjy1j52jhz"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "db1c7cb5f6d6f6036b7f8433bb3cfcbe985cb3d1"; - sha256 = "087i2mg605rri5ab2khzwqasak22mzl1kggn0v2523xx4llrc1k1"; + rev = "b26851b3e7ac1c0c85666f8a74e36aef2acb89c6"; + sha256 = "0djmqka2b9yikjr1pllb572lvws86769z9bzj7xj984x1v1xf7rz"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5507,12 +5519,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-11-02"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b"; - sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn"; + rev = "be09864ae8b60f6f96d42ed60752dcfa3b7d31b5"; + sha256 = "02hy4358jqdf8pwis4w7z8rg4qw039c5cjvjlgbw4fzb02rqpvf6"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5531,12 +5543,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-12-05"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3389264042e4590ed32ce26d7e47b17ec4e6e6d5"; - sha256 = "0l9fcy2ic5n7krngrz0cv8darb2kv3whhv2lvf312cx9xmjspq2f"; + rev = "b418b0a241d36509196944a6f6bee886c775d54f"; + sha256 = "1cjafp91jk9rrkiibsd7rp863gs51xpyrpkkprfy9x45nx6ihrmw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5567,24 +5579,24 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-12-15"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8bbaeda725d5db6e4e1be2867a64b43bf547cf06"; - sha256 = "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5"; + rev = "d09b0c396aaa078cdfe78316ec06940971136e85"; + sha256 = "1vf1j10mibc3jdz3d1skw9gy14vg5fnpzzlgvfcd7fgh3gm6lj7h"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-12-14"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "885105039b30f90096e5cc3b09e2fac9316604a8"; - sha256 = "17cp12pv7gb1pk93p9gchmsdsa3dfp9zqs6irisr3vb0azda4k8k"; + rev = "e4399dbaf6eabff998d3d5f1cbcd8d9933710027"; + sha256 = "01pbr8z8fn16vsdlsxrhd83rbx41pah477xr6p01lnmsqzwg3k7f"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -5675,24 +5687,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-19"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "284c754f60f6ef15ecdd071524b945cb2fffbbb9"; - sha256 = "1wafh260fibbb917bskqnb70mbji6cgppj812wb42igc05rfw72x"; + rev = "6f2ea9e33b48a51849ec93c6c38148a5372018e4"; + sha256 = "0bjzqwvxn57n3rpx3sjk4cqdx876cgrbw744d86pzd1lrzdjixqm"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2022-12-15"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "bd9823da22165ea4aa7ec232e8c3a9b3158e017a"; - sha256 = "0ii1867shcmwzzjkljhcyyfinl8y4xw8pl22ah5kydap4ra1s24p"; + rev = "8aa9e7ef317182b33fc3e04651041e8d367cc73a"; + sha256 = "0aifkj73vxr6s263g63bl269nbx6hvbk5sf0mq0m3y4z9ia8lf03"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -5759,12 +5771,12 @@ final: prev: nvim-fzf-commands = buildVimPluginFrom2Nix { pname = "nvim-fzf-commands"; - version = "2022-11-23"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf-commands"; - rev = "2379ca4275f7822d1c0e4b50414d0b06696de696"; - sha256 = "0pvjf3afa210zk1y97q5zdsc150r9fxrp7l4ivymhli5g00whmzh"; + rev = "52f9450cd69f462aa1ecc5dc3e05ef3b77840e4f"; + sha256 = "03q1zzyarjirays1ih6d2d5jdy5hac7sglxa95n5hlrap3w9y859"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; @@ -5819,12 +5831,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-12-04"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "7fb804f504fd0935d65246a1d5ddea73d9ceefc9"; - sha256 = "1fsqpd3idfqf5r95m2w32ajvldvha3844hl1x4hnwmwn26jn3iib"; + rev = "0e59a9d29c5811dfc1ffcb032e18064fa2008b4e"; + sha256 = "05gz02npc4bw25jh8cm3ljv4p2iy6p65y6nv335b8fhm682i647f"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5843,12 +5855,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-12-17"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2773a6b2f6518c14bbbc2b8367d56a36db2889c4"; - sha256 = "0k43xix8j488a51xbx57i1m5si8kylfbcvb52jg7c04r9f5hgbc7"; + rev = "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d"; + sha256 = "1fdyb3cxqyj9iws54nhm76wnfadwhwd3ld0m3vpjyl6p85ss7iqa"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5927,12 +5939,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-19"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "22c87d6f48c4fb1daf33476450d0b14a64230809"; - sha256 = "1ig3fmj798axcv1694nna6bb97ij0rz0fm7jrfmqjs0p7sll10f9"; + rev = "3e2cc7061957292850cc386d9146f55458ae9fe3"; + sha256 = "0jk84lsx79as2pigcgnqpvgz8ppp1dmcf0lvwd5wfd0dcwazjnz1"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6023,12 +6035,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2022-11-20"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "c9b3a3818c1f02ed584a822ed1471d7f1d3e23fe"; - sha256 = "1s6625pksvpi6ri8d1l6szvjf1m9nks92zvd8ff7h2sfyvf3bm5w"; + rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; + sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -6119,24 +6131,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-12-07"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "c332c9c0574a531392818baf4020b86ba5575942"; - sha256 = "0xkf01sr7pkm26xq8spns8765gpj7ibpdp4cx9klw6a9fx8sir9q"; + rev = "68ea562b485b6593e325e7916c3bd6e833d433e7"; + sha256 = "1r32ad6q18y3w3adkdgscya6gw9iynab5pgqv9an3924vzpbvi8w"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-12-11"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6cc6b54d3728a17e34bb5c9b9db05c7e5690813d"; - sha256 = "06sbki4m8za9zsj643fj5wzx44xsa1nv23as1m9ip99cwqrvxqcc"; + rev = "f0077c3726d243eeaabd2ec280216e8c3ca7da9f"; + sha256 = "0wf35dpz4adfd2c11dk7s1vgkqspy4kgqsnh49vzjjlyv6s493df"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6155,24 +6167,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e14c2895b4f36a22001f7773244041c173dcf867"; - sha256 = "04wxxs977hzqlzp2yqv577x3wxqsx0q3x6kpx5yj7d9b52f3pm29"; + rev = "9e4c39572f631bb60ee15cb9d46e1daa9927a45e"; + sha256 = "0fw8c8jzpw2vrfh1ac27jbs0kgh3f98pixbwxwak98iq6a03vv50"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6e37050e50e80e4324202a6b8fbac6c7fb90c546"; - sha256 = "129j7vvv9lr1lcrg95a2p194qlmjh83f536qqcqk9s6s6687ad9c"; + rev = "cf6b5cb1ede83741d5cca7071fd75df3b942d3ca"; + sha256 = "169nnb3q4qj5cx1plzgvhkbyva5z2zwb2w8bcg9pj3a81p19wcwm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6215,12 +6227,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-18"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e2ee8fd7259389deaa898d1216fdc6846a26c627"; - sha256 = "0caxnb63wn111h33km3l4vb8nchilzcivvjfa4ndaxwnjarqsyd0"; + rev = "b062311ea6da061756ebb591d30f61c9e5b44141"; + sha256 = "1xd79smq4wpr1d38x0lw9zdxslhbgg5s986sk6k6l5vqs71i3gad"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6311,12 +6323,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-12-08"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "3220bb394ab059888b1b0498bbe43d9435ccee22"; - sha256 = "01alhc1wlh7g0b1p0x2q49v4srh2vqiwcgv7sjis89wz2dnq5n48"; + rev = "63eba53a0ed93c8495623aee194ee0d4d44162f0"; + sha256 = "00acn9iq7p00280ixwh9325wh6k4r8a1s84afwsz3a2yvsvyssrf"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -6407,12 +6419,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-12-19"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "5dbb0cbc4bf6d71ea91603837ff0ed12d3e4e34f"; - sha256 = "135qpkfanmbbf1i39l000ykmgsrlsfp2nrfjb8swsh5f5ilsmv6c"; + rev = "7a7641e27f922496b4bf8493acd9f2f8da7ff864"; + sha256 = "0b2cm9inkw3wps8snxb09v789gi37k04swb8nfm3swa487r0dgr3"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6889,12 +6901,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-12-15"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2677bcc52a13ef43e24c3bd7739bce2ec5ebf66b"; - sha256 = "1di0y9yhv2nq9bk6xpbmkwr0gh1kjsxn8qp0hp4a9hk8k4fkpc1s"; + rev = "2c72385b627e46bb66f23b8a11da40b4bb127506"; + sha256 = "14rbd79nfqzyhqb2bs57q4z9id7kh0r6jjg6g5j6cwqd7fjnaiwf"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7262,12 +7274,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-12-13"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "aca74a49f192935349c55f4d4e9b531bc1c96052"; - sha256 = "1kqbcd3g16h01wzh6pfmfkv9ka8cjyrq6a4yni8wi5khxk16vmrq"; + rev = "a2a648b709bc52d64504ba4fddedc25690029d8d"; + sha256 = "1h5jbbi22aipsyqrjsl8b9g39i4i0zqrxbrg4i40hbi07l5bb800"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7407,12 +7419,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-12-16"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "c6174bd0de3e2abcc7cb9f6a48a78b9b238d7ff1"; - sha256 = "01f8cca0j3ps0flngddbr6sxx5v0hb0anx0qgj6xlw9274ka5gzc"; + rev = "91958b5bcac9dd78d6c66fc75816464fac29e27c"; + sha256 = "18wp8kj8wj2w3x3qk1jlz0hsniw7jn9igps0rcgcfr6122qggh11"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -7612,12 +7624,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-11-30"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "ad80d32ba42b0c7f3a06b5754b7f669bf71eadf0"; - sha256 = "1pbbb8w164pzrlsglmc5pls8x1jp3zv97m74hxljpwkiqjzfzfjn"; + rev = "187b604da1a6452c700ce21fdf340ffbea956298"; + sha256 = "0b61qmqzl8vqryy58p9688vhxwhfby6qsygi3720hvvgizxk9jka"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -7817,12 +7829,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-04"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "cad567e11131a01f2934930c1efc8b1b09a0dc56"; - sha256 = "0d0l47dmvsba5z8dnywmc55s964wzz3f202amxj5msh9jj051ry3"; + rev = "dcba9a2a385b95b831159ea35d633b488fd73290"; + sha256 = "07kjpnj11sc0yxbf69ajw43psbkvz1ck9knx41dksnvmz0y6n962"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -7938,12 +7950,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-10-10"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2"; - sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4"; + rev = "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972"; + sha256 = "0br4skyavnsk41s45z5qw0ny7g2lamd60c6clmwyrvim6hgqx12b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -8022,12 +8034,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-12-02"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "cabf991b1d3996fa6f3232327fc649bbdf676496"; - sha256 = "04h9hsy6az1hm0bcg8vf8vsj9hqbf0fi3q5fksdjpqpcf2m04j75"; + rev = "e960efa60e97df58e089b00270f09d60f27202c8"; + sha256 = "023g8dblp5bp4wa5955drfipwzjaarbxl5xa9pky1ax4pni3i1rw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8251,12 +8263,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-12-16"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "14ab22b51d0f54de3402bd706e9e91836de39a92"; - sha256 = "08c150qxcx24dz5dyjcd14ckj18ilc1z7myh0f8ja1xibqi8gfl7"; + rev = "8b55a47165348dd1d811f9e1f867bb17bb35a360"; + sha256 = "0glhl3dm4ispxcy1x9g495by6xfdqmvlyhcywjx10kqmi192cwxs"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8443,12 +8455,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-06"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "53c53bce3bffa96be2b5f855d7ffb1d1f208eee5"; - sha256 = "1hdx4k9wcn3j9zyaw0d4fg83w7phn59hh7zblqhzd8z61h8kfdpa"; + rev = "9ebb11fff1548ae9406bba8a06d9caabf686ef9a"; + sha256 = "0yjqc4is8zaf2m04a2kh079jp2635nn8nbpkqak416hgigs1agfc"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8851,12 +8863,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-12-16"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "6a4c82c950cc10388117e927b89a72a557e5944c"; - sha256 = "1mqlynscx1qhd2gxbz9bry6v4i28schhqcd1h4vvqc1lkcv3y4kw"; + rev = "9e2d021fc6088a2027315d7e7ae8bafa94f16a7d"; + sha256 = "0qfpq71hmhgjcy2l056jm4l9gz9hypv0c1kcm1ainwyhq0bkwr77"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9247,12 +9259,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-12-03"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ea90c8cf804feea294bae47423a15b733a74b5b7"; - sha256 = "1v6f5ra84sdhrsbqp5vjyhlcjxnykmasbghni600l6ygzlgd2saq"; + rev = "15ba008e15a05f90dfec0b4a59124fccb3e8ffc1"; + sha256 = "167kmgd8793nhan0hpwyvi1z0jzfgrvhgdzbf8clzswxg7wvq773"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9415,12 +9427,12 @@ final: prev: vim-cool = buildVimPluginFrom2Nix { pname = "vim-cool"; - version = "2022-11-29"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "471b72095378cbe14f51bc5d9f679e97c541a498"; - sha256 = "0bn323gb56kra3ciq56lidmhlnx3gbhhjajg6kjap5qqz0mp2ncq"; + rev = "80c19445728d70595c2f72d0436527e28292ebd9"; + sha256 = "1imhhsf5rhj13gchddfkgadn5z5i96gnw822nmx0ddcdvrm6kisf"; }; meta.homepage = "https://github.com/romainl/vim-cool/"; }; @@ -9511,12 +9523,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-08"; + version = "2022-12-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "34151ccce9f5ff16229b8e482a97e46997914cb3"; - sha256 = "09lia66yimk8h9y1bj50ar45c9r13k92jw009nxp1kfkb9nsk83y"; + rev = "70f86045e3a70ccdc9b448a9fe66a550290adca3"; + sha256 = "053cy6vmsvjrhjrgmnhg1s2cvxap3dyfniy9r8phd56isvlqd2i1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -10135,12 +10147,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-10-22"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "400a12081f188f3fb639f8f962456764f39c6ff1"; - sha256 = "1rfg2wniappm64y5b6j6nmqsp41axgs6f3ghdzcjgak71b6mbng9"; + rev = "00df1089b6267f47c7c0f13536789feb9db1e65b"; + sha256 = "1qj22fhkhamva23jn1f1044vj01p3n4203zdhqasn8836jpw0f82"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -10917,12 +10929,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-12-03"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "0a8d2dfaedf1e51859317f675cefe8403041e76a"; - sha256 = "03yipczl11q76db7s1a11nmn3k6rw066y4x5jzracfny9f63miw3"; + rev = "2cb7ef587cd2c79dd98a7cd3ff301cc415296629"; + sha256 = "10krhi7cq6ijlpascsjjxwg4abfqg3kis4p8cm0lwaj7sgk5h5sv"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12683,12 +12695,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-11-24"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "776026d7311001495095f0b49dd2f0ebf33c3604"; - sha256 = "0zj65mm4fn5acknxr1y85lmjik3i6k67w4yj4frxd61nsfk32sqv"; + rev = "b4aefd5a1e697ea68d50df2f7b222036a7251df8"; + sha256 = "147mv6zn5b8my8a8w7ddk1g1wzj0xsdssb265j19vs8ajijg7bcy"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12863,12 +12875,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-11-30"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "e44026b5394fd79aa0f2118aaf41627ef9c354ee"; - sha256 = "1a14msxri37xs29xq80fw9mh6g9ipmc9g4ik2p0x9r5h2pz2nsbq"; + rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e"; + sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12995,12 +13007,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-12-08"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "6bcc2dd50f8952e9d20760ccccd3425ecaa4b25e"; - sha256 = "09lh4cd2v8k0hj6ipik1lq78syl07aaf5aybpnf9l3gbvqbj5wnw"; + rev = "01e62dfd3f067318b2d4eb341801149b9ba6b34d"; + sha256 = "0xnbsw16xgsz5w026hhr7vz20sp7kd4yybbdni7clsw3xm6hywkf"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13043,12 +13055,12 @@ final: prev: vim-zettel = buildVimPluginFrom2Nix { pname = "vim-zettel"; - version = "2022-12-15"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "9c6fe4cbb2a2d84300afadcc112318fbf7adad1f"; - sha256 = "0d3sv19d6karyxilpjfaab8lg37qbwx5arzr9daclky9762ipkf0"; + rev = "7bd110f8d370c1beb812b30af82336556fa44096"; + sha256 = "04r72b7vwbb5m7ik8lczknpl8qpfar3lhzj7plhzpq1sbqyj4kpm"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -13621,24 +13633,24 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e521571bba903a29b3157d8e00c1e3b94c022b85"; - sha256 = "0pmfpb1jcggqx1dvr5vzgrsrdwhvq25vin4pvjcbgxlisxiq9vzh"; + rev = "113f946b40e38e169ac98b95737f1facdfb1067d"; + sha256 = "11c637v1ab47h1p67phdknhwiakidrjr5rn3mhhy2b2nnw6ybiqy"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-12-12"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b7645942bf91154f76ca016b612131168522d19e"; - sha256 = "1x91l9dkmzkfj4dmzg2vm0qxkmr2ilmqql7c774jcwfhr90zd54x"; + rev = "eb577d47b0cfc9191bf04c414b4042d5f1a980f8"; + sha256 = "1zp55jg5prsvvq12y8c03arlwplgwwpr5hy14w9hhfmp2bix98lq"; }; meta.homepage = "https://github.com/dracula/vim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 914a6f717472..105519b8f3e2 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -3,6 +3,17 @@ { buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }: { + ada = buildGrammar { + language = "ada"; + version = "e9e2ec9"; + source = fetchFromGitHub { + owner = "briot"; + repo = "tree-sitter-ada"; + rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; + hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg="; + }; + meta.homepage = "https://github.com/briot/tree-sitter-ada"; + }; agda = buildGrammar { language = "agda"; version = "80ea622"; @@ -104,12 +115,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "d83b3c6"; + version = "1bd772f"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "d83b3c661db34fde4dcd80e79ce1653d4524998d"; - hash = "sha256-JWDtJeTPc9kQVMXXWmZ/TVJ9P/rIGlPA+1TfF0U7uNM="; + rev = "1bd772f69b0db577122533514a239b184650adf2"; + hash = "sha256-ySgSavQflqFXHY25DjX16aP4KgK2HFdsQ6HeYaerxNI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -404,12 +415,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "2a6abda"; + version = "a8fa839"; source = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "2a6abdaa47fcb91397e09a97c7433fd995ea46c6"; - hash = "sha256-YDLPYwWHnwqj7CpgUKRXQYj2a6ZJUKc0bcalVSJ99Ew="; + rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; + hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -736,23 +747,23 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "768a384"; + version = "505f5bd"; source = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "768a384989391237c6d55ff3d878a0d1e0d2b4fa"; - hash = "sha256-kSG0YwtkzGVz8RIYBrE0ZyUMc6YTtQO8XvHHiwy5GL4="; + rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; + hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "36b099e"; + version = "f254ff9"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "36b099e9ea577f64ba53323115028dadd2991d2c"; - hash = "sha256-sd6Ue7Ur6Juq2kZbuC/E/gK9JJPVG/5UTToQ+5hdTD0="; + rev = "f254ff9c52e994f629a60821662917d2c6c0e8eb"; + hash = "sha256-918mGh91hAl8hx4HoGOXr2BFoDtMz5yPkQRMDrkk1Mg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1115,12 +1126,12 @@ }; query = buildGrammar { language = "query"; - version = "0695cd0"; + version = "0717de0"; source = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "0695cd0760532de7b54f23c667d459b5d1332b44"; - hash = "sha256-DwhvOvUb3hNmZTTk5HkZ9X1DCWz+G3+YJ0l/PqLVDdU="; + rev = "0717de07078a20a8608c98ad5f26c208949d0e15"; + hash = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -1291,12 +1302,12 @@ }; sql = buildGrammar { language = "sql"; - version = "8dc7fa0"; + version = "8635357"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "8dc7fa0e51145f0312eedbb5aff9945bd967fb8f"; - hash = "sha256-L6mur9BnDzA1mgtsWdyMC52IY9sKwt/xDkfPv2VKPPs="; + rev = "8635357363f8b01931ce6abbe0c937aa73e47bf8"; + hash = "sha256-p3R8uGIHyzYnRnKYWpeqMAcuk1xjKlPvB5vllPqUvrs="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1357,6 +1368,16 @@ }; meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc"; }; + t32 = buildGrammar { + language = "t32"; + version = "f8106fc"; + source = fetchgit { + url = "https://codeberg.org/xasc/tree-sitter-t32"; + rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"; + hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34="; + }; + meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32"; + }; teal = buildGrammar { language = "teal"; version = "1ae8c68"; @@ -1461,12 +1482,12 @@ }; v = buildGrammar { language = "v"; - version = "66b92a8"; + version = "f0aa56e"; source = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "66b92a89ef1e149300df79c0b2a934ad959c8eec"; - hash = "sha256-R6Irz3sdyzKH1qWOUwUYK1OKhYs0PUYS/azYn/nb6jk="; + rev = "f0aa56eec7689f08a389c90ad8d3e5e0d18b3cd7"; + hash = "sha256-d69SvXDWxeRk2hvou8MhXUpUrSBwYENqFDGpT/Y5UpM="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 580c1aa22dab..a78063311267 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -71,7 +71,7 @@ def generate_grammar(item): repo = "{repo}";""" case _: - cmd += ["fetchgit", "url"] + cmd += ["fetchgit", "--url", url] generated += f"""fetchgit {{ url = "{url}";""" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index dc6aabeb52e3..c4a0011c41cd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -337,6 +337,7 @@ https://github.com/qnighy/lalrpop.vim/,, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, +https://github.com/folke/lazy.nvim/,HEAD, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix index ae9cbb7fb095..ee2f8dbec9a6 100644 --- a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix @@ -9,28 +9,69 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; - # patch runs on remote machine hence use of which - # links to local node if version is 12 + nodeVersion = "16"; + + # As VS Code executes this code on the remote machine + # we test to see if we can build Node from Nixpkgs + # otherwise we check if the globally installed Node + # is usable. patch = '' - f="$HOME/.vscode-server/bin/$COMMIT_ID/node" - localNodePath=''$(which node) - if [ -x "''$localNodePath" ]; then - localNodeVersion=''$(node -v) - if [ "\''${localNodeVersion:1:2}" = "12" ]; then - echo PATCH: replacing ''$f with ''$localNodePath - rm ''$f - ln -s ''$localNodePath ''$f + # Use Node from nixpkgs for NixOS hosts + # + + serverDir="$HOME/.vscode-server/bin/$COMMIT_ID" + serverNode="$serverDir/node" + echo "VS Code Node: $serverNode" + + # Check if VS Code Server has a non-working Node or the wrong version of Node + if ! nodeVersion=$($serverNode -v) || [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "VS Code Node Version: $nodeVersion" + + if nix-build "" -A nodejs-${nodeVersion}_x --out-link "$serverDir/nix" && [ -e "$serverDir/nix/bin/node" ]; then + nodePath="$serverDir/nix/bin/node" + fi + + echo "Node from Nix: $nodePath" + + nodeVersion=$($nodePath -v) + echo "Node from Nix Version: $nodeVersion" + + if [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "Getting Node from Nix failed, use Local Node instead" + nodePath=$(which node) + echo "Local Node: $nodePath" + nodeVersion=$($nodePath -v) + echo "Local Node Version: $nodeVersion" + fi + + if [ "\''${nodeVersion:1:2}" == "${nodeVersion}" ]; then + echo PATCH: replacing $serverNode with $nodePath + ln -sf $nodePath $serverNode fi fi + + nodeVersion=$($serverNode -v) + echo "VS Code Node Version: $nodeVersion" + + if [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "Unsupported VS Code Node version: $nodeVersion", quitting + fail_with_exitcode ''${o.InstallExitCode.ServerTransferFailed} + fi + ${lib.optionalString useLocalExtensions '' # Use local extensions if [ -d $HOME/.vscode/extensions ]; then - if ! test -L "$HOME/.vscode-server/extensions"; then - mkdir -p $HOME/.vscode-server - ln -s $HOME/.vscode/extensions $HOME/.vscode-server/ + if [ -e $HOME/.vscode-server/extensions ]; then + mv $HOME/.vscode-server/extensions $HOME/.vscode-server/extensions.bak fi + + mkdir -p $HOME/.vscode-server + ln -s $HOME/.vscode/extensions $HOME/.vscode-server/extensions fi ''} + + # + # Start the server ''; in buildVscodeMarketplaceExtension { @@ -43,7 +84,7 @@ buildVscodeMarketplaceExtension { postPatch = '' substituteInPlace "out/extension.js" \ - --replace "# install extensions" '${patch}' + --replace '# Start the server\n' '${patch}' ''; meta = with lib; { diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix new file mode 100644 index 000000000000..32361b276b20 --- /dev/null +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, gtk3 +, gtk-layer-shell +}: + +buildGoModule rec { + pname = "nwg-dock"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-X2AhzQsgUWHkPp1YoAxcbq+Oni9C6Yrnyt+Plxya8OI="; + }; + + vendorSha256 = "sha256-5vGfWEBiC3ZJzVTHaOPbaaK/9+yg7Nj0mpbJbYpbY/A="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "GTK3-based dock for sway"; + homepage = "https://github.com/nwg-piotr/nwg-dock"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/applications/misc/wordbook/default.nix new file mode 100644 index 000000000000..757fed5265f2 --- /dev/null +++ b/pkgs/applications/misc/wordbook/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, python3 +, meson +, ninja +, pkg-config +, glib +, gtk4 +, libadwaita +, librsvg +, espeak-ng +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +python3.pkgs.buildPythonApplication rec { + pname = "wordbook"; + version = "unstable-2022-11-02"; + format = "other"; + + src = fetchFromGitHub { + owner = "fushinari"; + repo = "Wordbook"; + rev = "2d79e9e9ef21ba4b54d0b46c764a1481a06f0f1b"; + hash = "sha256-ktusZEQ7m8P0kiH09r3XC6q9bQCWVCn543IMLKmULDo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + wn + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + --prefix PATH ":" "${lib.makeBinPath [ espeak-ng ]}" + "''${gappsWrapperArgs[@]}" + ) + ''; + + meta = with lib; { + description = "Offline English-English dictionary application built for GNOME"; + homepage = "https://github.com/fushinari/Wordbook"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 3fce464f4447..e0908437803a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-Wwm9YN/gPsb4AU+JFUDrJQbuK5AEqzX5/D64/6tOtkw="; + sha256 = "sha256-u9VOkUaKQAdlXhCUUONBws4rW6PvxFSNXbit7gi6/P0="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 3eafadce114a..ed4c797fac47 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -2,7 +2,8 @@ , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT -} : +, withGui ? true +}: stdenv.mkDerivation rec { pname = "limesuite"; @@ -19,20 +20,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" - ]; + ] ++ lib.optional (!withGui) "-DENABLE_GUI=OFF"; buildInputs = [ libusb1 sqlite - wxGTK32 - fltk gnuplot libusb1 soapysdr - mesa_glu - libX11 ] ++ lib.optionals stdenv.isDarwin [ GLUT + ] ++ lib.optionals withGui [ + fltk + libX11 + mesa_glu + wxGTK32 ]; postInstall = '' diff --git a/pkgs/applications/science/biology/sratoolkit/default.nix b/pkgs/applications/science/biology/sratoolkit/default.nix new file mode 100644 index 000000000000..8a1bb5376eaf --- /dev/null +++ b/pkgs/applications/science/biology/sratoolkit/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, libidn +, zlib +, bzip2 +}: + + +let + libidn11 = libidn.overrideAttrs (old: { + pname = "libidn"; + version = "1.34"; + src = fetchurl { + url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + }); + +in + +stdenv.mkDerivation rec { + pname = "sratoolkit"; + version = "2.11.3"; + + src = fetchurl { + url = "https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/${version}/sratoolkit.${version}-ubuntu64.tar.gz"; + sha256 = "1590lc4cplxr3lhjqci8fjncy67imn2h14qd2l87chmhjh243qvx"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + libidn11 + zlib + bzip2 + stdenv.cc.cc.lib + ]; + + sourceRoot = "./sratoolkit.${version}-ubuntu64/bin"; + + installPhase = '' + find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \; + ''; + + meta = with lib; { + homepage = "https://github.com/ncbi/sra-tools"; + description = "The SRA Toolkit and SDK from NCBI is a collection of tools and libraries for using data in the INSDC Sequence Read Archives."; + license = licenses.publicDomain; + maintainers = with maintainers; [ thyol ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix index 7d3d1b6b2c69..dc9b251537ec 100644 --- a/pkgs/applications/version-management/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.3.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9Y4n8OWZMwGoCunqwWtkDeDvRcJ4aepw1vgMXFHkhx0="; + sha256 = "sha256-17uFV3pjklqVW5ofeR54mgMh+q3uUCdqZG00Cc+4zFQ="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index 6cfcb0077427..d9eaae3ecbca 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, perl, python2, gnuplot, coreutils, gnugrep }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, installShellFiles +, perl +, python3 +, gnuplot +, coreutils +, gnugrep +}: stdenv.mkDerivation rec { pname = "gitstats"; @@ -12,9 +22,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-qUQB3aCRbPkbMoMf39kPQ0vil8RjXL8RqjdTryfkzK0="; }; - nativeBuildInputs = [ perl ]; + patches = [ + # make gitstats compatible with python3 + # https://github.com/hoxu/gitstats/pull/105 + (fetchpatch { + name = "convert-gitstats-to-use-python3.patch"; + url = "https://github.com/hoxu/gitstats/commit/ca415668ce6b739ca9fefba6acd29c63b89f4211.patch"; + hash = "sha256-sgjoj8eQ5CxQBffmhqymsmXb8peuaSbfFoWciLK3LOo="; + }) + ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ installShellFiles perl ]; + + buildInputs = [ python3 ]; strictDeps = true; @@ -25,13 +45,15 @@ stdenv.mkDerivation rec { -i gitstats ''; - buildPhase = '' - make man VERSION="${version}" - ''; + makeFlags = [ + "PREFIX=$(out)" + "VERSION=${version}" + ]; - installPhase = '' - make install PREFIX="$out" VERSION="${version}" - install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1 + buildFlags = [ "man" ]; + + postInstall = '' + installManPage doc/gitstats.1 ''; meta = with lib; { @@ -39,6 +61,6 @@ stdenv.mkDerivation rec { description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix new file mode 100644 index 000000000000..2955dfb7c0c8 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, mpv-unwrapped }: + +stdenv.mkDerivation rec { + pname = "mpv-inhibit-gnome"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "Guldoman"; + repo = "mpv_inhibit_gnome"; + rev = "v${version}"; + hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus mpv-unwrapped ]; + + passthru.scriptName = "mpv_inhibit_gnome.so"; + + installPhase = '' + install -D ./lib/mpv_inhibit_gnome.so $out/share/mpv/scripts/mpv_inhibit_gnome.so + ''; + + meta = with lib; { + description = "This mpv plugin prevents screen blanking in GNOME"; + homepage = "https://github.com/Guldoman/mpv_inhibit_gnome"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/data/icons/nordzy-cursor-theme/default.nix index ee18fe287727..394626cec337 100644 --- a/pkgs/data/icons/nordzy-cursor-theme/default.nix +++ b/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -5,24 +5,18 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; - version = "0.1.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-cursors"; rev = "v${version}"; - sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw="; + sha256 = "sha256-q9PEEyxejRQ8UCwbqsfOCL7M70pLCOLyCx8gEFmZkWA="; }; installPhase = '' mkdir -p $out/share/icons - - cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors - mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme - mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors - cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors - mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme - mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors + cp -r Nordzy-cursors{,-white,-lefthand} $out/share/icons ''; meta = with lib; { diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index addd77288b7c..2d10795f24e7 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.1"; + version = "22.3.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-bk1yBxMrPkFnPcV5uvEmbf3X2WG6iJNbD1WNxoOSnA8="; + sha256 = "sha256-bn7Y+yre/9EkECMaYs2CR+OTZRG5pRd6LjnZD9jXvUM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/development/libraries/libax25/default.nix new file mode 100644 index 000000000000..7388a728f5f0 --- /dev/null +++ b/pkgs/development/libraries/libax25/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchurl +, glibc +}: + +stdenv.mkDerivation rec { + pname = "libax25"; + version = "0.0.12-rc5"; + + buildInputs = [ glibc ] ++ lib.optional stdenv.hostPlatform.isStatic [ glibc.static ]; + + # Due to recent unsolvable administrative domain problems with linux-ax25.org, + # the new domain is linux-ax25.in-berlin.de + src = fetchurl { + url = "https://linux-ax25.in-berlin.de/pub/ax25-lib/libax25-${version}.tar.gz"; + hash = "sha256-vxV5GVDOHr38N/512ArZpnZ+a7FTbXBNpoSJkc9DI98="; + }; + + configureFlags = [ "--sysconfdir=/etc" ]; + + LDFLAGS = lib.optionals stdenv.hostPlatform.isStatic [ "-static-libgcc" "-static" ]; + + meta = with lib; { + description = "AX.25 library for hamradio applications"; + homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 2704b357004c..e5e32526a1cb 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.24.0"; + version = "3.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ko/9gfcR7BBX+U60vlWgdh4d1xptUJRRyWmAGq6a4/E="; + hash = "sha256-d4FJCW0tTVgb+JTL386bYwmSlwEGAGSJAovsNs8kjaI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index af09d9327b21..8fd4e3d8fb82 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.1.0"; + version = "9.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+bMK8ubm5aEmwsgfNRRcWu5wwglV5t1AmRm+TRuHs0M="; + sha256 = "sha256-qnYodaJwr0kFfKyofVsDTmMLMYDexqGTz8uSefPWPfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix new file mode 100644 index 000000000000..21f0ec0d08c8 --- /dev/null +++ b/pkgs/development/python-modules/wn/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, flit-core +, requests +, tomli +}: + +buildPythonPackage rec { + pname = "wn"; + version = "0.9.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-TghCKPKLxRTpvojmZi8tPGmU/D2W+weZl64PArAwDCE="; + }; + + nativeBuildInputs = [ flit-core ]; + + propagatedBuildInputs = [ + requests + tomli + ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "wn" ]; + + meta = with lib; { + description = "A modern, interlingual wordnet interface for Python"; + homepage = "https://github.com/goodmami/wn"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/development/tools/analysis/svlint/Cargo.lock b/pkgs/development/tools/analysis/svlint/Cargo.lock new file mode 100644 index 000000000000..60378bcc0575 --- /dev/null +++ b/pkgs/development/tools/analysis/svlint/Cargo.lock @@ -0,0 +1,784 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "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 = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bytecount" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f861d9ce359f56dbcb6e0c2a1cb84e52ad732cadb57b806adeb3c7668caccbd8" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "enquote" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" +dependencies = [ + "thiserror", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom-greedyerror" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133e5024c0b65c4235e3200a3b6e30f3875475f1e452525e1a421b7f2a997c52" +dependencies = [ + "nom 5.1.2", + "nom 6.1.2", + "nom_locate 1.0.0", + "nom_locate 2.1.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-packrat" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5c5a5a7eae83c3c9d53bdfd94e8bb1d700c6bb78f00d25af71263fc07cf477b" +dependencies = [ + "nom-packrat-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-packrat-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fccdfb4771d14a08918cd7b7352de2797ade66a2df9920cee13793e943c3d09" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom-recursive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0de2967d4f9065b08596dcfa9be631abc4997951b9e0a93e2279b052370bacc" +dependencies = [ + "nom-recursive-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-recursive-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07744fc6b7423baf7198f9e1200305f27eafe7395289fa7462b63dacd4eac78d" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom-tracable" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128b58b88f084359e18858edde832830041e0a561d23bb214e656e00972de316" +dependencies = [ + "nom 6.1.2", + "nom-tracable-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-tracable-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8416fc5553b00d217b0381929fbce7368935d609afdee46c844e09f962b379e6" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom_locate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f932834fd8e391fc7710e2ba17e8f9f8645d846b55aa63207e17e110a1e1ce35" +dependencies = [ + "bytecount 0.3.2", + "memchr", + "nom 5.1.2", +] + +[[package]] +name = "nom_locate" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67484adf5711f94f2f28b653bf231bff8e438be33bf5b0f35935a0db4f618a2" +dependencies = [ + "bytecount 0.6.3", + "memchr", + "nom 5.1.2", +] + +[[package]] +name = "nom_locate" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4689294073dda8a54e484212171efdcb6b12b1908fd70c3dc3eec15b8833b06d" +dependencies = [ + "bytecount 0.6.3", + "memchr", + "nom 6.1.2", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "os_str_bytes" +version = "6.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" + +[[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.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[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 = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str-concat" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3468939e48401c4fe3cdf5e5cef50951c2808ed549d1467fde249f1fcb602634" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "sv-filelist-parser" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0f9e489371e30a263649576eb16c695084e37f7e6be2cb636422069a5208f8" +dependencies = [ + "regex", +] + +[[package]] +name = "sv-parser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172a5b3cb5516198bb3511c0f5b25c7f9911cd46189f4d07c8245d0488ad7c93" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "sv-parser-error", + "sv-parser-parser", + "sv-parser-pp", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-error" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d940ac5717eab14042763f6c67ef2c9e0bcf381b726694eb92c32b96c21b9f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "sv-parser-macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed5b1dbf2209da2f4aa7f623ad0e9a941844ec586b2c2ca9747a9a4de815065" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "sv-parser-parser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44acd0cd81361b2be53349e5e612b08e58f8e4175d1a3484b05828da53135adf" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "nom-packrat", + "nom-recursive", + "nom-tracable", + "nom_locate 3.0.2", + "str-concat", + "sv-parser-macros", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-pp" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7d2da3c2ace6950bc7d9d88f9bd5ddc37b85af9bd28f75eca511264c687953" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "sv-parser-error", + "sv-parser-parser", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-syntaxtree" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57964e3fb7332344b6d9e38919f4a417f9dc4ac44dcac15d1b6c3cd194b4bb61" +dependencies = [ + "regex", + "sv-parser-macros", + "walkdir", +] + +[[package]] +name = "svlint" +version = "0.6.0" +dependencies = [ + "anyhow", + "clap", + "colored", + "enquote", + "libloading", + "regex", + "serde", + "serde_derive", + "serde_regex", + "sv-filelist-parser", + "sv-parser", + "term", + "toml", + "walkdir", +] + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[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 = "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 = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index ef4e31e9481f..757eb56a3bf7 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-BgkzbKRcZkot3qkwPqSE9QkH3A3HNDuLjpFzKsU+Wb0="; + sha256 = "sha256-dtfOSj0WnNyQLimXkSK+L8pWL/oc0nIugDyUmGaBP3w="; }; - cargoSha256 = "sha256-HeFh8H7IN3m4HiEH1QbCBROslzVCzYxGIaeyM4K7gcs="; + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoSha256 = "sha256-A9cL5veliWDNp1RbhOzR1e2X7c7mTAnl1qMATaMhhT8="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 1a94a3791d62..3c87fe5d0148 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.90.0"; + version = "1.91.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-b6Tj1A2kF5dZ/dPSGAq9Bd0PB7zQ61RIKTKhFv422tw="; + sha256 = "sha256-hX9doUNxqkJujts9yYNvGSTq3nkaan1HqTHZBcO1hCs="; }; meta = with lib; { diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index b70801d0228e..177d838ff093 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JlxxfazVNJzQzG2p8L+5MoevSNNWf5mi14n3f/Q+MZU="; + sha256 = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; }; vendorSha256 = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 967c5541991c..6909c59a92b3 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,31 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core -, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem +{ lib +, stdenv +, fetchurl +, unzip +, cairo +, xorg +, gdk-pixbuf +, fontconfig +, pango +, gnome +, atk +, at-spi2-atk +, at-spi2-core +, gtk3 +, glib +, freetype +, dbus +, nss +, nspr +, alsa-lib +, cups +, expat +, udev +, makeDesktopItem +, libdrm +, libxkbcommon +, mesa +, makeWrapper }: let @@ -22,6 +48,9 @@ let udev at-spi2-atk at-spi2-core + libdrm + libxkbcommon + mesa xorg.libX11 xorg.libXcursor @@ -36,7 +65,8 @@ let xorg.libXrender xorg.libXScrnSaver ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "react-native-debugger"; version = "0.13.0"; src = fetchurl { @@ -44,7 +74,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-/uVXMVrVS7n4/mqz6IlKkk63hy67fn9KRjZ1wP5MHB0="; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' shopt -s extglob mkdir -p $out @@ -59,6 +89,9 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/lib \ $out/share/react-native-debugger + wrapProgram $out/share/react-native-debugger \ + --add-flags --no-sandbox + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 45e4a2b2e784..9c863e09efdd 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - sha256 = "sha256-RBaIF9vWQwQAdqN3p3JS1WO6u3IMxi8CuCkrwQbd2gI="; + sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-8sdCVOtPwIjW2x1yh1B0oybVi2kz3LQoK3OcaJvUsxQ="; + cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2d209ce6a18b..aee7406f9da9 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -340,6 +340,24 @@ in rec { }; }; + mode-indicator = mkTmuxPlugin rec { + pluginName = "mode-indicator"; + version = "unstable-2021-10-01"; + src = fetchFromGitHub { + owner = "MunifTanjim"; + repo = "tmux-mode-indicator"; + rev = "11520829210a34dc9c7e5be9dead152eaf3a4423"; + sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4="; + }; + meta = with lib; { + homepage = "https://github.com/MunifTanjim/tmux-mode-indicator"; + description = "Plugin that displays prompt indicating currently active Tmux mode"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ aacebedo ]; + }; + }; + net-speed = mkTmuxPlugin { pluginName = "net-speed"; version = "unstable-2018-12-02"; diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index ef3aa77278ca..81d36eb232fa 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -2,7 +2,7 @@ let buildMongoDB = callPackage ./mongodb.nix { - inherit sasl boost Security CoreFoundation cctools; + inherit sasl boost Security CoreFoundation cctools stdenv; }; in buildMongoDB { diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index f0039a509c15..7be4064dd7f3 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -121,14 +121,14 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," - '' + lib.optionalString (versionAtLeast version "4.4" && versionOlder version "4.6") '' + '' + lib.optionalString (versionAtLeast version "4.4") '' # Fix debug gcc 11 and clang 12 builds on Fedora # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include ' '#include #include ' substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include #include ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString (stdenv.isDarwin && versionOlder version "6.0") '' substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0 '' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") '' substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder @@ -197,9 +197,6 @@ in stdenv.mkDerivation rec { inherit license; maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; - platforms = subtractLists systems.doubles.i686 ( - if (versionAtLeast version "6.0") then systems.doubles.linux - else systems.doubles.unix - ); + platforms = subtractLists systems.doubles.i686 systems.doubles.unix; }; } diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 4953ac8592c2..e4f558c790b2 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-14_x, libsecret, xorg, ripgrep +, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-14_x; + nodejs = nodejs-16_x-openssl_1_1; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.69.2"; + version = "1.73.1"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "e2vEEZg2H37oFRN+0kZnWW5RU2ma2JJR66XLFDNEOXc="; + sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ="; }; yarnCache = stdenv.mkDerivation { @@ -56,16 +56,9 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-5wOR7rKzGLE8EAlGd4CkrFUsUOEJOdwuNWQzEdbAL+g="; + outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4="; }; - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - nativeBuildInputs = [ nodejs yarn' python3 pkg-config makeWrapper git jq moreutils ]; @@ -102,9 +95,9 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" - '' + lib.optionalString stdenv.isLinux '' + # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" + npm config set nodedir "${nodejs}" ''; buildPhase = '' diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 93eccb74eab0..dedd9daf675b 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, autoPatchelfHook +, buildNpmPackage , cmake , avahi , libevdev @@ -17,25 +19,53 @@ , libffi , libcap , mesa +, curl +, libva +, libvdpau +, numactl , cudaSupport ? false , cudaPackages ? {} }: stdenv.mkDerivation rec { pname = "sunshine"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-/eekvpjopCivb2FJqh5W1G54GznLwdjk8ANOosdfuxw="; + sha256 = "sha256-o489IPza1iLoe74Onn2grP5oeNy0ZYdrvBoMEWlbwCE="; fetchSubmodules = true; }; + # remove pre-built ffmpeg; use ffmpeg from nixpkgs + patches = [ ./ffmpeg.diff ]; + + # fetch node_modules needed for webui + ui = buildNpmPackage { + inherit src version; + pname = "sunshine-ui"; + sourceRoot = "source/src_assets/common/assets/web"; + npmDepsHash = "sha256-fg/turcpPMHUs6GBwSoJl4Pxua/lGfCA1RzT1R5q53M="; + + dontNpmBuild = true; + + # use generated package-lock.json upstream does not provide one + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + installPhase = '' + mkdir -p $out + cp -r node_modules $out/ + ''; + }; + nativeBuildInputs = [ cmake pkg-config + autoPatchelfHook ] ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ]; @@ -59,11 +89,22 @@ stdenv.mkDerivation rec { libevdev libcap libdrm + curl + libva + libvdpau + numactl mesa ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ]; + runtimeDependencies = [ + avahi + mesa + xorg.libXrandr + libxcb + ]; + CXXFLAGS = [ "-Wno-format-security" ]; @@ -72,18 +113,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-D" "FFMPEG_LIBRARIES=${ffmpeg-full}/lib" - "-D" "FFMPEG_INCLUDE_DIRS=${ffmpeg-full}/include" - "-D" "LIBAVCODEC_INCLUDE_DIR=${ffmpeg-full}/include" - "-D" "LIBAVCODEC_LIBRARIES=${ffmpeg-full}/lib/libavcodec.so" - "-D" "LIBAVDEVICE_INCLUDE_DIR=${ffmpeg-full}/include" - "-D" "LIBAVDEVICE_LIBRARIES=${ffmpeg-full}/lib/libavdevice.so" - "-D" "LIBAVFORMAT_INCLUDE_DIR=${ffmpeg-full}/include" - "-D" "LIBAVFORMAT_LIBRARIES=${ffmpeg-full}/lib/libavformat.so" - "-D" "LIBAVUTIL_INCLUDE_DIR=${ffmpeg-full}/include" - "-D" "LIBAVUTIL_LIBRARIES=${ffmpeg-full}/lib/libavutil.so" - "-D" "LIBSWSCALE_LIBRARIES=${ffmpeg-full}/lib/libswscale.so" - "-D" "LIBSWSCALE_INCLUDE_DIR=${ffmpeg-full}/include" + "-Wno-dev" ]; postPatch = '' @@ -91,20 +121,17 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace 'set(Boost_USE_STATIC_LIBS ON)' '# set(Boost_USE_STATIC_LIBS ON)' \ --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' + ''; - # fix libgbm path - substituteInPlace src/platform/linux/graphics.cpp \ - --replace 'handle = dyn::handle({ "libgbm.so.1", "libgbm.so" });' 'handle = dyn::handle({ "${mesa}/lib/libgbm.so.1", "${mesa}/lib/libgbm.so" });' - - # fix avahi path - substituteInPlace src/platform/linux/publish.cpp \ - --replace 'handle = dyn::handle({ "libavahi-client.so.3", "libavahi-client.so" });' 'handle = dyn::handle({ "${avahi}/lib/libavahi-client.so.3", "${avahi}/lib/libavahi-client.so" });' \ - --replace 'handle = dyn::handle({ "libavahi-common.so.3", "libavahi-common.so" });' 'handle = dyn::handle({ "${avahi}/lib/libavahi-common.so.3", "${avahi}/lib/libavahi-common.so" });' + preBuild = '' + # copy node_modules where they can be picked up by build + mkdir -p ../src_assets/common/assets/web/node_modules + cp -r ${ui}/node_modules/* ../src_assets/common/assets/web/node_modules ''; meta = with lib; { description = "Sunshine is a Game stream host for Moonlight."; - homepage = "https://docs.lizardbyte.dev/projects/sunshine/"; + homepage = "https://github.com/LizardByte/Sunshine"; license = licenses.gpl3Only; maintainers = with maintainers; [ devusb ]; platforms = platforms.linux; diff --git a/pkgs/servers/sunshine/ffmpeg.diff b/pkgs/servers/sunshine/ffmpeg.diff new file mode 100644 index 000000000000..66fd6c9c15dd --- /dev/null +++ b/pkgs/servers/sunshine/ffmpeg.diff @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fad60ef..64b68ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,6 +212,8 @@ else() + set(WAYLAND_FOUND OFF) + endif() + ++ find_package(FFMPEG REQUIRED) ++ + if(X11_FOUND) + add_compile_definitions(SUNSHINE_BUILD_X11) + include_directories(${X11_INCLUDE_DIR}) +@@ -372,35 +374,6 @@ set(SUNSHINE_TARGET_FILES + + set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic) + +-# Pre-compiled binaries +-if(WIN32) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") +- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid) +-elseif(APPLE) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") +-else() +- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") +- else() +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") +- endif() +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) +-endif() +-set(FFMPEG_INCLUDE_DIRS +- ${FFMPEG_PREPARED_BINARIES}/include) +-if(EXISTS ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) +- set(HDR10_PLUS_LIBRARY +- ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) +-endif() +-set(FFMPEG_LIBRARIES +- ${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libx264.a +- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a +- ${HDR10_PLUS_LIBRARY} +- ${FFMPEG_PLATFORM_LIBRARIES}) +- + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/third-party diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/servers/sunshine/package-lock.json new file mode 100644 index 000000000000..34102859f3e5 --- /dev/null +++ b/pkgs/servers/sunshine/package-lock.json @@ -0,0 +1,74 @@ +{ + "name": "web", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "@fortawesome/fontawesome-free": "6.2.0", + "bootstrap": "5.0.0", + "vue": "2.6.12" + } + }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", + "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, + "node_modules/bootstrap": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", + "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, + "peerDependencies": { + "@popperjs/core": "^2.9.2" + } + }, + "node_modules/vue": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz", + "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==" + } + }, + "dependencies": { + "@fortawesome/fontawesome-free": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", + "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==" + }, + "@popperjs/core": { + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true + }, + "bootstrap": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", + "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", + "requires": {} + }, + "vue": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz", + "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==" + } + } +} diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix index ecd8ecbc9ae8..ee5d4fd8456f 100644 --- a/pkgs/tools/cd-dvd/bootiso/default.nix +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , bash , makeWrapper , bc @@ -25,16 +26,28 @@ stdenvNoCC.mkDerivation rec { sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i"; }; + patches = [ + (fetchpatch { + url = "https://code.opensuse.org/package/bootiso/raw/3799710e3da40c1b429ea1a2ce3896d18d08a5c5/f/syslinux-lib-root.patch"; + sha256 = "sha256-x2EJppQsPPymSrjRwEy7mylW+2OKcGzKsKF3y7fzrB8="; + }) + ]; + strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "prefix=${placeholder "out"}" ]; + postPatch = '' + substituteInPlace bootiso \ + --replace "\$(basename \"\$0\")" "bootiso" \ + --replace "/usr/share/syslinux" "${syslinux}/share/syslinux" + ''; + postInstall = '' wrapProgram $out/bin/bootiso \ --prefix PATH : ${lib.makeBinPath [ bc jq coreutils util-linux wimlib file syslinux gnugrep busybox ]} \ - --prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux ''; meta = with lib; { diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index add13870148c..aa66b0326073 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.16.2"; + version = "1.17.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5R5pGCn4CJU2kGPiu6PpUBxr0/02hOwN1ikns2pvGA0="; + sha256 = "sha256-cDB4gkogjW8+lHyzA84aKogIT8hvySqVqnXTb9ohCHE="; }; - cargoHash = "sha256-0d7EMWc/PU9kDgfTVc1SWYYym9UEULwR1X3qIW+zvjM="; + cargoHash = "sha256-M3YLgRG3UEluGapqWpIsPgHPp288DlCNV79tajPIsMc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 858c114f68c8..343713c02255 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,23 +1,32 @@ {lib, stdenv, fetchurl, xz, dpkg -, libxslt, docbook_xsl, makeWrapper +, libxslt, docbook_xsl, makeWrapper, writeShellScript , python3Packages -, perlPackages, curl, gnupg, diffutils +, perlPackages, curl, gnupg, diffutils, nano, pkg-config, bash-completion, help2man , sendmailPath ? "/run/wrappers/bin/sendmail" }: let inherit (python3Packages) python setuptools; + sensible-editor = writeShellScript "sensible-editor" '' + exec ''${EDITOR-${nano}/bin/nano} "$@" + ''; in stdenv.mkDerivation rec { - version = "2.16.8"; + version = "2.22.2"; pname = "debian-devscripts"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; + hash = "sha256-Fflalt2JxqLS0gq0wy88pXCqiNvHj7sfP7fLwdSmUCs="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ + postPatch = '' + substituteInPlace scripts/Makefile --replace /usr/share/dpkg ${dpkg}/share/dpkg + substituteInPlace scripts/debrebuild.pl --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + patchShebangs scripts + ''; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils bash-completion help2man ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); preConfigure = '' @@ -31,6 +40,7 @@ in stdenv.mkDerivation rec { -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ + -e "s@sensible-editor@${sensible-editor}@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile sed -r \ @@ -53,7 +63,7 @@ in stdenv.mkDerivation rec { wrapProgram "$i" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PERL5LIB : "$out/share/devscripts" \ - --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \ + --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --prefix PATH : "${dpkg}/bin" done ''; diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/tools/text/pomsky/default.nix new file mode 100644 index 000000000000..0bd2a2bff7e7 --- /dev/null +++ b/pkgs/tools/text/pomsky/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "pomsky"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "rulex-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "1bb28f80wxjpy23mp9zamkprl8xbnx99rmmn8nxcaapq360zv9yi"; + }; + + cargoSha256 = "sha256-Io8Ar7eNgULBIzI0rlitMI+9hLLWzI8pFwmH38hVVYU="; + + meta = with lib; { + description = "A portable, modern regular expression language"; + homepage = "https://pomsky-lang.org"; + changelog = "https://github.com/rulex-rs/pomsky/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b8e09e87539..bdbc3f6410eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10778,6 +10778,8 @@ with pkgs; polypane = callPackage ../applications/networking/browsers/polypane { }; + pomsky = callPackage ../tools/text/pomsky { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -16515,6 +16517,8 @@ with pkgs; srandrd = callPackage ../tools/X11/srandrd { }; + sratoolkit = callPackage ../applications/science/biology/sratoolkit { }; + srecord = callPackage ../development/tools/misc/srecord { }; srelay = callPackage ../tools/networking/srelay { }; @@ -24450,11 +24454,18 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix { + mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix { sasl = cyrus_sasl; boost = boost178.override { enableShared = false; }; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + stdenv = if stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv.override (old: { + hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; }; + buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; }; + targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; }; + }) else + if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; nginx-sso = callPackage ../servers/nginx-sso { }; @@ -25444,6 +25455,8 @@ with pkgs; libatasmart = callPackage ../os-specific/linux/libatasmart { }; + libax25 = callPackage ../development/libraries/libax25 { }; + libcgroup = callPackage ../os-specific/linux/libcgroup { }; libkrun = callPackage ../development/libraries/libkrun { @@ -30858,6 +30871,7 @@ with pkgs; mpvScripts = recurseIntoAttrs { autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; + inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix {}; mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; @@ -30962,6 +30976,8 @@ with pkgs; nwg-bar = callPackage ../applications/misc/nwg-bar { }; + nwg-dock = callPackage ../applications/misc/nwg-dock { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; @@ -33276,6 +33292,8 @@ with pkgs; cl-wordle = callPackage ../games/cl-wordle { }; + wordbook = callPackage ../applications/misc/wordbook { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f185b18634d..e51082db63f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12034,6 +12034,8 @@ self: super: with self; { wled = callPackage ../development/python-modules/wled { }; + wn = callPackage ../development/python-modules/wn { }; + woob = callPackage ../development/python-modules/woob { }; woodblock = callPackage ../development/python-modules/woodblock { };