diff options
Diffstat (limited to 'pkgs')
60 files changed, 721 insertions, 711 deletions
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index d8167f6098791..42a1b730fe15f 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config +{ lib, stdenv, fetchurl, callPackage, ncurses, bash, gawk, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -18,9 +18,11 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; nativeBuildInputs = [ gettext pkg-config ]; - buildInputs = [ ncurses ] + buildInputs = [ ncurses bash gawk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + strictDeps = true; + configureFlags = [ "--enable-multibyte" "--enable-nls" @@ -36,6 +38,13 @@ stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ]; + # which.sh is used to for vim's own shebang patching, so make it find + # binaries for the host platform. + preConfigure = '' + export HOST_PATH + substituteInPlace src/which.sh --replace '$PATH' '$HOST_PATH' + ''; + postInstall = '' ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b11d09063f8a9..f96dba825a6c5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-06-08"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "005a0377c95fe521a65a90af26aadb46085871c8"; - sha256 = "1yn541cn5m0jmwwhiygqlds9hvxsm9w6x70r24ig3nj2p9q41px3"; + rev = "7561d31e5e668333d7e453c063ded5a2805f0e41"; + sha256 = "0850akn3ik044dnz53d2ikdgw8b7yk6vhy58a346ac9cq1damz7r"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "d66173b58abe941966e0e4666e54963c7a2d7dc9"; - sha256 = "1cfz9xj5498n3mpw2f4fk0gxdp92d697dp7mm5vnz78h17p4px6y"; + rev = "b7e45f2b1db2bb7b1ec8d9713607c3579f43207c"; + sha256 = "12wkzf821fglinwacs2va28my5s8bf0xs9xzxifvcvbf5kp7k55x"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-04-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "3ededaed2f9923d50bf3860ba8dace0f7d2724cd"; - sha256 = "1n2h5wsp9vclsvzr40m1ffb6kjmcg0mccfj790giw77qa2i9s1rl"; + rev = "4237c4647ec30215223d597f6172c8c46b8b239e"; + sha256 = "17krclvg5y645g9vk43bpmhg1pzf4m8dlif5ar5h92qvbih8sw7i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-06-05"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "2084c3ce26aba0aea0a450b35c5971b48f277574"; - sha256 = "0p9rsgk6ynikhic8r9iy5i5rklg4dmri0yrm4gslmrp2bdmn111k"; + rev = "dd35fd75c480da0e0239d69a607aac1347c395c6"; + sha256 = "02mqp20vc5jjrf8d1padldnp3fdks0wjanwd22zr56y8zphcaxvc"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -546,12 +546,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-06-08"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f10349b48b173d50b523ce009934bb4bfba04f7f"; - sha256 = "1s6ba5h0cv8y80x2nv9m98q724xv242nqzgxxh7bniakzp3jm4j4"; + rev = "91e8422d6d67f1b1139b57b8707945ea2531443e"; + sha256 = "1fwvxs7ifshdpvzkfqld66cdlhvbrp76bpm603w1qaskm88fj2pf"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -570,12 +570,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-04-22"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "4781fcfea5ddc1a92d41b32dc325132ed6fce7a8"; - sha256 = "03i75403lskpgaqv7xp5hk4v6kqb0sv15ciil9jyj735ylhry3qq"; + rev = "ef27a59e5b4d7b1c2fe1950da3fe5b1c5f3b4c94"; + sha256 = "0w4864v6lgyzjckrsim8si9d6g7w979n81y96hx2h840xgcj22iw"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -678,12 +678,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-03-08"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; - sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; + rev = "aa8a99e87e64276d52556f4d9d4f4a19afd37556"; + sha256 = "0r79iq6fl4rcpadwvwma70gxk57lri15bqb5p12xad67fxd40320"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -714,12 +714,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-06-09"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "0b16a5f1f0da15c4808fafbad5a1024140a598c7"; - sha256 = "0gfkvfpj97ijw9rbhy80hq3ly10c4zah4l5zzsw4xpnjwcx9gnxg"; + rev = "b19bbfe041c67f3f1144e4c88a1d88a7314bfa5b"; + sha256 = "0ha9b3612i42ldjkq4ip00pbwr7za5bfjrph745c4xdy5dhbx2m5"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -750,12 +750,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-05-06"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac"; - sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30"; + rev = "2c0103eb26b41cf4b58c3063d7549746d0f5fa73"; + sha256 = "0m93a89as399bj29mw8nnx0s9bn3kmy74bys97hv4r1n5nc720fy"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-06-05"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "a6a6209d1f2f599553741bbb02ce940fe8a5661b"; - sha256 = "17851pqs1hr6vv86n2c7jz08xq0zm0iw9kbs393mfid2839clck9"; + rev = "d7123f0368aa7fdd10f587176ad60aedcdfa44de"; + sha256 = "1mqhhfaqd07ck0m6izqrf97a1vlkjcwvmjz5c5z2xssjlmcrx8pg"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -930,12 +930,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-06-05"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c78b3ecf9539a719828bca82fc7ddb9b3ba0c353"; - sha256 = "03sf49s26nb9aqr16f776p58vs3dx9kyyach2jj4k1lp318w6ikp"; + rev = "88c742f4af988c98aee5ac1c92f056905c636aae"; + sha256 = "1nlxsg2nzkpxwj5jiwksg1hqp25g6hzj075zjvxbix72xdiv98lq"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1098,12 +1098,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-05-09"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0"; - sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg"; + rev = "62fc67a2b0205136bc3e312664624ba2ab4a9323"; + sha256 = "0wcys2z1yw6raxr9x5nm19ac04q8gfri4pw9mfsh18smv4rnl8zs"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -1194,12 +1194,12 @@ final: prev: cmp-dap = buildVimPluginFrom2Nix { pname = "cmp-dap"; - version = "2022-04-27"; + version = "2022-06-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "cmp-dap"; - rev = "69f22863739482120f9240919db1ac7d4dea3278"; - sha256 = "03cxmnbr4sn69dzg1fg4r7rgja4invzfgpid123mhahq6sn7jir9"; + rev = "2c4cecbb9c4d255acc87ccaca727d1ad2f2b8c90"; + sha256 = "11wg62nf37ka40l9acwxcklzghapwiw3x549vnp397sl70r3w6b2"; }; meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; @@ -1302,12 +1302,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2021-09-10"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "29dc9e53d17cd1f26605888f85500c8ba79cebff"; - sha256 = "17qjw0yp0cmgyjy593qq6rfh7fgfwgb7mxg7a0kg1drjpncwv8gl"; + rev = "46e7627afa8c8ff57158d1c29d721d8efebbc39f"; + sha256 = "10354d12in7sr5hdamj0cw8hgja6pwl70i9lcxlnha5jzkx8xm03"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1374,12 +1374,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-03-29"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "8014f6d120f72fe0a135025c4d41e3fe41fd411b"; - sha256 = "1k61aw9mp012h625jqrf311vnsm2rg27k08lxa4nv8kp6nk7il29"; + rev = "007dd2740d9b70f2688db01a39d6d25b7169cd57"; + sha256 = "194i2b6qbl3z4j2p2s6sig2fac8i9kglkdwdc5h3x2q7avw70yrg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1638,24 +1638,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-11-11"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "60828294b9ba846c78893389d4772021043d2fa1"; - sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m"; + rev = "44bcdc4c62a773a52f0a09cff074e61890870b59"; + sha256 = "1d0ryxqs6jx2vm5db6ca2aciqsl0559clbskif4kjp3j7ybnz9my"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-06-09"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "aa49b7ff2c7aa75aaa538479b552297e38952b38"; - sha256 = "0m0c8rg7lpaf6kpjaw9qxkrd4jj4n4kzxnmxksgww3s2hmnj8x5w"; + rev = "e956ff8a94bc73f5a315f0b103b7202fccedd848"; + sha256 = "0s7jq8xfvb8g24gpzc3s9wcy91l2fs1hl8h7kz79r4mljmqppzs8"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1710,12 +1710,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-06-05"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "b4d732a29b66c75e6d130cab296cc604a2d73bc4"; - sha256 = "08k7p189xh5rwyl9fjfmcg6z3yz6xmlyfpdf3a69vcvnixqg9ww6"; + rev = "87e5dd692ec8ed7be25b15449fd0ab15a48bfb30"; + sha256 = "17a7vg7yb1qxzz4a4b0bwqrh3mv1y31233xd1wihw81a0jzc5jkf"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1782,12 +1782,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-05-28"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "d554468ebee92c42adbbd1c6bf380eb668bd06d3"; - sha256 = "0npnj71jnk2vvsp56vvmh3vjfxqklxdg4fn585ikgygv53fndszq"; + rev = "81dba1e2741686514f466701ca62ce3831d49a08"; + sha256 = "0mmvdhxzj8nv38nw1vddzzg7xkair72x7lwk4lkd369yc3bbwv6g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -1795,12 +1795,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-06-07"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "3c69bab36569d5d0321351ec956fc43a8d409fb0"; - sha256 = "0wfhj4i1ycwsdmpkk9jcfmq141mqlf40sl4ymqd0zqrwzb8yz5m5"; + rev = "2c26a00f32b190390b664e56e32fd5347613b9e2"; + sha256 = "1ii8vjmi73i7vq9w3g13b5m0g5z0sivivkr4mav831yq7qbxvgm2"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1963,36 +1963,36 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-06-07"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "aa9e451dda857c6615f531f8d4e4f201e43d7a03"; - sha256 = "1i272gzvm4psqynw7pqyb00zlmx9q0r8z9l5iswy6kjwgvzz9298"; + rev = "c2e75a3a7519c126c6fdb35984976df9ae13f564"; + sha256 = "0m65y0pvc7sdj2xc3r97nb5md1i0iqcyri6h83hvs88skrmwnpap"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "8303d9265567a10a57ee88ab674de77ca6661075"; - sha256 = "06jmbqrszb5n3lsjfk2q0fz7gyx9g3zb7ivrj4wprdnnws7nyl0a"; + rev = "78d1c7e607ee8aa417c989f1c811ac73ee5dab9c"; + sha256 = "128ajrr8zj3mpimvapn0i1g34sp42wammh83gkhvf8xrfrwbd1l1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "7920ea2527f12620701c08c48e1f668e2ccd37b7"; - sha256 = "1xb590xs4n9gkrslb9v9apw7h3x3w48s6c6kkzphdabys2i9sdd4"; + rev = "3c17b7a8806e809e1707774cf56a459dc914e309"; + sha256 = "136lizq5hvvq99n23gjsjnhv8q3kkjx70axasva49abpjnbpaxms"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2011,12 +2011,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "fc168d99aeade7c3529b8883c12fdec17aad0f7c"; - sha256 = "02p72z384xk08a2hw8byasnxvl865wxngj08s7zp07cv2vzf3hw0"; + rev = "83a03e23da4bc52b8cf2fa13bcace18c192a32f8"; + sha256 = "0dz24pk9dr4wmm58iyvhr3iwcbv6pvwc04s3gmp26hzds37phws2"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2155,12 +2155,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-05-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "a36b3232c98616149784f2ca2654e77caea7a522"; - sha256 = "0106jhw9fg2zmk0fqnr126f9gnh5bw7sjrxldn06ajj15ll15p9p"; + rev = "6f5cb262141f41d4c603cc987cdb64bf1ea3b216"; + sha256 = "12lv8kwlb6bmk4bbp6vnym4w6ivasp3k9xgyhcm752wbf56zgzqy"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2529,12 +2529,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "ca297a7e526b42b1ea0e4bd6eebb36f2654125a7"; - sha256 = "1vr7yx7i863brmpbayxc7k9z14ai0naa030ck43cknib1bdilpkp"; + rev = "2e77bedfe11f52621fad1d8c20ffbddd8e36d137"; + sha256 = "0661163vkaqnsy49ha0vgx0wjy71zwi14j80q58mfgvmacc31zj9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2589,24 +2589,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-06-04"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2c7c3a1bfbd7ce1a62ef61e6cfdcdb9e8c04d1f0"; - sha256 = "0g3az80iisdbk5w6yqhpw8ws5jh82hzqwq8y6808n3f0ki1b5mz9"; + rev = "91ce1f39311ad74c1e3bcad1e78efcd4fa3bceaa"; + sha256 = "0gjqyvp8xfndgh6yljgm1cfvkgcayjxh07ljq14yijhmg86q00x2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-01-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "a8e3e66deefb6122f476c27cee505aaae93f7109"; - sha256 = "19k6nii3p6a4vfyf7xxrkhj7wfamjivdp22bn1mhx4zcw8h01lkn"; + rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9"; + sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2675,12 +2675,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "eca7c8c196215f687319295c81e6ba1d4e2f53a4"; - sha256 = "10jfag6ngarq2gnwlz4w7b0ckm9j899lppznz4sbrhisv35l4mjf"; + rev = "65ea4a8325d5d4f09bb76ddec7f2148314067eee"; + sha256 = "1ma7iq103k4gij070wi0wa2s9c92vxrg0nkmslryvc2l8rwqc4id"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2759,36 +2759,36 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-06-05"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "7ba49dd915c32ede51a6f6db3c4367748707a156"; - sha256 = "042kdnki0k6fyp951r054wlwdfm3a2wm4m4q6as9x8dikb80yn00"; + rev = "951a05d3f6ebc785db728ccfdf1759a2cf7c15ff"; + sha256 = "1d0g3cylci2ph7crmw888jjjpindbmab5h4z9y7qsvl5633aclk4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2022-04-17"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "35757c7c9364d940efd8a46877acde04193819c2"; - sha256 = "0b8y7qailjg2366dw03pbfsr7lq9js8jzfcpw8ljyfim94fcj650"; + rev = "3d064304876941e4197db6b4264db6b72bd9f83d"; + sha256 = "1lkznmavw2f4ckh3yjjvdhja313ia0aayn5pkf6ygjny1089gcih"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-05-20"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "37d536bbbee47222ddfeca0e8186e8ee6884f9a2"; - sha256 = "1y0b1x2kl7dmc6kzg1pi1rb16kx8ggi5ybfli1y38hw398h9z7fi"; + rev = "46d1110435f1f023c22fa95bb10b3906aecd7bde"; + sha256 = "0v0jnzj288swbp0w8xa7287sbql1rfgziqdk1gbcgvzs7zlvczbr"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2856,12 +2856,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-06-08"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "bd6cd6744528425cead90d796ad7a96ae4d58b33"; - sha256 = "0b3fzsppilpjc33ql4b7rbxvh2ip5kbyhjvqmfmg0kvyvx8d2m3w"; + rev = "b17546f502c23447f462340ee126b1ce0023e943"; + sha256 = "1y8xgdflp0gpq97an6ichf5sl8w75hq363x697z3fdryfsa1ldfq"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -2988,24 +2988,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-05-16"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "0694c278f081958e48f3a6e136c130d15cf8576e"; - sha256 = "03bg2ld2sh08zarjn5h4c4ypnr51k03qxpj8rk13vm6f6zfg9dnj"; + rev = "f19d6902dfdecb3150a9dbe153599524ae080dd8"; + sha256 = "0rii15z51gz97vc688w5si0jb9vdnzq8vvz3yx52rghm535yv46y"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "343322108d2458994f64af3396efccd4875326b5"; - sha256 = "0lq9dk2iglphjn8n8ai70spyz63cin987mnjn8415g258nyfis8x"; + rev = "6a4392564b818061731c6a39fcc116ff9fc97dd0"; + sha256 = "02pidn8w9gkglmsmjqy8lp8wq0s91rxpj96bgpwq6f09hci8mazg"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3096,12 +3096,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-05-17"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "801570e3903b0aea86c7fcba44f680cc62dad077"; - sha256 = "09xxzs7bixli5jmbxnigsbwafvz83k63v56drm7lpvvfhl39lbwf"; + rev = "1bb73289929107309d2d90f7582ece5e9436bfd8"; + sha256 = "02ybfv5pm7m8mbciccz0j9k21bjhf6kjpp527y6m4r2mdc4q808r"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3154,14 +3154,14 @@ final: prev: meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; - gitsigns-nvim = buildVimPluginFrom2Nix { + gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-05-26"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "27aeb2e715c32cbb99aa0b326b31739464b61644"; - sha256 = "04m1767cndrx46xsa6frf77xv64hmr6w21dk2wh4s0sqjvqqm1r6"; + rev = "3543443eb3856fbe4a9d70f3fe8dc73e007199a1"; + sha256 = "00mrf5qwbzgh280lq2lc7xgqmgh8g18j2f46796lbwpcb4ciawh4"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3192,12 +3192,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-06-06"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "ef86fff7371974fd69aab1fd926bafb76893bb1b"; - sha256 = "03i21lrcqi53swbjwfmh21fbwxw3nxb9rcislzys5078j86wicvn"; + rev = "900042f7dda528cb980b7f1056ed7c21d4402826"; + sha256 = "05dhbxclnn5fz9wapa6gvf7p9qk88ir6ix72sahv0vpjcccr6gk6"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3300,24 +3300,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-06-02"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "8aba3586fdefbdad3f758e24799245b799ae5a6f"; - sha256 = "03hkgzirnjahi44xwbzmpcbzpj4lgydq07wva32cyyrv3h8qplar"; + rev = "5d2cec690bfa56b863a7b9d482152d873da7ba7a"; + sha256 = "0rhhxmpjml0w9rmvph1wn70yrybnai4w71x35gn8ig6dn446q4wb"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-06-06"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "8135da3a90b257a2c902614e71d9cbbef8308cad"; - sha256 = "1mcyamqxnbhqdg2skkyz6g229qa08a8c0ssbcjsbcy92d4qyx852"; + rev = "3352c12c083d0ab6285a9738b7679e24e7602411"; + sha256 = "044dvp03yw5r745qbs6kp2lni1psfn63807dsd6fw8k2z6m6sbx3"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3336,12 +3336,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv.vim"; - version = "2021-10-19"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "386d770e916dd680d1d622e715b9eb3a77f21bd1"; - sha256 = "184kvydzz9nyg0sv3crn38v04s24km0ma8vfg4i3agmffb1riibk"; + rev = "1507838ee67f9b298def89cbfc404a0fee4a4b8c"; + sha256 = "0fkwhyywjhh2r6c8534kvfn3shv3rjvcc53wm2pz3yqk73b6r2c9"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -3408,11 +3408,11 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-03-13"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "7bd3ffb073dde94c8d86c1b49c47ef9d2f2bc605"; + rev = "d6d3ebe931529681c99aff18bc4d4c2487867e06"; sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; @@ -3432,24 +3432,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "03675eba34d416dd22ad49b2d0e52b6113b434ad"; - sha256 = "1aaniq2qd59n126v6j11gsl39c9h7nq0x2hidwpdz81yhas97ix2"; + rev = "a3cf6684bcb9fc974609ae81424f285f05280d90"; + sha256 = "0inrri38bkxsi936z2xa8n9lvzm9b7vl2wajyp8i6wr4byhprml3"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-05-31"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "21258d4194a606d8d53bf68d06cc25457b2e8449"; - sha256 = "0ily343jzx9ra2mxp1flmshsl5bara0wx10fgyrrps1cfag383jm"; + rev = "104aa65f9155d34629c9623d5dac39b5b2ad555c"; + sha256 = "0m0w69mmy471c2axr8n15c8spd7w8zdb0ri2cnf571kpmb68szxr"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-06-09"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "7821524b7fefb02af8b8e4c4745532b039ebc8de"; - sha256 = "1nvx2b4qr55dxr9nf641flp7adcad3zp3dlwrb1zc7ay9m5ylg2w"; + rev = "969f2c5c90457612c09cf2a13fee1adaa986d350"; + sha256 = "10nlz4hq1bqjsnj9pkadi3xjj74wn36f2vr66hqp7wm2z7i5zbq3"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3733,12 +3733,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-05-19"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "a6db77965a27ca893ea693d69cc3c152c000a627"; - sha256 = "1asq6a2mia695gmwa81ix4ijna8p9z8mifnqksnlk1kslz68bmdp"; + rev = "76df2251e813fdec244b2b593be62accea930119"; + sha256 = "0cnrnf44gm51jpmkf8kx9zfk6qxcg7725aav31n2w81zm1rr8d2s"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3805,24 +3805,24 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-05-10"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a"; - sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm"; + rev = "9c73fd69a4c1cb3b3fc35b741ac968e331642600"; + sha256 = "0mij8mrh7fmynhz7d3i11bbsvykf2pdp3ldk8w0sbi15cgfp8fr4"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-05-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "2be99e3fa33ab24beb035ed46c51b353fc373cd5"; - sha256 = "0235cc6wcir4qgv9yksrj3ycd3w44w2gkb1zn0yljd5ygi3xp2mz"; + rev = "9abfeae95ae8f51a21e384b97e006f139aeb4333"; + sha256 = "0lcxjr3n5g55i5brw0skvy9m1kp64wggah5j97mcl0r9x4h508lv"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3865,12 +3865,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-06-09"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "905c14e9b701cea1f05db755398ef0060f2c1fcc"; - sha256 = "0bv7fnbb4505ckfbd37h9gl1ss2jgargcf14b6kcx620xcw2adnn"; + rev = "f06d2fa627c66689ec0ef68fe95765f0af0ded88"; + sha256 = "00d27f9h4s83c1bsqskv48fhcyd2yf1fn7bpzqgqipbdsj7n04hn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3973,12 +3973,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-05-13"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c5b93fc1d76a708cb698417326e04f4786a38d90"; - sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm"; + rev = "8fb5ebb2c18db13bc17556376526068dce0803b5"; + sha256 = "1mrj4x0bd68qp2g4hsmxnqr1dfv5d7c2kajkir8q78pq2csdci8j"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -4045,12 +4045,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-05-21"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "92aa9f0f1fcda8cf1bca9f5ea296c4af74ba3928"; - sha256 = "1j9sgsia0w8cmkhd1qm59f0d2abh7rxwkl0nlsqcg9b1k0naqiay"; + rev = "3d3447816beea47ba93753afa7b717f5deb8a26c"; + sha256 = "0p4wp53lpm9awkbf6cwzxzxjbvqf5r272hlygbiwhv048lbz26xk"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -4140,24 +4140,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-05-26"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "9ccee20602a10843e3ea3ebc2536dfdcc6cee9a3"; - sha256 = "1l5naxm1mx8l3xwiqrm60w0avsbhhpxnbr4sgqpnmigb9p2150ip"; + rev = "49837977e210959c552bf357dc40ce18fadca501"; + sha256 = "07rywxx31wqxnw8i4irl2mq8di5dwj12bv0vqwi80vxhpvjqn1jk"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspcontainers-nvim = buildVimPluginFrom2Nix { pname = "lspcontainers.nvim"; - version = "2022-05-30"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "3c9d2156a447eb111ec60f4358768eb7510c5d0d"; - sha256 = "043ylgpzl1ahcf62s6m0y65ddwlxcw79qksqr2304c4vhzv5sv8w"; + rev = "ed5ee65f7c71a7963b18cfd1644134f1a65b3d4b"; + sha256 = "01sh8jawp8k73l17zvs374pmciyjqqgll89bb228jls9vhqvwkdr"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -4176,12 +4176,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-06-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "e4beaeff66ae4f70d0b67fe045b70d78780bb947"; - sha256 = "1in3yhbr535xrzgnm6n8623xgqm73djphv2xnd1q84psr1lrkzb7"; + rev = "b4f345998fba6c894d5de3aa42cb71a71e6c6ee9"; + sha256 = "0bxkrjmf56axdhzdnw58dv1i7yqsp57yj675lmmp2agnfifmfvm9"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -4212,24 +4212,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-05-30"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3362b28f917acc37538b1047f187ff1b5645ecdd"; - sha256 = "0pfkh7zhnwhbfdcild5vayymw4vqzcfb31nq1y33pk1zlvpwxksv"; + rev = "5113cdb32f9d9588a2b56de6d1df6e33b06a554a"; + sha256 = "07npk6x4ljq7f3wfcs3liaxpn23x4gdxr5jq8vglhd1xj3l99mh5"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-05-28"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "52f4aed58db32a3a03211d31d2b12c0495c45580"; - sha256 = "0drc847m55xwiha1wa2ykd5cwynmvd5ik2sys9v727fb4fbqmpa0"; + rev = "a12441e0598e93e67235eba67c8e6fbffc896f06"; + sha256 = "055y9bm8npn8n1xysk83l7ghf0760f8037jm32zf9fc8zk1ki98d"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -4248,12 +4248,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-05-30"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "aa4eea49179852376fb9e5716aa5d03d4707373b"; - sha256 = "1xb6pc96jq9haa02h6zmp5gaqq95yxlqnniz5f31554vrhab51kd"; + rev = "6923ccef17c5276bc5d3cca907082e19ee165d55"; + sha256 = "0jyq8dszbncrqfbsajbwb3j59jj8gyngi2nmz0hg902kaif4cjib"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4308,12 +4308,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-05-26"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "f24cc6cf1dcd34350769b9cb28254b3f28973cf7"; - sha256 = "1sgpips6s2rxb2vnm6zbqmggra8qbb63nws1y1c60rqw249dw513"; + rev = "33d764439816ad80ded0f60b4bd8c038c9f96f43"; + sha256 = "154hhvh44408m8n7vy9js7xakqv62qh0m8ffnvb65w63k1fjmwhs"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4332,24 +4332,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-06-02"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "6adaf4c42455c093f00d0df3882ab48838423a57"; - sha256 = "0198f7818m58h2bxgdnfnx5nm7vxi2psssx105dn6ndg55yf2qsx"; + rev = "cc8fb168b95620ec1611916a6d2a74e6a5cdcbdb"; + sha256 = "1v7j8s19r20ljlyha9d10vpaarxlqsfn6ns4qc2p3z2ihbcaapq5"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-05-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042"; - sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf"; + rev = "a9f47afe1032d119a1ceff2714d47e4055564d07"; + sha256 = "1ihx2vhrwyj3zmhnzwdcq54kygm5zic14ccyld995s7vjc4d15ig"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4692,12 +4692,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-06-01"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "441c23d355b77f4067a1ad018c5dba64efd7ff7f"; - sha256 = "0yay92x3jmvpgqhx0hv0w19fjisakmmdzd286m656v5g26hmfxj1"; + rev = "2b33d2edba011799c496a2dc7c77ebbe1b3c5b76"; + sha256 = "10si9k7ybf1spw5jf8iizisx5xivzljk12ixarjrx359d9nzbi46"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4752,23 +4752,23 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-06-07"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "c0ebefa516aa9e93431f0a55e033db0dec072857"; - sha256 = "0x9qpybjj7h6b6l10bkfmwf3qn54fcbbb5spx8n1hkny40npvnn5"; + rev = "efc10f915ec53bbc8179ae591397b61aecf8f393"; + sha256 = "0cdrpmlx9riz1gkpgfnnk1hry19l2iggdkmf6c1zsdmbjs56c45s"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-01-13"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "07242b9c29eed0367cb305d41851b2e04de9052e"; + rev = "71c8fadd60362383e5e817e95f64776f5e2737d8"; sha256 = "1xcj3dmrcnqrk2dzzr137n0g0crfyg3zk3220202v6b4vylairnh"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; @@ -4812,12 +4812,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-06-05"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "621b5eeaf9b5c1b7affb327df3889f869b3c2893"; - sha256 = "172pxda6168a3b6xx2ba8njq72y3y5bybg5a983zncxvn00qpi9a"; + rev = "ad1e6b8cc25062ee426cd8690d28f82cfe840f58"; + sha256 = "1khn5kvmjh42i17hsvjs03bz4523kvshdw2mwa5g4jn7292lf4z8"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4872,12 +4872,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-10-29"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "eed488b1cd1867bd25f19f90e10440c5cc7d6424"; - sha256 = "0hlyn2l9ppjn92zaiw51i6d15li15z5083m13m0710giqx05qrak"; + rev = "fc85a6f07c2cd694be93496ffad75be126240068"; + sha256 = "02z32hrh4ykv4waq22y9ng8hwxxm8s5f2kxqm57pkixyy6b8zvzi"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -5028,24 +5028,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-05-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "abdbfab89f307151db83b1a5147cd390ef27ff99"; - sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f"; + rev = "0f590b762416bcf2c93621f77a21aa8b8e23d7d1"; + sha256 = "16z5fqw606ngkbvscw2cpxwm3lki5igqkslyc0hxdagnwiqm1p7p"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-06-09"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5d5cba15594c1b093a2177b339f34b3e3468fb46"; - sha256 = "0pr8xxcsv6aahgcfqls3sp5k58dsq8bgvdhh8b6zsmrpaxsh3rz3"; + rev = "ff40739e5be6581899b43385997e39eecdbf9465"; + sha256 = "1snnh6fsn89fx7l5bjbfg1kh3cbadg2qg1rin889f4xka1yqa4x6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5088,12 +5088,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-06-09"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "84cde3547e9a8b16db0bfe523e98e19b7be5148b"; - sha256 = "0hkfa28lcldacsxfccp99wbp42qp3cxffh5rg5s2brkkr3xdp3yl"; + rev = "4a95b3982be7397cd8e1370d1a09503f9b002dbf"; + sha256 = "18vn3wy83nscd0znagq9gw7bzf9ljkqiny04xbk5p2l85w4xya7k"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5124,12 +5124,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-06-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "1a58f72ac731a3cf17708301ddf094c2033ebc4e"; - sha256 = "0iy4kfd7a5pmsr63gjaplpxgw4nsrhsric7r3dhl3zisdzpn9kzm"; + rev = "d4bc26ce482bd980fb90b7171fe7dece7411b01b"; + sha256 = "05m1607rycqfwd23gr92ds5bkvcr68cjdpqxzma5wrac0cssdx6x"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5160,12 +5160,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-06-09"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "15c7bf7c0dfb7c75eb526c53f9574633c13dc22d"; - sha256 = "0fncx8cr915p5wxjb2wqmc5l3p1mjy0vwmkik4alz422c9zh436z"; + rev = "df6734aa018d6feb4d76ba6bda94b1aeac2b378a"; + sha256 = "0i6icap7x0p8f6i0vgrnqz2rhwc05qgsiflwndmca5dxarmxysxx"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5256,24 +5256,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-06-09"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "8092586db723beb41312f288e38a7d8edc6459d9"; - sha256 = "01rf6jl4b9amhkdjw8ayyx55njmklrbyb98kf4ybbcsgdjj587y7"; + rev = "014ebd53612cfd42ac8c131e6cec7c194572f21d"; + sha256 = "0qp15ihgwxamnly9ng6qmf051rz6yjg86p00dz39ffy02f8fvr60"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "d76d6594374fb54abf2d94d6a320f3fd6e9bb2f7"; - sha256 = "1yibykhd0kilzz67rmn392l27mmjmrcw62vmcilmyldnymxlqg85"; + rev = "52f4840cb95e6638f18a74b71b536c3bd12e9fd8"; + sha256 = "1vbhmz5hkgbb9z03g1552wbmzmnfgyr3x45qhrlnv50fkl2rrj8v"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5328,24 +5328,24 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "713e333d3d5cecaaee20c1e4d55fb5a344b5ca2e"; - sha256 = "19jm1i5z1y3bfyp92rwjmbxjalhp3anbmfafhrp10f7sd3mbcxhf"; + rev = "c617a18561f710c22f521f7efd05c1374a1b8073"; + sha256 = "1rk2z7ibrsh9gqrxisf13ybx846rxhlrx6s3piabhhr5x7m3h79n"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-06-09"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "c1e561d2937048174916667af0349bc4b7b3d2e9"; - sha256 = "0g2r45yx2vx2j7yx5n2gc4v36629vz0ngaz3q1hmwpcr15qxbb3v"; + rev = "be4bb5b903af81f04b316425b8ba8142504d023f"; + sha256 = "0n8a0lnf8jbfds29mk5xxk68cp7i4rb8xsfa1qk50i662l570knn"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -5364,12 +5364,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-04-03"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1944094111217db8d40aac697ffc71f16136d9ec"; - sha256 = "0f0lqldrgzi72qrafzwqk3i71v74xvsrhgrfnidnbnvd3jc7sa0b"; + rev = "6cd78e73b28af4618cf67a470e53e13d59899914"; + sha256 = "0g2xvgw1bxz76hil5iiy37gpv69xjqy2s2q79lqc1pcr54c3392i"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5388,12 +5388,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-06-02"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "72a40cdcde653df645644375307b4ea0cb658281"; - sha256 = "180v9810bmnh9xf74sq7nrgv98iva5xpka9yyhqp7n9li7c7xp93"; + rev = "3a148dac526396678f141a033270961d0d9ccb88"; + sha256 = "1fbxgssd9s0vfa6w00hhvqzmc48dgk271z0rchnch0b317q88vr2"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5448,12 +5448,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-06-08"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "28a5f3e24ccc9f70026629e9b87670ab893a870f"; - sha256 = "11dhxa18djf2rmbnrfm60z9pcmjnblha62yl6sc8d137fj87jppp"; + rev = "14f12733599d8feb4b3c6b9fc9e945e0bede59c2"; + sha256 = "1prhnjk78pl3cvaydv9i4jyz8j8y7za0lwkyhwax1n0qgv1m9kq6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5472,12 +5472,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4eac16e87f24ad26738e632446e29766e87141ae"; - sha256 = "0shpjy5p316yxs6d8028s93z1i7rv5fafpr8vk2zvgrhnvza6q1k"; + rev = "c55e830aa18bd15f36f7534947ec7471f2b43af7"; + sha256 = "0625rsaw5ba92fszk5bvkcg5misj7bacrlma9k8i09hbg81f3w28"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5496,24 +5496,24 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-04-10"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "3f0d7453987c7bef87d55b8051f252578853399c"; - sha256 = "0h97hqbx7kbwkqhbq76k5l6rcr2bmdm17g0dps2g82lizmyhpfk0"; + rev = "171e204ed65dc9308833ff80026fc6b7cec22825"; + sha256 = "1k7zly9xpdrxf6221w2x898fdapagzwjcf8sf6agis7flqhp3j8f"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-06-02"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6738fe3c0e2142de01c753f8b7c18281d11488ce"; - sha256 = "19k330fv68z9icdlbf6bjn8ckwrjkdn9k9hl4r4ss95lm7sfgzd8"; + rev = "58ecfb61e4617139d3954138ccccc4c0befa89e0"; + sha256 = "0qcz1ijm62ys0d7gzbgq9h537pcfyzqmnmm3gv6gxzvfbqr4mcwq"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5544,12 +5544,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "8252aaedfd57ad010d9fee2f620924eac063537d"; - sha256 = "1p7hwqsxryqc25mazdxvl9q7b1w57qn1sfqg5p9ksln7zh9qs44l"; + rev = "7caeaaef257ecbe95473ec79e5a82757b544f1fd"; + sha256 = "1k4p358hasbcwihx4prm7arz3frvj0s17imqx865nm2bsh0gpf3j"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5580,24 +5580,24 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-05-01"; + version = "2022-05-29"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a4512c9a9c0de83494fac66d02e04ff4f0805cae"; - sha256 = "0vaabj2m84ba3ryl6n5s5rryjg06kjk571z6cmdgccff4lvq9d4v"; + rev = "b13352f259c383cb1c921a1d5f2f98b072e53539"; + sha256 = "0cs0ir8xhivkqij25y4gf6zddq3c4j0qcdmv81k8lr1awfbr3017"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-05-13"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3"; - sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a"; + rev = "faba49ba6b53759b89fc34d12ed7319f8c2e27e0"; + sha256 = "1kfbad6v7azk8lhsjpsli2ba2x5wncjac35iazjhdx6dbv0gw90l"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -5628,36 +5628,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-06-07"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "1caca6285427ebd2b4f0eb10f4d1ae3956ff09c0"; - sha256 = "13m893pjn816fp5b0s423vbgk5f6fdhbiqwbbxzz2311ijg72nhh"; + rev = "79258f1d670277016523e13c0a88daa25070879f"; + sha256 = "1wrq3g6n82lyxzgbkfgpsi908ghwzp773fslrfyxk3mwgvdj396s"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-06-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a3cef7881ca8e2b8843a4500df44f94311bcc3df"; - sha256 = "1yfhc1yhrnv7k0l1p38zydl2xrjfzbwixz0iawpmybw5vmnyl0vi"; + rev = "8eccd820afb012df6ae22678aa01d4053ab84365"; + sha256 = "0465y4c7i33rn5yq921viik1kmv22pii9fr7nm678hkmhwi2qhwx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-06-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "81116dc03abf35ca99c7910f9f779961042dea12"; - sha256 = "150r80ik8i11a5dxn71j55gmgpfivlfmnvkqdxjwz6c14asi4ycj"; + rev = "b05cd9cbb972f48b583b581615a046f814ccaca0"; + sha256 = "07pxlms3j4kcd7ybmyjjkvjkkjxz084g3lm6kfv015pnca78wjj2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5724,12 +5724,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-05-28"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "18cb3a45e0ff843d48e8637a36b9cc6cd89d71b0"; - sha256 = "0w8gzxps0rn20cr92ib5zk3xw6l2i8032081r0v34rry1xahdam6"; + rev = "837167f63445821c55e6eed9dbdac1b0b29afa92"; + sha256 = "104rvha3bqsn5rnrii0z023x7a4ph3rljlmqjgaki27crfnxx8sj"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5820,12 +5820,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-06-08"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "71d4dcfe56d4c45b7f1a1520d65ef5a86d2bc9bd"; - sha256 = "020k4nni9kqq4sqh86rsca3vkf49b56pllxk81yriwyazn8m3y2r"; + rev = "f56b3f81661925e6487c2483ca8350c7287c70d1"; + sha256 = "005vxvy87hfmsvg0ksmc035md99b0qykgzlwj4nhcvv1pwpjbazx"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5856,12 +5856,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "52b1ebd80831dd1232b396b82a77fba977fb6e2c"; - sha256 = "173y7gwwwf7wdd07kgs95p5iznl202p022vyzzwc4zz41z50zzpa"; + rev = "af5595a5bf2358ef8611ab98f5e3c058b321c38f"; + sha256 = "0sd2isramda96kmb7inif3n3dn2p5qrccw0b3apj6pwxf3ridsf5"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -5880,12 +5880,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-05-26"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "06e9020c4b014a56547dbea53163cdd1c6c0c1ec"; - sha256 = "1biylhq7n0l7kac26ibv0zqwvfynqa1g3pn3qf9yz7ndrfqfwddk"; + rev = "5d13f02a8ba579d68be02f877a8c38bac9ff17ed"; + sha256 = "1f9p7crgkq68ql2ri8mjfkp5r6dhq9pmsl3073pg2hzgirb08fgl"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5928,24 +5928,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "d5907359eba50a9f0017043fb220d542e17c5e1f"; - sha256 = "0wqwxh13vh1hxcajb6zw2js36264zab8mxjnr0bkxmk821h68rwb"; + rev = "d3b95d2036d57f67a0f78ec975c7ef10e9134908"; + sha256 = "0yfdfpqygk77rhbyi28makmghq58rzl5aah8lpqihr604j1l54z5"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-02-18"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "10de4d0d50ec1d4d26118c4aa067a9d09e370c9c"; - sha256 = "1mhhff6knqqq6pgmd3w6vfljcig37yyxvmrvhb205y67igy3vcr2"; + rev = "45e409c69063a057250833a747e52e2ff00dd722"; + sha256 = "048rzckb35d4s96kmk6yhbv756yhhcv6kl7nc3y96w18qjjh5ymy"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -6072,12 +6072,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-06-08"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9c3239bc5f99b85be1123107f7290d16a68f8e64"; - sha256 = "1d948hq5aa8wbr1lvpi3c54mlgh8z6yk25bfn4ckbs1g1giar8ih"; + rev = "968a4b9afec0c633bc369662e78f8c5db0eba249"; + sha256 = "05x9hnz960ljcb2psqycxgdmh99j36y16vbb9l92wjv5szkz37x5"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6181,12 +6181,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2021-04-21"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "d493b57406d2742f6f6c6545de5a3492f2e5b888"; - sha256 = "1qnf8lg4a6xxn335z57nqb4yp7ij62yr408nbc8m6xwnznck3wa7"; + rev = "af5fae0b43241e9fc3e0442782272728844bec3f"; + sha256 = "05v81i4ialja4wq3rp1fy09zjh7rvwb6pjhig7zg9pfddd015pki"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -6350,12 +6350,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "21b47bda407194fbe1f603256e101c26c0dbe589"; - sha256 = "0ggd17mmvxpym4ablhy3s46yw9a3xavn9rzvla3j83skpmqyhmmk"; + rev = "7328413fdafeff52731e5f4961a574ad2fa0837d"; + sha256 = "07jwjcys9h2sjnh7vlf3rjjl254b7qh0axwck66d5hk0i7xviqhm"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -6518,12 +6518,12 @@ final: prev: scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; - version = "2021-11-16"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "590b23af866a32277cf803aca0fd770d5b39c2e7"; - sha256 = "1dvlmmxykf3vyhyvv5aiqbz8fd7zvpw4xq1nxnf3wyj371caawaq"; + rev = "bc97c132e8367efecb2ecb937d385e7dc04eb5a1"; + sha256 = "14g2q9nzdh9ffp2b8z3sdicrn4xq3ksq8mjxdi7cm44rlfyzfs04"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -6699,12 +6699,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c2f8a7259e4b67fb4d0242afababbb1dda3285a3"; - sha256 = "1ni8b2b3cqqmi8lr4dh2f5bwnxwcdwqdjfvvds4m8jq2s3kql4bh"; + rev = "e72e59d3e2cad8af17a1e2a0f6772ea56af32e2c"; + sha256 = "0yw98fj4b7vm5p5kvzvpgnmlgc3p54gdh1znlhpz5jkq4r59ggsa"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6723,12 +6723,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-05-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "79f8ddcfe1312e48595d2aed3eae8c021137db2f"; - sha256 = "1diqpkaspjcqlnbwpawh4yhls56776mndbskkcf7x69m1kfwkzip"; + rev = "b5bd319aa4c7bede97ec1eaf1dffaf7fbc9aa8a8"; + sha256 = "0hbxqs548z9zjjzizcz0g7h894sg4jyw97qwg8fahy0pvi976694"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6771,12 +6771,12 @@ final: prev: spellsitter-nvim = buildVimPluginFrom2Nix { pname = "spellsitter.nvim"; - version = "2022-06-02"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "spellsitter.nvim"; - rev = "430a25393abbf482bddf03c224cd5b8eeb27b5e1"; - sha256 = "1cypvpyaarn9ckin2cgf2hpsq5qj517pz64imvyckzg22x9cf6yi"; + rev = "c1b318f8b959e015f5cc7941624d1ca0f84705dd"; + sha256 = "17v7scc6574afmjfhhzawpxhhh31fz118xzbjg1l8qnbdnb159bh"; }; meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; @@ -6832,12 +6832,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-06-07"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "de2cc544127d6dfd7f6ff3d4960b21dd6db4f1dd"; - sha256 = "1mj4m1fk9y4l6418zamiqln09dg2h4cw9k9bywv55gd735gwfapp"; + rev = "1ed8bff0f7522bbcb79428f91a5cacacb3ae0331"; + sha256 = "0ckvl97v1jhr7wrrmvvgbi23z5bl29ng7f0l7hvrmm5m6c4cpkny"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; @@ -6952,12 +6952,12 @@ final: prev: sved = buildVimPluginFrom2Nix { pname = "sved"; - version = "2021-10-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "peterbjorgensen"; repo = "sved"; - rev = "2f98472720d0e0c7da5a93b4ab4574f75747f693"; - sha256 = "070fzga0b039wjhfzb7s0s422kv3as7ifv94ma6vh62ml6zm6mpl"; + rev = "7da91cb0eacdaae5e1a41722e95800c98d4ca675"; + sha256 = "0rp5pklym8bnl1npgglh096i9ssrdbn2r99arh42sbdca71spbiw"; }; meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; @@ -7025,12 +7025,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2022-04-19"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "2eb56826bf7b85b9090aff73a696e0e803bf89ae"; - sha256 = "10fqssr8la7y54q7iz2kgx1axv2rwmv0mjvnz0yvadcfz80q2ksv"; + rev = "5d76dc8616b4b7b892229cc05cd0f4cd0200077a"; + sha256 = "0k9yk7drxbjfwjfqmg7iam2vaz05rk3shd5lap8qakwvayvas258"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -7303,12 +7303,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-04-28"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae"; - sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7"; + rev = "8cd22b696e14b353fe8ea9648a03364cb56c39d4"; + sha256 = "1qrk2i7yvvrqg4yjma1q6c26wdlapc60yriiqx5mhfam9xh28s24"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7387,12 +7387,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e6b69b1488c598ff7b461c4d9cecad57ef708f9b"; - sha256 = "060149lbhsbn0vfdivng5pc48lnfhpjwsdc0ppvvvl45b5in7k27"; + rev = "d88b44ddf14670cffa9fdb1eaca7a0429a973653"; + sha256 = "11ahi16nd21p9413d3rdw25bgzjkp3k83p6a1jwka3pk15c87nl0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7495,12 +7495,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2021-07-17"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "70c4e222464020edc2809c932b488daaf891eeef"; - sha256 = "1amx220nbh1s51z35pkhvl3110pbha5qj2rdgxvg8dbqha7py9fx"; + rev = "223c696eab4a3a59a33352531e42c74c721510e7"; + sha256 = "1x9s9ypk934lkqpcyvycij5803y1vz5i3q8p8di6d6jv04ylvgvl"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -7568,12 +7568,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "50f88d316261bfe56854cb75b9d092061c38b21e"; - sha256 = "1cf6vqjcn5nk2ymjpflpxr9ic2k0y4bnxzy24n0q8vp05dp69qv2"; + rev = "8f2e78d0256eba4896c8514aa150e41e63f7d5b2"; + sha256 = "0mrjha2vadxc8n0q4kqq8x8xf03b2k0yksi68j6r1lbkd1i0rwmx"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7808,12 +7808,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-06-04"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "d2e2a1fbed196e3bb273fe87bbd821a7e80be298"; - sha256 = "00jvhicwa9wmf1pbd4fi4423jh02x5i7h5bgi21avfgyfxrvlaaj"; + rev = "8f8fd1731c614a76a41fda43b5405b35ffdae3a6"; + sha256 = "1gh5pa754mfnh5nsayq6gf6daz3ysbghd85drj35692x6jz8fpif"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8288,12 +8288,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-06-08"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "fc8eb893db0c3c7eb204066d1954a59bc78819b9"; - sha256 = "0c8d84pgg6rck6pxm12w46k1smsaw0d83hs899ws78zcamamp7y2"; + rev = "00df1ac5df05247238cb2ae2a0770b62209e3aa7"; + sha256 = "11k6s5qzwd6fcd2hjr6p3w08yqfh0mrnpl3nkyfz8lf8jpd6ps1b"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -8516,12 +8516,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "181524923fe04c554e37fc5acab51545b2a4715e"; - sha256 = "0355hn1v5k1j86k8bw61vjb84cbgsg214ax07l5jrfk5dzh1avcl"; + rev = "48b7b60c6743f4bc82d3edf61978c1c593276cc2"; + sha256 = "02sr55jqly1b8cllhaw124ig9q3p5m3v7s2vprfqrfyy3w681xfm"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8576,12 +8576,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-05-27"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "97ef6f96bd95c3dbd725946607e7290be0266153"; - sha256 = "03f506y3gv1hx0y66xjpg1v0nli63fh1qrvp05dwjki2vdzxmz03"; + rev = "caf254ffa59b91c41851024a58d1eaa806a81bc9"; + sha256 = "0ympd38yf9wlm37sgamyxi8nal0k7imd173xxfp617sj7lrnnx5q"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -8780,36 +8780,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-06-03"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "c2495b008f1adce6d21745b2c4c576eecc985959"; - sha256 = "1zj1bab5ck9k9c11cmyszmlnfw3sis79kmlag2a0c0p035rzsl35"; + rev = "136d82e1884f86b9f9bbbcc88bab6d199928a46e"; + sha256 = "1chbvrpykswcmph3yjpv17j5j47azvb90i1a4j0pwc2mmak6gnjq"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-03-06"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; - sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; + rev = "22ef15e7103b78850473b57ef48233aaec8d9f64"; + sha256 = "1ibr1db06b9bxa7jnspix6wmf1z8fl3g5rrxskgfhfpdb2blwihm"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-05-02"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7"; - sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw"; + rev = "50cbfc825bd58081f916f989d7ae78e5320e858b"; + sha256 = "0y2cnafw3ahxfvjc5g39nrpiwn502hp3xarnp8c3pg85hzf13jrc"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9224,12 +9224,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-06-03"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "875c404da92bb716fdfb33d4948277651ff345a9"; - sha256 = "0gkbd8vvyiln3v1f0hgx34ixhbqda8ggivqfgpnb7vlx5j9za706"; + rev = "e3f2d94d722603f8b65088ea1d7e0329951985bd"; + sha256 = "0d7r5g1wrcbq6ahd3hbwpjw54qk8k471wm704cmpdlgfjbjxdfqf"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -9296,12 +9296,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-06-07"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "92c73bb0507338441733198d630a1fe5e7fdac3a"; - sha256 = "0skxvlxnxcwj22qwh166i1kkn7iir3jndw1ixwvh3iipq46910zq"; + rev = "8b39d29d947618913ba1db32de605a6335875b99"; + sha256 = "0zmn09rh17zjq0pkf6nmmpwkchfvj8ycr2559ndjc5vdw8r10x70"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9368,12 +9368,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2022-05-18"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "0e571394d9c17026917235fc3df8f8d9184bc4d0"; - sha256 = "11bifrm9b5i89yg94368npw0la57icw8v9074ry7rp5f5r3jg3k8"; + rev = "5143bea9ed17bc32163dbe3ca706344d79507b9d"; + sha256 = "02vk8lgl6zswg6bdg1qy4qrh47bwflil601z8i33yjx5q2qrq0ra"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -10054,12 +10054,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-05-25"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "ca55491ce36f30263a56b0dbd2bcb4a26be34154"; - sha256 = "0pamfqjxiqk7rs5cn8s81197f8rilr01ka11hpbzamflz9v2lz9c"; + rev = "78fdcae8cab810892c82d555a63bdcd20b8e1397"; + sha256 = "0wr56azflkjx4v7xw44c960byfcak7kjgkk9a482rj19iywk9141"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10162,12 +10162,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-05-27"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9458f6e2d49112958499f0c82e1d6f18baa70248"; - sha256 = "099rlqfw45gr4szi2f1zdzayrsw504ihqpn6a7byg5h89a617kwy"; + rev = "74e458bc9c7532ff1959b2443a1d73494e3673b6"; + sha256 = "15m00ihfka0nlvn86q6flmxcwxf64ahykh4g7x9gb030gr6miflp"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10198,12 +10198,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2022-04-22"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb"; - sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8"; + rev = "80b47c5f636c0ed0915af378b47428a83346a699"; + sha256 = "1fmq4zcx8shrkw1p2sjhncy3g7j4zka4rvr97jplf8fv40yqql1i"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -10246,12 +10246,12 @@ final: prev: vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2022-05-04"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24"; - sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c"; + rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76"; + sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -10391,12 +10391,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2022-01-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "595ee332719f397c2441d85f79608113957cc78f"; - sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; + rev = "b9a6adbcfacc1ffe42ef3aa888f7c828a0b63746"; + sha256 = "0x0xjijadzk3z3f4bs0k3rbhb760qcdczvn0c8m9gx678wfjshyd"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10655,12 +10655,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-05-21"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "ebcb47da66329d2c654e380d87879a935576c176"; - sha256 = "17l3ghjicf0llf7341vkhgaxs53pj2fgrsli2rpkqnm2qd041gyv"; + rev = "360ccdc01b18cd434588c34e15e5ea382b436de8"; + sha256 = "14phavx432h16bdm7m99a21xz2gb1s47fd5g8v2b5ig12l4yss92"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11123,12 +11123,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2022-05-11"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835"; - sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq"; + rev = "f8b70f5ef3b315af1148ef9dcc2a9afb02bc8c79"; + sha256 = "1cgxaaizx9l11s3gs7d1gvlq2c1l42548fmdkqgqnl8z777h065k"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -11183,12 +11183,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-05-14"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "17266bab12c4f2ca9ce871f706176d971613487e"; - sha256 = "1zp7zkgphlavspyfha62rwhsxn0w4fp2ciylv3vq76j54xyxkqyj"; + rev = "e114a5e0c90aefed3d2a48ca326eff9d39bc90a9"; + sha256 = "0kqn9kzwhh1zhymvmpnbkrccj4nn5lda3fwj1hyd4z3iaffxxk9a"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -11363,12 +11363,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-05-11"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "6e4b81303968f37346925d6907b96ef07788cc82"; - sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4"; + rev = "93d202278004fbc8eb3ec9d734916214e6c7f034"; + sha256 = "1nnv2kkq06d72wfsyliqvyrp735j5kg7y9c1r9lypjw2y7548spf"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -11399,12 +11399,12 @@ final: prev: vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2022-05-28"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "4206594ee4d4c6689bd41f5ee8e3617642d3b295"; - sha256 = "1fr7bvl22p021wpwaadfczpg16qh2r2apjwq9bkcwlsg5l80qfdn"; + rev = "df1e324e9f3395c630c1c523d0555a01d2eb1b7e"; + sha256 = "1c87zc954wk76h9klxyygv19jp729fms2f5m18gwzskars3px076"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -11435,24 +11435,24 @@ final: prev: vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-06-04"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "ed3c5426a20bf1c06d7980946ada34fd9f93320e"; - sha256 = "0bxaalza02sgm045cj4vciy3qhmj7pj1rp9bdwm5837ldq8paj1h"; + rev = "525f331320427bf7aeb07651e2536b1f8a23df03"; + sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-05-29"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "11c771065bfadcc0583b9711d3932c765f168bb4"; - sha256 = "18x5y4cc1d4z5ciqhrb1554abv5ixz7jcvldjgsnlnvkx5b616s7"; + rev = "222cf7b44bb569c9a046a9891000c898bd4c43c9"; + sha256 = "0xksa854c8rjp9y2xvhk78z5ha9p8c3pvpzvddii2aay22cfkn8h"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11531,12 +11531,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-05-30"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "a8ab56f30c603f8022f5fb6a436f5183beeb7b27"; - sha256 = "1xlb8q93ff9qdlk17b76sbrz2adixj7zxf8b9ccvafki8diaqkj9"; + rev = "82c8a5491e13fa307fb2cb47182a30560f930377"; + sha256 = "05bj0cs5m829bdcm9zgmla2ha2nwg5cn1qs9r75haway42dza3s6"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11868,12 +11868,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-05-16"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b83d430697d268a690240ec932630b8aed211aba"; - sha256 = "0wy31h8f7j433h4anrwi7658g8plaja4gjsykgsdsgvm1zanq0dw"; + rev = "7945984fd56bd69506c73f68bb300aaceae72e82"; + sha256 = "1w6ifhkjjdfksmywf9r6hnvljbki0vdj440zj3ihbp2jpmhyb09q"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11928,12 +11928,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-05-05"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212"; - sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc"; + rev = "c93eb128332f8245776b753407ab6c4432c4c556"; + sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -12000,12 +12000,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-05-06"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766"; - sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj"; + rev = "e23b98a8852255766e54bf7723a9d61fb5ab3143"; + sha256 = "1zxdbcd4qsqdfrgvn76r0a187hs0krb7w4r39dr10wwgzq69d2vf"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -12108,12 +12108,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-06-07"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "d7d451daa66154031dd9fb24c1798b4d07a820d9"; - sha256 = "0f7rcmlnp24zag9ypfwd0i6bsikm0ndd58jnpv008qq8hl80rps1"; + rev = "931260e7816ff8eeb26843f859f86dac09912add"; + sha256 = "030ljq24lxqac3hphr5phw06lgcjg7jsrc6yxbgxx2m28v54isi6"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -12360,12 +12360,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-06-04"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "44eeaebd8cf8514de2b503e8698f2f341b5f23ad"; - sha256 = "197l41s256z6iyb1pym6h9m4046k7m0jiwlrgfbf60yy2fxka7f3"; + rev = "541cedd19bc22b5c00648352f0afe604113db32a"; + sha256 = "1ra6jr5qvgclazaj3332kiwlc5kvpvi2dj9g2vfgd84140036cas"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12373,12 +12373,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-06-05"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "754bf6c97272e9bf479057b44cc968c4dad34753"; - sha256 = "1igkd96171rhw0xdqikjhg99527jkkg7i6ri10p83v1fx9a7bk5y"; + rev = "fcdf28ae2c7f5e0aabeead8b78bd112141ef26f8"; + sha256 = "0d9g9cdrjhs0zwr3mc8r4dr1sf6jjhx3gywl8vfzk7xbrlyn6vcs"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12505,12 +12505,12 @@ final: prev: winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; - version = "2021-11-15"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "winshift.nvim"; - rev = "aaa04b97640165eb0877bfc04943f4282887470b"; - sha256 = "0rg7ci0m1hm9jbhjwckvjnfl0w3bl2wfr7wq67k0wdj5vnlzz6w3"; + rev = "7014fdac39082977f11a9bed4b5486a7c04e4202"; + sha256 = "1q21fh3rzrcl598z406nfr3gnfayy3ry3av9g41z872hx8r49kjf"; }; meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; @@ -12565,12 +12565,12 @@ final: prev: xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-06-29"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "359ffe4d426bce2e95f5866b682856b25555396f"; - sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; + rev = "d8500403b35d5597441773074e3976238b5e8b2c"; + sha256 = "0dpdzx46rrwq9i2rymn0if7ci9h2b5hmdxqfw0dmdiyn1byj2wph"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -12686,36 +12686,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-05-30"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "773d339cbd307fe218cf7b3ea04eac26b345a3b7"; - sha256 = "005r3nmjd3s0gbf319xwrvighjg391j3qh79sfc2568z53wxj8r0"; + rev = "d46425163dad4cc74910c0c81eeedb00cadf8a61"; + sha256 = "1iqjlvr9d1nlf5bpafd15zz0y9r6vrfgp5mwld7kwv9ipr3gw0sd"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-06-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "eaac7edb19ff11ce049513ac184fff7493817c1f"; - sha256 = "181jfbw3msf1pccykabnniqry28ikassj39rc36hyz1vii1dq1d0"; + rev = "e2fdf27b0f28f7e285beb377d2fc6936957c2122"; + sha256 = "098blx6c2mzh6ghlvm6cv62bi8cfiys9r867msfw2h7r01gqz2hf"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "9565764a38a6ad352b6daaf40aaec1ec6aae67a4"; - sha256 = "0frcfxnf6zzsslcpslsgpcb04ylxcf50lr3yg0gcap38gwwhna6p"; + rev = "1efa6229ab08d4620a8aa546bfd5103bd98a74e0"; + sha256 = "0mksvj0vswg6wbxfrr9rg6miv0kr700z3q8xcrria43rf06la32l"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12782,12 +12782,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-06-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "04fb9d3bf29755a0cd6e53373e5750ca78a8d37c"; - sha256 = "14zdlm3rpfkkg0y94071i6qx4bk3vp2wd2f5v7503mdc3p684amq"; + rev = "3f0a6c06da29c7b0f3fa49a313ae4d56f0dc58b8"; + sha256 = "01r34bkfs8kvaw72852sfk5jr1ngg2qf6a3dlpsppkb8l4lwi1k3"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a9d89a4f1ed65..f7e1645d707fd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -191,6 +191,10 @@ self: super: { dependencies = with self; [ nvim-cmp ]; }); + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; }); @@ -212,22 +216,18 @@ self: super: { ''; }); - cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp ]; - }); - cmp-tmux = super.cmp-tmux.overrideAttrs (old: { dependencies = with self; [ nvim-cmp tmux ]; }); - cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp vimwiki ]; - }); - cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { dependencies = with self; [ nvim-cmp vim-lsp ]; }); + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { dependencies = with self; [ nvim-cmp zsh ]; }); @@ -328,15 +328,15 @@ self: super: { }; }); - diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + diffview-nvim = super.diffview-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; doInstallCheck = true; nvimRequireCheck = "diffview"; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' + direnv-vim = super.direnv-vim.overrideAttrs (old: { + preFixup = old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" @@ -376,7 +376,7 @@ self: super: { patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; - version = old.version; + inherit (old) version; }) ]; configurePhase = '' @@ -445,31 +445,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); - - plenary-nvim = super.plenary-nvim.overrideAttrs (old: { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; - nvimRequireCheck = "plenary"; - }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; @@ -485,6 +464,15 @@ self: super: { ''; }; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; + }; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -659,7 +647,19 @@ self: super: { configurePhase = "cd vim"; }); - parinfer-rust = parinfer-rust; + inherit parinfer-rust; + + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; + }); range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { dependencies = with self; [ cmd-parser-nvim ]; @@ -676,7 +676,7 @@ self: super: { skim = buildVimPluginFrom2Nix { pname = "skim"; - version = skim.version; + inherit (skim) version; src = skim.vim; }; @@ -789,16 +789,16 @@ self: super: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); - telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { - dependencies = with self; [ telescope-nvim ]; - }); - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; buildPhase = "make"; meta.platforms = lib.platforms.all; }); + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -974,7 +974,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0="; + cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo="; }; in '' @@ -1103,13 +1103,13 @@ self: super: { vim-markdown-composer = let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; + cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; }; in - super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + super.vim-markdown-composer.overrideAttrs (old: { preFixup = '' substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ --replace "s:plugin_root . '/target/release/markdown-composer'" \ @@ -1287,9 +1287,9 @@ self: super: { "coc-smartf" "coc-snippets" "coc-solargraph" + "coc-sqlfluff" "coc-stylelint" "coc-sumneko-lua" - "coc-sqlfluff" "coc-tabnine" "coc-texlab" "coc-toml" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index f63bd867f3682..1214e36372a62 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -116,13 +116,7 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - - # whitelist - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [ - "diffview-nvim", - "marks-nvim", - "nvim-biscuits" - ] + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f5404cf3ae92..c05f3502aec32 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -48,13 +48,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.19.2"; + version = "0.20"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU="; + hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1488538cc55ed..679b77157cd05 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,8 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem -, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat -, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt -, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch -, wxGTK31-gtk3-override ? null }: +{ stdenv +, lib +, binutils +, fetchFromGitHub +, cmake +, copyDesktopItems +, makeDesktopItem +, pkg-config +, wrapGAppsHook +, boost +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, glew +, glib +, gmp +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mpfr +, nlopt +, openvdb +, pcre +, qhull +, systemd +, tbb +, wxGTK31-gtk3 +, xorg +, fetchpatch +, wxGTK31-gtk3-override ? null +}: let wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; @@ -16,7 +47,8 @@ let }; }); wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.4.2"; @@ -28,6 +60,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + binutils boost cereal cgal_5 @@ -58,6 +91,16 @@ in stdenv.mkDerivation rec { url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; }) + # Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238 + # Can be removed with the next version update + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch"; + sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8="; + }) + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch"; + sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20="; + }) ]; doCheck = true; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6244b0fbc8cd4..a75c094521352 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -121,7 +121,7 @@ let optional optionals optionalString; jre' = jre_minimal.override { - modules = [ "java.base" "java.desktop" "java.logging" ]; + modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9e5d40be2c6d5..0bdcd352051ce 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -47,10 +47,15 @@ in stdenv.mkDerivation rec { sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; }; - buildInputs = [ polyml z3 veriT vampire eprover-ho ] - ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; + buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] + ++ lib.optionals (!stdenv.isDarwin) [ java ]; - sourceRoot = dirname; + sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot ${dirname} + sourceRoot=${dirname} + '' else null; postPatch = '' patchShebangs . @@ -112,6 +117,9 @@ in stdenv.mkDerivation rec { --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' rm -r heaps + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + substituteInPlace lib/scripts/isabelle-platform \ + --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do @@ -180,7 +188,7 @@ in stdenv.mkDerivation rec { homepage = "https://isabelle.in.tum.de/"; license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } // { withComponents = f: diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index a3d6c16fb7df2..857bbbdee5d00 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; enableParallelBuilding = true; + CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null; + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; # z3's install phase is stupid because it tries to calculate the diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f8f58cdcaba29..88af6b0ceae5e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , gettext , itstool , python3 @@ -19,32 +18,15 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.21.1"; + version = "3.21.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; + sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4="; }; - patches = [ - # Pull upstream fix for meson-0.60: - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 - (fetchpatch { - name = "meson-0.60.patch"; - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; - sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; - }) - - # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; - sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index b3d0f8d5d502e..571d0b023124c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -154,7 +154,10 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" "pie" ]; - outputs = if langJava || langGo then ["out" "man" "info"] + # When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as + # MH_DYLIB_STUB files, which install_name_tool can't change, so we + # get a cycle between $out and $lib. + outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"] else [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -328,7 +331,6 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index d9977e0ba2f9e..310e7f8b574bd 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -6,14 +6,16 @@ , langGo }: assert langJava -> lib.versionOlder version "7"; -assert langAda -> gnatboot != null; - -lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' +assert langAda -> gnatboot != null; let + needsLib + = (lib.versionOlder version "7" && (langJava || langGo)) + || (lib.versions.major version == "4" && lib.versions.minor version == "9" && targetPlatform.isDarwin); +in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" -'' + lib.optionalString (lib.versionOlder version "7" && (langJava || langGo)) '' +'' + lib.optionalString needsLib '' export lib=$out; '' + lib.optionalString langAda '' export PATH=${gnatboot}/bin:$PATH diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch deleted file mode 100644 index 120cfe6feb2a6..0000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -474,6 +474,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -595,7 +596,7 @@ - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index 59ca5348fed44..cddfd5c23806b 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -73,8 +73,7 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ] # Prevent a compilation error on darwin - ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch - ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 47bdaf8623627..508dc2be60b9b 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,42 +1,34 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv, v8 }: +{ rustPlatform, fetchFromGitHub, lib }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZUr1v94If8ER4lTHLwuP+F3xfXU7IW4ZEztBA2TPvVg="; + sha256 = "sha256-q+6w22MbI3HRpmkybZXXWbkK7jbd6lyxodC3EpSovRI="; fetchSubmodules = true; }; - cargoSha256 = "sha256-X+KDeWavFTBaxbSPlIiyuiBC7wg1/5C/NXp+VEY8Mk8="; - - # This environment variable is required so that when wasmtime tries - # to run tests by using the rusty_v8 crate, it does not try to - # download a static v8 build from the Internet, what would break - # build hermetism. - RUSTY_V8_ARCHIVE = lib.optionalString stdenv.isLinux "${v8}/lib/libv8.a"; + cargoSha256 = "sha256-uuhGb0/RDz1/3O8WYiyGIUQFh0WZWJgujqtvH+hgbdA="; doCheck = true; checkFlags = [ "--skip=cli_tests::run_cwasm" - "--skip=commands::compile::test::test_successful_compile" "--skip=commands::compile::test::test_aarch64_flags_compile" - "--skip=commands::compile::test::test_unsupported_flags_compile" + "--skip=commands::compile::test::test_successful_compile" "--skip=commands::compile::test::test_x64_flags_compile" "--skip=commands::compile::test::test_x64_presets_compile" "--skip=traps::parse_dwarf_info" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = "https://github.com/bytecodealliance/wasmtime"; license = licenses.asl20; - maintainers = [ maintainers.matthewbauer ]; + maintainers = with maintainers; [ ereslibre matthewbauer ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index cafa505da621b..54bd91db3ae81 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q2.2"; + version = "2022.Q2.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA="; + sha256 = "Yd2juNdSP8TdSX9j/iXsC2xrIRzDEuXJbms91AqwjEc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 3620943d6c537..f794868baf0d1 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withOpenssl [ openssl ] ++ lib.optionals withZstd [ zstd ]; + # Don't build the regression tests because they don't build with + # pkgsStatic and are not executed anyway. + cmakeFlags = [ "-DBUILD_REGRESS=0" ]; + preCheck = '' # regress/runtest is a generated file patchShebangs regress diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8d28ef5ad74f5..c60787d5b6220 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , removeReferencesTo , python3 , meson @@ -69,7 +70,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.51"; + version = "0.3.52"; outputs = [ "out" @@ -87,7 +88,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-k5OdKgkQUaelvrGS4KtO0MtSJg6cF2Nf8RrsR8Kf+C8="; + sha256 = "sha256-JWmO36+OF2O9sLB+Z0znwm3TH+O+pEv3cXnuwP6Wy1E="; }; patches = [ @@ -103,6 +104,12 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + # Remove 44.1KHz from allowed rates (multiple regressions reported) + # To be removed when 0.3.53 is released + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/16a7c274989f47b0c0d8ba192a30316b545bd26a.patch"; + sha256 = "sha256-VZ7ChjcR/PGfmH2DmLxfIhd3mj9668l9zLO4k2KBoqg="; + }) ]; nativeBuildInputs = [ @@ -164,6 +171,7 @@ let "-Dbluez5-backend-hfp-native=${mesonEnableFeature nativeHfpSupport}" "-Dbluez5-backend-ofono=${mesonEnableFeature ofonoSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}" + "-Dbluez5-codec-lc3plus=disabled" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 7d7a9afcd300a..2b50dc97fb1e3 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "6.5.0"; + version = "6.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-N2O0/C75EGO6crUCFGUiJLLQqfMVRNVQRZb1xKhHzXs="; + hash = "sha256-jDuxOBLpZnvIP4x2BkAlEenC/nnWeG8SlSLnlpPuCWs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 79bb3a2b49ce7..06ba4fe762ef4 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1226"; + version = "2.1.4"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-hAHIrf1oZMPpciKTUiM+EuP4TDtb0lYI7hlZXWkIyV4="; + hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 737034b0d2683..63594300e835d 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -31,8 +31,8 @@ let arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; - rev = "3c5eaba46dab72ecb7d5f5b865a13fdeee95b464"; - sha256 = "sha256-alcGEi+D8CptXzfznnuxQKCvU2mbzn2sQge5jSqLVpg="; + rev = "9ab2b0bedde459dc86e079718333de4a63bbbacb"; + sha256 = "sha256-2KLtjgCqHzBBlo9ImZ8WJ1bsWy/kdJCjCFxlLE+HxoI="; }; armv7 = fetchFromGitHub { owner = "radareorg"; @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.7.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-tCFi1m3xyQlG+8FijjQh8PMwg6CIfIxvLkd5xCIZHHo="; + sha256 = "sha256-TZeW+9buJvCOudHsLTMITFpRUlmNpo71efc3xswJoPw="; }; preBuild = '' diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index c8208dc18e410..5b33c02809eb9 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.293.0"; + version = "2.294.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-5XAlKCtIvHzaJCPVO0WsrUGKnYUNR+roqzJ+jrcBfVM="; + hash = "sha256-2MOvqVlUZBmCt24EYSVjXWKR+fB2Mys70L/1/7jtwQQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 0d901f14863e6..8ae769429cccd 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-NqXmeBQrDnCGruJTZjAryxCmEdm1CZMPhW6JhZB0log="; + sha256 = "sha256-SaQGUVXtAI/FdqRZc4AjDkeEl9lE5i/wKsHKNGLpx8Y="; }; - vendorSha256 = "sha256-Wit5DWTjVrxLLWpfOo/6JrSxqeZvC4Vjv+cW19wNHyw="; + vendorSha256 = "sha256-0GE5chSTonJFT7xomfa9a9QsnFpTFX7proo9joaDrOU="; subPackages = [ "." ]; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 8b98858e823b9..8b98858e823b9 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix diff --git a/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch index e084538ca924c..e084538ca924c 100644 --- a/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch +++ b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 982a000caa74d..982a000caa74d 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 2eb2ddd2d9843..2eb2ddd2d9843 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/development/tools/rust/cargo-deps/default.nix index b98a0d75793f3..b98a0d75793f3 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/development/tools/rust/cargo-deps/default.nix diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/development/tools/rust/cargo-download/Cargo.nix index f96a3a207df01..f96a3a207df01 100644 --- a/pkgs/tools/package-management/cargo-download/Cargo.nix +++ b/pkgs/development/tools/rust/cargo-download/Cargo.nix diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/development/tools/rust/cargo-download/crates-io.nix index dde192585e08a..dde192585e08a 100644 --- a/pkgs/tools/package-management/cargo-download/crates-io.nix +++ b/pkgs/development/tools/rust/cargo-download/crates-io.nix diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/development/tools/rust/cargo-download/default.nix index 1cb53a4b6c8d8..1cb53a4b6c8d8 100644 --- a/pkgs/tools/package-management/cargo-download/default.nix +++ b/pkgs/development/tools/rust/cargo-download/default.nix diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 53f7d581b346c..53f7d581b346c 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index e3bbb29164f13..e3bbb29164f13 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/development/tools/rust/cargo-graph/default.nix index 37fd43a1bcf1d..37fd43a1bcf1d 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/development/tools/rust/cargo-graph/default.nix diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix index f94c4fa5c0f00..f94c4fa5c0f00 100644 --- a/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/pkgs/development/tools/rust/cargo-kcov/default.nix diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index 6202e297b9a9e..6202e297b9a9e 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 2013f15d1e1a6..2013f15d1e1a6 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 965c94742ec5e..965c94742ec5e 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 383eeac432d9a..383eeac432d9a 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index 2c35e951cda13..2c35e951cda13 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0dd477ee31d29..cbf5eb4a6dd9f 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -62,8 +62,18 @@ stdenv.mkDerivation rec { # nuke the example/reference output .txt files, for the included tools, # stuffed inside $out. we don't need them at all. + # (see "Allow skipping examples" for a potential option + # https://github.com/iovisor/bpftrace/pull/2256) + # + # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do + # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. + # (remove `chmod` once a new release "Add executable permission to tools" + # https://github.com/iovisor/bpftrace/commit/77e524e6d276216ed6a6e1984cf204418db07c78) postInstall = '' rm -rf $out/share/bpftrace/tools/doc + + ln -s $out/share/bpftrace/tools/*.bt $out/bin/ + chmod +x $out/bin/*.bt ''; outputs = [ "out" "man" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d1ad7f5b74a18..fb8c448f7fb8f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,71 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.283-hardened1.patch", - "sha256": "07827a7wigdp2wml770gc0mmzmcmqf9mnry9xbsxpkgbs91ng6lp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.283-hardened1/linux-hardened-4.14.283-hardened1.patch" + "name": "linux-hardened-4.14.284-hardened1.patch", + "sha256": "0hj6hmkv3ikgps0jrwl5jgg9pdw6mxi3iblr20r4yp8anxcrvaws", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.284-hardened1/linux-hardened-4.14.284-hardened1.patch" }, - "sha256": "191gybhnck4mh9yjzwgv1crrbxjc90p12bcif721rbs6xzszmxzh", - "version": "4.14.283" + "sha256": "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq", + "version": "4.14.284" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.247-hardened1.patch", - "sha256": "1m7289bljbki2wiy6458v13l8wvslqgqhajcp735j50psi6jr6dp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.247-hardened1/linux-hardened-4.19.247-hardened1.patch" + "name": "linux-hardened-4.19.248-hardened1.patch", + "sha256": "09bnw0f8rd5hf4k4w4n4sb3ggsw48nkxsrnxd9b8vn6jyqhv9n3s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.248-hardened1/linux-hardened-4.19.248-hardened1.patch" }, - "sha256": "136gmsmvgb2nid4by2ld003w06lsr7hgn9ajx0wfziag7pfnjsv2", - "version": "4.19.247" + "sha256": "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4", + "version": "4.19.248" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.122-hardened1.patch", - "sha256": "1mb10f3kfncgpwlygvnlvjy3cjlgjzbc5lp73wgjz1nzqjfdjrlp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.122-hardened1/linux-hardened-5.10.122-hardened1.patch" + "name": "linux-hardened-5.10.124-hardened1.patch", + "sha256": "1fjwi5al5i0qb7a7viljb755ylqj3m5qp10835a3q91ad6zkjjnf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.124-hardened1/linux-hardened-5.10.124-hardened1.patch" }, - "sha256": "0h0gfi3p1dd4p8xxklrl8sc3rv4xd08q7nv0i4m166w8188v62wj", - "version": "5.10.122" + "sha256": "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc", + "version": "5.10.124" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.47-hardened1.patch", - "sha256": "0bpzk0l4kcfhqinh3rpl6wv70lhw9c304zgw2qbw0fa76mqfwgs8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.47-hardened1/linux-hardened-5.15.47-hardened1.patch" + "name": "linux-hardened-5.15.49-hardened1.patch", + "sha256": "0p14bhqk0a4xzr11cc6gqc0ncc1a3cmvwyvisbsp7b74ax9w5qbm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.49-hardened1/linux-hardened-5.15.49-hardened1.patch" }, - "sha256": "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb", - "version": "5.15.47" - }, - "5.17": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.17.15-hardened1.patch", - "sha256": "053zgg464rb8ca92hkzxqbffapmj0zs296af354b7jkgfpb5xzr1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.15-hardened1/linux-hardened-5.17.15-hardened1.patch" - }, - "sha256": "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a", - "version": "5.17.15" + "sha256": "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j", + "version": "5.15.49" }, "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.3-hardened1.patch", - "sha256": "1kfnknpw2g39j7gqy6mqjmkaxkmdigx617rz2vpqvjxddfv59764", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.3-hardened1/linux-hardened-5.18.3-hardened1.patch" + "name": "linux-hardened-5.18.6-hardened1.patch", + "sha256": "0y0s50z4qrkcd0s7rlsk8nw1xibwy2i5vigm6526ch77d61g231m", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.6-hardened1/linux-hardened-5.18.6-hardened1.patch" }, - "sha256": "1sngy576db1zl2284kd0j8ds4biln0q98wnywirzsg3c0w2v8367", - "version": "5.18.3" + "sha256": "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f", + "version": "5.18.6" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.198-hardened1.patch", - "sha256": "0srx8kfapa8ahbqajwd8dir49l4rs0ijz3k3nrgvb2jjlrg1m4dd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.198-hardened1/linux-hardened-5.4.198-hardened1.patch" + "name": "linux-hardened-5.4.200-hardened1.patch", + "sha256": "1mpcvgri079v8js8y2angwmksyk07vhyi2b5b24bxxdbm1s5a58s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.200-hardened1/linux-hardened-5.4.200-hardened1.patch" }, - "sha256": "0wvscr5wia2xdiqfxxdwl8kxf1s085qdj5h4423mraj7dh6l0ihh", - "version": "5.4.198" + "sha256": "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga", + "version": "5.4.200" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 459816f2aa2c9..a18ac3ac5edb5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.283"; + version = "4.14.284"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "191gybhnck4mh9yjzwgv1crrbxjc90p12bcif721rbs6xzszmxzh"; + sha256 = "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f978b45c221f6..4d322c8ed6d39 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.247"; + version = "4.19.248"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "136gmsmvgb2nid4by2ld003w06lsr7hgn9ajx0wfziag7pfnjsv2"; + sha256 = "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ee4ab69b9f757..3c6aed36f3981 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.318"; + version = "4.9.319"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09czsc0ynyw068yczs9qx4cliqmrh5hvz93c77lhh014wn02pba4"; + sha256 = "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 61d3b9e6eb334..9f4dcb001af5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.122"; + version = "5.10.124"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0h0gfi3p1dd4p8xxklrl8sc3rv4xd08q7nv0i4m166w8188v62wj"; + sha256 = "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 225fe27a15f26..2b96065d84fe0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.47"; + version = "5.15.49"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb"; + sha256 = "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix deleted file mode 100644 index 6e4c5f6de14a1..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.17.15"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index 58b87840c0075..a5b50a6269e4b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.4"; + version = "5.18.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1pcjjiwal8jr07n5bzg6clcmm20gvmvqgxl8k46npibrdx3r6wab"; + sha256 = "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index dbc350e45559d..2f7a5f372cfe1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.198"; + version = "5.4.200"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wvscr5wia2xdiqfxxdwl8kxf1s085qdj5h4423mraj7dh6l0ihh"; + sha256 = "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 159584f607ff5..8b4382f80a0ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18777"; - sha256 = "0ycg799pdi3rarkdgrrxcfjl15n8i24d9zc54xhg79wpgxcv39n3"; + rev = "18798"; + sha256 = "04mxzf8k3g65yw73da9fgk27hraf69239m5757fsr5a6pj88z6lb"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 51f47cea2c45f..a1748156d098a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -17,6 +17,7 @@ extraMeta = { branch = "master"; maintainers = with lib.maintainers; [ davidak Madouura ]; + broken = true; }; } // argsOverride; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5a5fd2d19a8a2..96c6f57b019ab 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17 +, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 }: let @@ -217,7 +217,7 @@ in { zfsStable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_17; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. version = "2.1.4"; @@ -228,7 +228,7 @@ in { zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_17; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 0c3b4a9ed2f83..018086e6dc7cb 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,21 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: -stdenv.mkDerivation rec { +{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake, libX11, libXtst, qtbase, qttools, qtx11extras }: +mkDerivation rec { pname = "qjoypad"; - version = "4.1.0"; - src = fetchurl { - url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz"; - sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "panzi"; + repo = pname; + rev = "v${version}"; + hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXtst qt4 ]; - NIX_LDFLAGS = "-lX11"; - patchPhase = '' - cd src - substituteInPlace config --replace /bin/bash ${stdenv.shell} - mkdir -p $out - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" - ''; - meta = { + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ libX11 libXtst qtbase qttools qtx11extras ]; + + meta = with lib; { description = "A program that lets you use gaming devices anywhere"; longDescription = '' A simple Linux/QT program that lets you use your gaming devices @@ -33,9 +31,9 @@ stdenv.mkDerivation rec { of gaming devices in Linux, and makes the Linux gaming experience just a little bit nicer. ''; - homepage = "http://qjoypad.sourceforge.net"; + homepage = "https://github.com/panzi/qjoypad/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index c85d7ef612812..97a029d353b2d 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -119,6 +119,22 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + (fetchpatch { + # Prevent downgrade to plain network on Enhanced Open profiles + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b7946e50acc0d20d31b0c1098fdadc2f105ba799.patch"; + hash = "sha256-CdZiubfqhJQ5w4+s9O8C5WI9Ls/paONzDX4rX6yEmS0="; + }) + (fetchpatch { + # Treat OWE BSSIDs as valid candidates for open profiles + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/dd80cdcc1bd5e2535b8e4a1d1d0c62f1d3328a7c.patch"; + hash = "sha256-QMZvWN3g8K+UH6y05+RkCmF+gHHU4pB+UXfU770AUis="; + }) + (fetchpatch { + # Allow distinguishing pure OWE networks from those with transition mode enabled + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/13ea8d2e7dddd8279c82230594cea533ca349dd3.patch"; + hash = "sha256-BiINGzX/Zp8pwdbMiDScrZvrHtH7coXkZm1HScFuFWA="; + }) ]; buildInputs = [ diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 62bc16f6a4147..ef09cc1ac71b0 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -27,6 +27,12 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch"; sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI="; }) + # fix use of MutableMapping with Python >= 3.10 + # https://github.com/fail2ban/fail2ban/issues/3142 + (fetchpatch { + url = "https://github.com/fail2ban/fail2ban/commit/294ec73f629d0e29cece3a1eb5dd60b6fccea41f.patch"; + sha256 = "sha256-Eimm4xjBDYNn5QdTyMqGgT5EXsZdd/txxcWJojXlsFE="; + }) ]; preConfigure = '' diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index e72d7ff5e1c20..18dc89a868045 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -10,22 +10,22 @@ }: let - dbrev = "5171"; - drivedbBranch = "RELEASE_7_2_DRIVEDB"; + dbrev = "5388"; + drivedbBranch = "RELEASE_7_3_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; + sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { pname = "smartmontools"; - version = "7.2"; + version = "7.3"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; - sha256 = "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"; + sha256 = "sha256-pUT4gI0MWM+w50JMoYQcuFipdJIrA11QXU5MJIvjois="; }; patches = [ diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 075dd1b2b5879..57f373a9ce1a5 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-08ccRiOBXYqueKfyi/Ry39O2xOXUKishgqhn6RdbvUE="; + sha256 = "sha256-lsryNrgjOGdugOhtkNbnYEreF0X1ywLVaFmKUXDf884="; }; - cargoSha256 = "sha256-vXUjKpCGlHlBvXLtmGkFtHRxxZakiEzuNzReFGEl6dw="; + cargoSha256 = "sha256-l95nbp9PEgO97D1M/R9IB3Xfog6+DkZwyVY2DEl5mG4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af8b0a30853f2..60d81b8b4cab2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9820,7 +9820,7 @@ with pkgs; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; - qjoypad = callPackage ../tools/misc/qjoypad { }; + qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; qmk = callPackage ../tools/misc/qmk { }; @@ -12830,6 +12830,9 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_11 else null; cloog = if !stdenv.isDarwin then cloog_0_18_0 else null; + + # Build fails on Darwin with clang + stdenv = if stdenv.isDarwin then gccStdenv else stdenv; })); gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { @@ -13860,11 +13863,11 @@ with pkgs; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cratesIO = callPackage ../build-support/rust/crates-io.nix { }; - cargo-web = callPackage ../development/tools/cargo-web { + cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph { + cargo-flamegraph = callPackage ../development/tools/rust/cargo-flamegraph { inherit (darwin.apple_sdk.frameworks) Security; inherit (linuxPackages) perf; }; @@ -13873,9 +13876,9 @@ with pkgs; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - cargo-about = callPackage ../tools/package-management/cargo-about { }; + cargo-about = callPackage ../development/tools/rust/cargo-about { }; cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; - cargo-audit = callPackage ../tools/package-management/cargo-audit { + cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { @@ -13889,29 +13892,29 @@ with pkgs; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deb = callPackage ../tools/package-management/cargo-deb { + cargo-deb = callPackage ../development/tools/rust/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deps = callPackage ../tools/package-management/cargo-deps { }; - cargo-download = callPackage ../tools/package-management/cargo-download { }; - cargo-edit = callPackage ../tools/package-management/cargo-edit { + cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; + cargo-download = callPackage ../development/tools/rust/cargo-download { }; + cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; - cargo-graph = callPackage ../tools/package-management/cargo-graph { }; - cargo-license = callPackage ../tools/package-management/cargo-license { }; + cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; + cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; + cargo-license = callPackage ../development/tools/rust/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-outdated = callPackage ../tools/package-management/cargo-outdated { + cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-release = callPackage ../tools/package-management/cargo-release { + cargo-release = callPackage ../development/tools/rust/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-update = callPackage ../tools/package-management/cargo-update { + cargo-update = callPackage ../development/tools/rust/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -23481,8 +23484,6 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; - linuxPackages_5_17_hardened = linuxKernel.packages.linux_5_17_hardened; - linux_5_17_hardened = linuxKernel.kernels.linux_5_17_hardened; linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened; linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened; @@ -33663,7 +33664,7 @@ with pkgs; z3 = z3_4_8; z3_4_4_0 = callPackage ../applications/science/logic/z3/4.4.0.nix { python = python2; - stdenv = gcc49Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc49Stdenv; }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fe8969b43add3..0e61796ef2816 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -162,12 +162,7 @@ in { linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix { kernelPatches = [ @@ -189,7 +184,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_17; + kernel = linux_5_18; kernelPatches = kernel.kernelPatches; }; @@ -243,7 +238,6 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; - linux_5_17_hardened = hardenedKernelFor kernels.linux_5_17 { }; linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { }; })); @@ -517,7 +511,7 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 - linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17); + linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); }; @@ -557,7 +551,6 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); |