diff options
Diffstat (limited to 'pkgs')
90 files changed, 1128 insertions, 904 deletions
diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index bcc25cf2460ac..6e7cb1d58cd36 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "24.0.1"; + version = "25.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "0k14y3iv5l26r820wzkwqxi67kwh26i0yq20ffd72shicjs1d3qc"; + sha256 = "03w5n3qjha63mgj7zk8q17x5j63la3i4li7bf5i1yw59ijqpmnqg"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 878c587e5abda..5c08af915d975 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.62.1"; + version = "2.62.3"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c="; + hash = "sha256-/zIAF3LqOeIN91o33vntkBtQnESJhEDBljGPbMZvelc="; }; vendorHash = null; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d4516c25eb875..cf83a056a9708 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-05-26"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "af509fceb70cab1867a611f3d8fad6d3e7760fb0"; - sha256 = "0h34m91fm1bpy7zi643y6i0l0zlkbq6r1w6b3xqvnbjjny2zh6md"; + rev = "b32003f351e330b9985078989b60e70406d63973"; + sha256 = "0g499ksfyim6blw878h6gcb3v893ipn2sadafygryb17z97g7b3r"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "986a6374f4fd3f9b176105f4a3a4392b24e1953a"; - sha256 = "1gr3f779phdxaq6m2dbd2swkvwd702s2gnkhbj3vrcs38a9jrbnz"; + rev = "2e7ad2b8257b7d25df0264a5b193da7af35f5a53"; + sha256 = "057wak6dx112jzyqfk5lv31z8yl3xcy5rsqxci60zz1sgbpfsq29"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "f4b746a617323610d9a069bae6808ec6ca448bd9"; - sha256 = "1lp8j3bsz52mzhpjq8lmbf8ws857n71n0kcgvzx6adn74gh3sfl6"; + rev = "c2e4697ed7cf2b8617ebf65a5cb521544ca1f14f"; + sha256 = "1p780cxkd6rlkjdd7yhr7783hkjv52swdxw639x4zzzn7bzmaphn"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-04-19"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "78ba06ef21bfab9835ced9f4ba8ffdac1b975c40"; - sha256 = "0wr3d5ziwnb2v3fwh5asl1jq9js159qz8q1l8p0y4wx1jbfvryll"; + rev = "49ced5a30ad7778178fd44703665a8ef3329e592"; + sha256 = "0grfvb5vl9si7lldvjrlpc648649lwqn41xnb09bmhh8z0g11vx3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -1195,12 +1195,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "5e85133b895b10f7dc7ce46bdad852c990a3f4b9"; - sha256 = "13c8b6qrc03zblb7pq8ndy76mdb5b5pscbih6gqsx2qb6y9hxz39"; + rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6"; + sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1579,12 +1579,12 @@ final: prev: cmp-npm = buildVimPluginFrom2Nix { pname = "cmp-npm"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "cmp-npm"; - rev = "713f08c0492efbbe81eebcddc3162e6822bb610b"; - sha256 = "1s4191aql9b3xjidz2m559s1hsy5cf7hhn3xzb16d365nzin4rwk"; + rev = "2337f109f51a09297596dd6b538b70ccba92b4e4"; + sha256 = "1i1kg888wlz7jzmqcsfqr9vv3qwmdl25lsmalddx075ficxix3ga"; }; meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "b748ff19c7c3fbd0b9e263d04ea58e10954027ff"; - sha256 = "09qrry6y9k1c20z3q9d1m15a3n1bx1kzf11237fhhc41y2rk3g15"; + rev = "c045bfe52288b21cff3690bc9c4d5e2dc8a8af2c"; + sha256 = "07rlz9p709jprsnr11g8gb93y7znjsfa06p7irx6wb3s8p34mi4p"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2035,12 +2035,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-06-01"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "c8043290f2d77f61025494d839d88e414608c460"; - sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva"; + rev = "176e85eeb63f1a5970d6b88f1725039d85ca0055"; + sha256 = "0y3zhv82hi8avxhmp1c9h0r17kfclwxphzyk7701f6wjky375ksw"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-05-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "1dd96d90f53122225f698e58b50dee9ed760cf2e"; - sha256 = "11x6nlr8ii2kfvkywx5p3lj33xrdpvz5j49s2dvggls6syn1akza"; + rev = "31a1626273e2bab479b6b8416a137f9edaba7daa"; + sha256 = "1dcwp8sziahrgks2fdczvvfvnb7v9md2izpjw8r9cwvlx030g5lr"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2263,24 +2263,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "c5f5546a89acc9c423d883199f641db99ba28b5b"; - sha256 = "0gz9nfq2ssv081hx84c4ydh9ijyx99dh39zw2g4jf6vvz41c1sxs"; + rev = "963512076adfac6f3010ec33e1ed6be6dbadccce"; + sha256 = "1g5fymcrnqj32j4z1l85lkpjq9njlqqbir09rpvkdx4x8yfjg0ik"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "ba47209b2c029dd4b6eb42e267dc7e716b12eb5d"; - sha256 = "0m4r4k32y5dwg4z6p8xbjrq05vap9kmhrdbifapfdyn1icapna05"; + rev = "53f3fdee2140c349e036fd5447e9462cf5c42d80"; + sha256 = "1qj74m853ivjpb5ighy18b53r6vah6vgh4c91vq9wcfgk86xjvfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "55ca08083cab18bb5cd1b08f2d5c295b87fce0ef"; - sha256 = "00kw18965gyxpc1i58fbgpzr10j7yvcd9hwphml8jc07y4xk11w2"; + rev = "4ab181e67533705b7cbb8b0b109308fce0d954f8"; + sha256 = "06y4ysmvbyy287wcrmyd97snrmaxaz5zbpmka9dq3x4bc7qd9w47"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2841,24 +2841,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-04-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "747d6fd009dbc1904627868125e16cfa7c524b0d"; - sha256 = "19xn6bjhj6w1c8jaf65f0qrypmpx938dib8ig2md8xxz69hfyc44"; + rev = "b3916370c24c498117a4c790b2752c437dab661a"; + sha256 = "141ppws4f4gz90w07hpgs1h93d8v1fsi5kh032kgf65g9bawlri8"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "6780a8a27f5cd326f502653cecef701611641fdf"; - sha256 = "1qy7mh1j8npqhc6r1zd21g0ihswvgawbc7grc204hhca1g1qzgpx"; + rev = "0ad3e4f834093412ebbf317b7eaa9c59568824b9"; + sha256 = "0hhxbs1vdypyacpgrv0b2111ardkgb7akfp86z5d2rwmf3v46qwp"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2901,12 +2901,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-06-02"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4"; - sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl"; + rev = "5716b1395b32a5865476dd3314bd8888e5f91532"; + sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2961,12 +2961,12 @@ final: prev: edgy-nvim = buildVimPluginFrom2Nix { pname = "edgy.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "7bf62a057284233381c8fc4848e10d8335942495"; - sha256 = "0zcvjy6sdqahg7wfyc20zxsdima6zz0hfc4r7zhsw77x5z0jm6cm"; + rev = "ab09d4f52b53d1db0b576f4b12ff506cdde94f1b"; + sha256 = "1rzx3qgs4jp6m14jfsx3q43mg9qiva3ph60s933wfdbj5smb1x9i"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -2998,12 +2998,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-06-08"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "27c488da1548e62d3e0d09afa1be00f1ba7d73bd"; - sha256 = "02gln7mzgx7357mvzg4xkvm7wi7k82zj2fj1gd7b5qr3liipr631"; + rev = "b81fc13648a1944a55a5dddeef4f98632aae24bd"; + sha256 = "1ld2pcabxla0bakg4hzs5nk8axi86fhs7sc17qyryawdiw1al6pd"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3324,12 +3324,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74"; - sha256 = "0jxj57996c4ab54p0zd4h5ldkz9yad1jy0ylzikfq8ylvw7z4p31"; + rev = "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b"; + sha256 = "1bdavn7sw4kxyad8667am7vsam4p4aq88ii618sp1xy6r7n5qf4w"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3432,12 +3432,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-06-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "8d6b6388f40a5c5ddadb32601238944f0b0fc233"; - sha256 = "1lcj8kq72is82dd49jrnk7gpily2jjjslxfl1rc3q9p9p8zvlknv"; + rev = "267098387dd7a3c53f8a4cfb17285ba05d841353"; + sha256 = "1y069942yxzxv7m6l9nrfnpfci0q2rq2m5478sqpgkq9nj6pdycp"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3624,12 +3624,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-06-04"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "6da4999e261829daebbee0c91efb5cb562408755"; - sha256 = "1s61sc5pz3jhrh5dsq9a8s0ba9mvlpq7i3pkyyicr8ssnjwry1v7"; + rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1"; + sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3863,12 +3863,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-06-05"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886"; - sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip"; + rev = "5abb0ddb37feb5757509cfe117c9b888e1ea94f5"; + sha256 = "063nrqmqsd8v5gm8mxcmsaccdx426aa87359vdcfs4afjwxf95mz"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4256,6 +4256,18 @@ final: prev: meta.homepage = "https://github.com/twerth/ir_black/"; }; + iron-nvim = buildVimPluginFrom2Nix { + pname = "iron.nvim"; + version = "2023-06-04"; + src = fetchFromGitHub { + owner = "Vigemus"; + repo = "iron.nvim"; + rev = "9017061849e543d8e94b79d2a94b95e856ab6a10"; + sha256 = "1yaiywgm4p15c4n6zmp7b4x9ray30vfwn9wvfy1ib97h5vgf55aw"; + }; + meta.homepage = "https://github.com/Vigemus/iron.nvim/"; + }; + is-vim = buildVimPluginFrom2Nix { pname = "is.vim"; version = "2020-10-27"; @@ -4463,12 +4475,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "678179543e0d27650c328d8659f2c2cab4d854ef"; - sha256 = "01s2c09kw071lvfgn8bfw2aw978n50xdln6aapn4m2iw4fwhsg5s"; + rev = "10d4371745f88837c78c8daab00c5be6e48abea4"; + sha256 = "0xnm2lwpvmwg3b87aj5k5lnqld8gywm887mlg84bikkz03spfg91"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5039,12 +5051,12 @@ final: prev: magma-nvim-goose = buildVimPluginFrom2Nix { pname = "magma-nvim-goose"; - version = "2023-03-13"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "WhiteBlackGoose"; repo = "magma-nvim-goose"; - rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"; - sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja"; + rev = "d7931d773efcedc9c92337b8d500e32a3725fe26"; + sha256 = "06yfff5yipda1frabria28kby9q1hf485gzij0cgn7s7b035dp4x"; }; meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; @@ -5087,36 +5099,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-06-05"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "5230617372e656d4a2e1e236e03bf7e7b4b97273"; - sha256 = "1wfdb1cbqkyh24f3y7hswl2b41s7r2cz0s6ms5az5jfa2a56m1wl"; + rev = "8f9af9bd7dc8599c8ec5826bb175dc871e4b582d"; + sha256 = "11pxzmz4j65xzw8ny5nbinbdn9lsx531fa0pzfzfn40b2ilv3cjb"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2023-03-23"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "a6c4d7df448a78b0a05fd2065bef11ed52bee51c"; - sha256 = "187xhyda6jqayg547vl4n5j1jrz5m8h367wnbh66vnhfcrm51rvd"; + rev = "49e3efe743d846d80da5a4757d4f7e563a96cb84"; + sha256 = "1g5aha7jjw36wl2ji1i4gwa623x8v6agyxdqv68k7dsbid6kqj3r"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-05-29"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "7d7efc738e08fc5bee822857db45cb6103f0b0c1"; - sha256 = "1m8irg61mzw2pcgc9r6nf0v9ch5pgmwq0n1qx8lclwwzxfbwgzdl"; + rev = "ec8fc11f8ad036c672f6b4a83799d3bcc19b0eb0"; + sha256 = "06mmbn1l6mcf3hpf4p5n3kv15zp9lla8dzwqzgxpm619p9jv94i5"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5231,24 +5243,24 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "b2c059e15b4998f98faa1d3c9dc6c2cddb2f8208"; - sha256 = "1flvk7hfdlg95qds8sipqi8zqpi8gzbczybclf0qgyis3r8wc8jl"; + rev = "518ef7fcbdb3b73b315828622ccd3b026bb3a9c1"; + sha256 = "0w03jdqfcc3016wxvcm8n890rmgzfkm72fmbd9jy6g8yi2ign0zi"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; modicator-nvim = buildVimPluginFrom2Nix { pname = "modicator.nvim"; - version = "2023-06-09"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "51d7005913f99bf80c207731e052818edf178a3f"; - sha256 = "0h0fm1j5m470rcf2bkq1dxq4lxirln6ad2giisi3vh9jibgdizbn"; + rev = "b7a5184c6aac341726de2c0d226e7ad1200687f3"; + sha256 = "0i9qhq1hcpk60lz9ynd78z0ihccg0gs00h13mbqp0gfp0lq1mhp9"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5267,12 +5279,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-06-04"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "9f9d9d253983a9360e16bc1dd2b8d6cea5842006"; - sha256 = "1riylymbxk5150za0h0jq9w1rs3g67hswgbhfpig89p3m2v49ksv"; + rev = "5abc7cde23a05ff116f4d64d1d1519f25713dfce"; + sha256 = "0amhqpi6g8xgqk1qd6jr49nmnagc8kn74m1lwwlqsfbsr7cq4n9h"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5591,24 +5603,24 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d69254e1fbdc4a04c56719dde19e5eafb7b04b58"; - sha256 = "0l9jfbyhx41ydj5r2jd09gm9j72zzzj1zwjc65d8xda30w3bgl5y"; + rev = "c120c96225f878e096f124321c14c45aa07968b7"; + sha256 = "0rh9a6519cjqc1zn5j8l7jz0nsjddn76pa1q913r5h3myrkr10fz"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-05-12"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2d5d071d5957681ae677ee06f6eb879a61b7b618"; - sha256 = "17rs8k6xzy4c8nkiap84h5n7m0wcam06r6mv2z207di0cck2f4pk"; + rev = "2adfcbede6cf76e03e600a0e76283d10c4d686fa"; + sha256 = "1pr8b13bfm3m9gb3as92rf9lcdflk29rax3vgfyihvqp5kr5drcg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -5819,12 +5831,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-06-08"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "1d11827a3af27a0828279ec65e5a65ae7a30afa5"; - sha256 = "1r230i39ac6na7b9j3gqs06w89h46dyjw249pj28252n10n6w28f"; + rev = "5cded2eee7c170933206d7521bb310af25886843"; + sha256 = "1msf06lszl7fxadyv5ny8hlk5srirkaxlq4bjn0n6xazxyvm1p4b"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6119,12 +6131,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "c3480a10179ad17f0241d8c6534e5751d9049c11"; - sha256 = "1rp7wczxay5hb67gf52cx0wgpgsd6r4bh7q1qz0dh4016crrzxpj"; + rev = "72a6a37a263d71fbdee8b76a8546e5a2a837c106"; + sha256 = "0sqa0l7wr35h2n8b024dz4547cxgibn05d2smwc1am9hz8njavpv"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6167,12 +6179,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "a070cb87a180fd7e2c4387accff0be90268fb736"; - sha256 = "0838s3vqp2f6g8q7dwd4ga0m4qr8kj02snbrxd6xz4zzzaz1hlbq"; + rev = "a3318600bc1eba2cca84e879048c1ab8d4a0262d"; + sha256 = "1hba8idla910jwwpm9dgsa200nb0jw3054rnan7dyawg694d67bv"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6215,12 +6227,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "64bdc579873fa5bd303f6951ead2b419493c88e8"; - sha256 = "1hffqk9vz6lw6jrixqy9sxj1wv2z7cbj08ykccyfym2zpij40gx6"; + rev = "f008972ac7d24f7188521a7f8d158aac2fb0b07e"; + sha256 = "09icbz63wwl0riv8cy0av1ssjhwgcwla2jpcnra0207h7yx0z0rr"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6251,12 +6263,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "27992efc1cee6ac6c0ba002a8df8635464073fa4"; - sha256 = "01j1zwb6r1zrfjaiy13n2salk9y9k6ivqg8dxjx9j8jqx7xqds2y"; + rev = "d73d155287ad34c3baf8cdbb89733f45fa80bb2e"; + sha256 = "0wp6916bm1a8crsikyrgayiqqny1qjm519fk21ih69v5fzq67474"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6371,12 +6383,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "69e7d280cbe17e318b549a10ae3cae5810946be6"; - sha256 = "119cfn70bb5bbfaq9rfc51dms64qfzzkn6aknj4lnd2dx1r56k00"; + rev = "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65"; + sha256 = "1xh3pzcdbz2hqa3vl14gwn77pqjv939q9jfq1y4ln676jz5ljr4q"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6611,12 +6623,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "5ff71ee26591bacdf3387f150759262427d56c13"; - sha256 = "0nwlfw9ic7jjcaxlghy43scasf846258b75a3v4n71kxvs6w0xkd"; + rev = "a52da23ca02cfc225c6ecec2b6fa1efbadd609d5"; + sha256 = "14jgm3i2kiqainqq3w164czybhi1bsanrbvxfpwr31hgigg2pkn6"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6707,12 +6719,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-05-29"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "58a4fee3d61a6fb3166163c55fe0b2eb29464f9c"; - sha256 = "1rh5hhgr3lzq144a7bm2wn25fcdd29y1sanw2y5i82ks159ivdk5"; + rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096"; + sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6731,12 +6743,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "08f1f347c718e945c3b1712ebb68c6834182cf3a"; - sha256 = "0kqxbyb5hg6r4rv79bxjj8dvm3440137xxppp2a5idxi8sisdqad"; + rev = "fefba589c56a5568a089299e36a4c8242502faaa"; + sha256 = "128q0l2br61q2gn09ra99g67dp2bfc7czpdpfv2k58dmas0y0wmb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6935,12 +6947,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "5508b210504249943a397948b89865728bf314b2"; - sha256 = "07g4389kjcjp3vi9mcn3jay1zg7w3bv5kxs77619mrrcb8579j57"; + rev = "cb5e6a7692453624beb122f3d154c266a24d9195"; + sha256 = "047ra6mqhvlgj6af90sf0jywdvwk9smnr9mdxwc6knwf2cqjmprj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6983,12 +6995,12 @@ final: prev: nvim-spider = buildVimPluginFrom2Nix { pname = "nvim-spider"; - version = "2023-05-25"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "ef0c75f9292bcd604418af0a860c86b1c26fdfe7"; - sha256 = "0xi0mnkajz0phbv5xhpxzgarmbpb6f86qyg09a6m5dnyxjr142r3"; + rev = "04c6fc14d09823002dae486100745011fc3201ca"; + sha256 = "14310nzyjw7z83m7lqgbw2g0924ikwqi4h6cg9xcmh9ydflvn4dd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7031,36 +7043,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "034511714bacfadc5008e49f73fcef67e5613840"; - sha256 = "1zgrcbcqxnjnkli235lm9jhds8irxwgh26djfmw1kzz2ry18srsi"; + rev = "f873625d0636889af4cd47a01e486beb865db205"; + sha256 = "1744rhzjwwhqvn6wwsm498v4i69wq7hsgqfcym6fq5nga7x3cc0i"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f9d701176cb9a3e206a4c690920a8993630c3ec8"; - sha256 = "08zc1irs12clw8fy140j4lk9m4wfjmmmm64dw915gyl0l6r9g0rb"; + rev = "0ae494269acd469fbd896cf5d5a430dbbf4d4e95"; + sha256 = "19cf2rrh67amvy5r0ryz3flx2qr7nlqqlq1ypycl519j319raxj2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-06-02"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "e2ea37627c0681421ccf4a3cf19d68bb958e1817"; - sha256 = "01y9h86zvf4rj6zy0hlw59y9ynijj1ljpxhaz5kg689fyhq277cc"; + rev = "66531e825ab6c790ccf8837cfad2b9fab1b39d0b"; + sha256 = "15r6jhav1ndsxp9dqs969qw24nqfxihvvw8q5qr3ndd9di668w56"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7151,11 +7163,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "e1783c843fd0a604d071cb9f0c6919ac93bcd96e"; - sha256 = "0jh0rjg8swya2647nm5csmmv0b706s2piiiw5ngw8avm77z2f2dc"; + rev = "60e34278a87b1a9f2ae59a67b4a062c5f6b9b8e7"; + sha256 = "05a45pw8kv5w71qfcs7zsczyx9ladlz7h03wbbid4xkkm7ibybzl"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -7319,12 +7331,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-06-03"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "8ef51924724d506e515f2d3ac9f959a9eaf38f3d"; - sha256 = "1716cigy6zni71ipa2yqpqkpqiig92hdzpf9fcrzfmcqwyjddm0s"; + rev = "462b45758ea94ff30ad48979268094590a6b7b7e"; + sha256 = "0m7alckgwnqzv9zycrvpisnx8bg2n8057j8lvqjmx4fagfnr8nmh"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7343,12 +7355,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "266eea8c4dc931c6ef863b8cffcf43b9df88353c"; - sha256 = "0pargiy0mkwmr695pmj7i191ymlxnsd35sz2r0yga7gnbwjv8hib"; + rev = "9ae2c7f67aad788bb8217ce1cf978affe0d3d4ef"; + sha256 = "1d6vqw07gsc3x3xsq6h7m1bwm9ad37bxfp7drjhsrmqz1b8rpc66"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7909,12 +7921,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "a85dfff2602b739627b9f8a831de8c3e7b2993ae"; - sha256 = "1x6i6bwsk4vvbbvgn25vxvbwqy83w1dfkn5fwpnn2lfw88yflchf"; + rev = "08bcc40638cd4debd5184f934971858e1c5acff4"; + sha256 = "17isx8rsxzm5lbq9dfh7c0i0lrnqgp1di4vhfajjgam5nnplgp2i"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7969,12 +7981,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-06-01"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "50a36ff2e7cda1f727cb8607f8e791cebd4fa7b1"; - sha256 = "06cvmmpb8kn7iffnkhh1c6bzyh8kn4w29ab5gv0bx3hk8qylk55q"; + rev = "a89e373330649326a80c2fcafe7b92b5814792f6"; + sha256 = "0qcq33hlbh016x76wpn956wkpc9dy89w2x7gngzr7frx084skjwg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -8130,7 +8142,7 @@ final: prev: owner = "VonHeikemen"; repo = "searchbox.nvim"; rev = "110949af8963185b4e732b45ae57beb731bfcede"; - sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7"; + sha256 = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU="; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -8270,12 +8282,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-05-11"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "e9a8f08b9db566ebc2b942b4776567f981b2986c"; - sha256 = "00snlj1139mx3apdmkb7iimb3dl04711jhdk3q3jx83xp7lg0fgy"; + rev = "87b0f3374b5c4dd0ff601558a247a2dc78dc7b4e"; + sha256 = "1svng27iqmly5rwq4jbvx38havzp3pqw70jq587lrg1pylila994"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -8801,12 +8813,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2022-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26"; - sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3"; + rev = "d12622b866c9eea5204a792517d11586c51715a2"; + sha256 = "0qys780fh1p7q1my17kq700csg06qfdbn0k210bai9qmd5hhccii"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -8921,12 +8933,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-06-06"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "fc70589a93d7bb42f4671ad75c8628a29995bcbe"; - sha256 = "00advlsr3rbmqrk5cpj8jli29sdi5i2bka2dz0fzsqz5zx3aqvk8"; + rev = "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803"; + sha256 = "1w00iklckrsqz9ggimbmbxjzysw596a30j8h249wbkczhym8bphp"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9151,12 +9163,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "89ca7265726cb07ca316562b13fd0c406588af65"; - sha256 = "17684bndaiw8gxi95lydc6xk2gyl5h62wfcmc07l687lpsy6c5l7"; + rev = "37c526857807e9550bdc8649700d4ceb47750ef2"; + sha256 = "18xlpim2d5vzf5ls1c0blnal8384cdmk1f2xry22kl4w6qall5mq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9572,12 +9584,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-05-22"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "6750b01970045affed30efe063d7e21b399f1efc"; - sha256 = "1zmk96ipzsaqfmm6qzvazg2hwyqgm1sbxxapmw1yk9kvz2jc2q8p"; + rev = "420d8f815b49d869a9ec57f156440bc85dd38bfd"; + sha256 = "05lhc8vk1s9sxkrbhx32n175vmgnp2vkarrmzav4pdk67pvh5bb2"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -14641,12 +14653,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-06-08"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "127c0a2ec8c6ca5f4c33902f004d302bd88a7c3e"; - sha256 = "0pmjazhskmdczj1azdyry8pcaxb9d23ap6imn5dg9z9ymximhk33"; + rev = "b7690c2d669fcb71d67bcdae5393004dad50948f"; + sha256 = "1l2xnypl9p2y82hnk9gkf8jhpdc9i591irqvd9b95a1m04d3lm6a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15098,12 +15110,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-06-09"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b0c4766b27d9ea2a6b958a247721da8c593f4ff3"; - sha256 = "0pz2q12bgg8jyyjnhcs2sn68qilm2z8w9h14gryy5klx94mdf8i6"; + rev = "a184a9cc6de11167c64f449b386dfe0b77a31a91"; + sha256 = "0862drqfv2qwi2di2kry1fc8xc9zcddyiw0r1lgjy7skjvjlyhid"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -15182,12 +15194,12 @@ final: prev: nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; - version = "2023-05-31"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "extensions"; - rev = "6c01bde163f2c73911df046a2a4883f45a04b611"; - sha256 = "11zcl9k2mqg58658x68q5msd3fiyw4zn8karpd20vwkk881s28nx"; + rev = "fda140ca8362f4ec38516701ed94561aa720f2b6"; + sha256 = "004yqdw1wjbpjk4hib13nky5q1hhcbw5dabccrifjka91av9riwl"; }; meta.homepage = "https://github.com/nvchad/extensions/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 74b280a361191..fdcfe7fbe5aa6 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -997,12 +997,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=dfe8919"; + version = "0.0.0+rev=2ae2021"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "dfe891922ccd2e7cef52eccb2775e1b576727165"; - hash = "sha256-xZUrAikgYoSCwFB6vWvV4K5S3sk0RAEUdDhOqLV9PVw="; + rev = "2ae2021d7b224fb6aa57b760e0d146059f943bb8"; + hash = "sha256-790DbJ/nOQvH8WH6MDZZcAKANQTg1fQPGXS4BI2UbmE="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -1509,12 +1509,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=b726123"; + version = "0.0.0+rev=0c8791f"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "b7261231aeaa8157240427716287fb5cbbcf44a2"; - hash = "sha256-q6/n7vjozuyoKZSupDRTlHX7vCFR5z69sr+PttQUnXI="; + rev = "0c8791fdfed9412ea44177f1108da618d8a0470f"; + hash = "sha256-rpDSlgRtBoQf2iOetyi8meqz0HfddCZalVHxnplR3iE="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1608,12 +1608,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=d42d40c"; + version = "0.0.0+rev=199cf06"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "d42d40c7adbc638cf9fb571a5bc984715bf083c2"; - hash = "sha256-fxvAe//NL/yPAmeHH8J3IOATNYzF9DS1NG8kBsfG+1g="; + rev = "199cf060eec9e0d427ae3c6fe46de2c830d0c1e9"; + hash = "sha256-s18lg8/ARxal2k3fSdVAPwso3uxTb5fy1L2LEnRsztY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7e0126433b33c..337ad3ad422f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -357,6 +357,7 @@ https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, https://github.com/neutaaaaan/iosvkem/,, https://github.com/twerth/ir_black/,, +https://github.com/Vigemus/iron.nvim/,HEAD, https://github.com/haya14busa/is.vim/,, https://github.com/vim-scripts/jdaddy.vim/,, https://github.com/davidhalter/jedi-vim/,, diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index fcaa29360124e..e35428a5a0d89 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "8.0"; + version = "8.0.1"; url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; - hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4="; + hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -56,7 +56,6 @@ in rec { ${updateScriptPreamble} major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_stable=$(get_latest_wine_version "$major.0") - latest_gecko=$(get_latest_lib_version wine-gecko) # Can't use autobump on stable because we don't want the path # <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>. @@ -64,30 +63,41 @@ in rec { set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" fi - autobump stable.gecko32 "$latest_gecko" - autobump stable.gecko64 "$latest_gecko" - do_update ''); }; unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.5"; + version = "8.10"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc="; - inherit (stable) gecko32 gecko64 patches; + hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28="; + inherit (stable) patches; + ## see http://wiki.winehq.org/Gecko + gecko32 = fetchurl rec { + version = "2.47.4"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; + hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y="; + }; + gecko64 = fetchurl rec { + version = "2.47.4"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; + hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8="; + }; + + ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.4.0"; + version = "8.0.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs="; }; updateScript = writeShellScript "update-wine-unstable" '' ${updateScriptPreamble} major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_unstable=$(get_latest_wine_version "$major.x") + latest_gecko=$(get_latest_lib_version wine-gecko) latest_mono=$(get_latest_lib_version wine-mono) update_staging() { @@ -96,6 +106,8 @@ in rec { } autobump unstable "$latest_unstable" "" update_staging + autobump unstable.gecko32 "$latest_gecko" + autobump unstable.gecko64 "$latest_gecko" autobump unstable.mono "$latest_mono" do_update @@ -105,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-vHV7x2U9B4P0E4tcQuMXHSS4NqN7rlnhC6v/t+0Qlh0="; + hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 263bfe490ba78..72e6376c6f723 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -52,6 +52,9 @@ , breeze-icons , oxygen + +, cudaSupport ? config.cudaSupport or false +, cudaPackages ? {} }: mkDerivation rec { @@ -63,7 +66,15 @@ mkDerivation rec { sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE="; }; - nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + doxygen + extra-cmake-modules + kdoctools + wrapGAppsHook + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); buildInputs = [ bison @@ -109,7 +120,9 @@ mkDerivation rec { marble oxygen threadweaver - ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + ]); cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a46706a747218..4379fc1cf8ea6 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "21.2.8"; + version = "21.3.7"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-XXtAd29r161rcamZM8QnkJ9mhQeJvqTL4Escdu95me8="; + hash = "sha256-f8QQA8qehB7wYJRoKizPxewBTVV64kxaBg2oTTNelBU="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-H77BfiH3Nqi1a2Uek8N8BgODzMBGgXrBvrcahrKisNo="; + hash = "sha256-gLt6a2Kq1LIzFiSnqLKKFTg8sd3Wrqsdys23SCFcrQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix new file mode 100644 index 0000000000000..84d33fa741ae4 --- /dev/null +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -0,0 +1,42 @@ +{ + appimageTools, + fetchurl, + lib, +}: let + pname = "upscayl"; + version = "2.5.5"; + + src = fetchurl { + url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; + hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in + appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader]; + + extraInstallCommands = '' + mkdir -p $out/share/{applications,pixmaps} + + cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png + + mv $out/bin/${pname}-${version} $out/bin/${pname} + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Free and Open Source AI Image Upscaler"; + homepage = "https://upscayl.github.io/"; + maintainers = with maintainers; [icy-thought]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + }; + } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 39f5ac401c6dc..f24c4432dd5b8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-1X7folCrXzNwSCWnepD9MFW9Ujx+PwoK0ih+zgEtA7o="; + hash = "sha256-gGgXnJbGbp6uK9tFK6wqHBKf+zWidF5u5wI2lclrJGk="; }; # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 3599785b736c8..00e53d3a82e32 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-2J5SVEtlLhZhDzqakOh/gt8XTkSaM9KBa0zCYM4UZAQ="; + sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 0918b91f48c52..026f5ae5014eb 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor, installShellFiles }: stdenv.mkDerivation rec { pname = "timewarrior"; @@ -12,10 +12,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake asciidoctor ]; + nativeBuildInputs = [ cmake asciidoctor installShellFiles ]; dontUseCmakeBuildDir = true; + postInstall = '' + installShellCompletion --cmd timew \ + --bash completion/timew-completion.bash + ''; + meta = with lib; { description = "A command-line time tracker"; homepage = "https://timewarrior.net"; diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 1dd2e9649fae4..ed111341e6f2a 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-SPHayFfYFpg1AOoe003xh7NGQLpvhd1C2k4IilgMqSw="; + hash = "sha256-p/mGobQyn5e7TpqjarVT7qBgYDWtX1VgXq814O8mTmI="; }; vendorHash = null; @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/GoogleContainerTools/kaniko"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jk ]; + maintainers = with lib.maintainers; [ jk qjoly ]; mainProgram = "executor"; }; } diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index c90460d1692b9..87aeb15141ab1 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.0.8"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-JGseXRUehRuH1kuTfmkAJcfRN3vM0zN7K8pnOfJ0LAs="; + hash = "sha256-t5tbgLXpJX2yWUdEW7zKb4A7B7budAOitOkL5I2CWpk="; }; - vendorHash = "sha256-Sc6HXJXkZ9vW6sxEKCTo6LDHeOGLTz0oN9JH11iUA/k="; + vendorHash = "sha256-D2Gi90seLPTM0ttlz7V6FW1ZMiVN22YLWKeTquXvagY="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index b21b50397e9e8..9fd167f6ebe83 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I="; + hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y="; }; vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY="; diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index fa0c10b00c205..4ee8501e8e136 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -1,28 +1,52 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, installShellFiles +}: +let + man = fetchurl { + url = "https://web.archive.org/web/20230608093053if_/http://www.ansikte.se/ARAGORN/Downloads/aragorn.1"; + hash = "sha256-bjD22dpkQZcGR0TwMxdpaed4VZZO2NUOoAw4o66iyS4="; + }; +in -stdenv.mkDerivation rec { - version = "1.2.38"; +stdenv.mkDerivation (finalAttrs: { + version = "1.2.41"; pname = "aragorn"; src = fetchurl { - url = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/Downloads/${pname}${version}.tgz"; - sha256 = "09i1rg716smlbnixfm7q1ml2mfpaa2fpn3hwjg625ysmfwwy712b"; + url = "http://www.ansikte.se/ARAGORN/Downloads/aragorn${finalAttrs.version}.c"; + hash = "sha256-kqMcxcCwrRbU17AZkZibd18H0oFd8TX+bj6riPXpf0o="; }; + dontUnpack = true; + + nativeBuildInputs = [ + installShellFiles + ]; + buildPhase = '' - $CC -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c + runHook preBuild + + $CC -O3 -ffast-math -finline-functions -o aragorn $src + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin && cp aragorn $out/bin - mkdir -p $out/man/1 && cp aragorn.1 $out/man/1 + installManPage ${man} + + runHook postInstall ''; meta = with lib; { description = "Detects tRNA, mtRNA, and tmRNA genes in nucleotide sequences"; - homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/"; - license = licenses.gpl2; + homepage = "http://www.ansikte.se/ARAGORN/"; + license = licenses.gpl3Plus; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 693bc306f21e0..c876f77e12f42 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ]; buildInputs = with ocamlPackages; [ - ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime_1 sedlex yojson ]; buildPhase = '' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 82996fe58857e..3a84e60d8fa5c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "16.0.2", - "repo_hash": "sha256-qAwO/5eyyYdpwSUg3lC8jOFoBc8H6yhgiHUbx+Ww6Uc=", + "version": "16.0.4", + "repo_hash": "sha256-xJWu0Ybrde+/hdOAvnOXIgzjzI++y3cZj85Ay3jLweI=", "yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.0.2-ee", + "rev": "v16.0.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.0.2", - "GITLAB_PAGES_VERSION": "16.0.2", + "GITALY_SERVER_VERSION": "16.0.4", + "GITLAB_PAGES_VERSION": "16.0.4", "GITLAB_SHELL_VERSION": "14.20.0", - "GITLAB_WORKHORSE_VERSION": "16.0.2" + "GITLAB_WORKHORSE_VERSION": "16.0.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e6dc566d4e10c..1d33244f7b668 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.0.2"; + version = "16.0.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-dtGtWV+lfTp9pKipAHx3FUIPaUobiRLsKYbULpuIgRY="; + sha256 = "sha256-173jbi+zJ4Tqgsv14An8gk+HisayCkoIBQW5MdpFZp4="; }; vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index edd2b0660912c..a863726c02ce5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.74.0"; + version = "3.76.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-fwMu45OFfNgFgMyQFWfvmM3Qv+co1ofsZLL44OoW9Wo="; + sha256 = "sha256-A9c7c/CXRs5mYSvDOdHkYOYkl+Qm6M330TBUeTnegBs="; }; vendorHash = "sha256-9rO2GmoFZrNA3Udaktn8Ek9uM8EEoc0I3uv4UEq1c1k="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3be7ff6f2ce2a..93f07edcdafa6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.0.2"; + version = "16.0.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-AUX6JIkElYZHjy/RFBVXRb3ZnbWkaNyApZNMT6zsBAU="; + sha256 = "sha256-nBhMwo5fSTaiJm6S1hyJ2KqjWRjtsvf1jhBQcJpDNQw="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b79b88137ddbd..700bb609ff9f0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.0.2"; + version = "16.0.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index acad2da3dc5b6..1abdd9bde0df5 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -364,7 +364,7 @@ def commit_container_registry(old_version: str, new_version: str) -> None: "git", "commit", "--message", - f"gitlab-container-registry: {old_version} -> {new_version}", + f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md", ], cwd=GITLAB_DIR, ) diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/data/fonts/intel-one-mono/default.nix index c7e5ab5ae29ac..1708534c6377d 100644 --- a/pkgs/data/fonts/intel-one-mono/default.nix +++ b/pkgs/data/fonts/intel-one-mono/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenvNoCC, fetchurl, unzip}: +{ lib, stdenvNoCC, fetchurl, unzip }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "intel-one-mono"; - version = "1.2.0"; + version = "1.2.1"; srcs = [ (fetchurl { - url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/otf.zip"; - sha256 = "sha256-VnXIaW77dRXvXB1Vr01xRQDMECltwzF/RMqGgAWnu5M="; - }) + url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip"; + hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0="; + }) (fetchurl { - url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/ttf.zip"; - sha256 = "sha256-kaz0DePeO8nvKVonYJhs5f2+ps/5Xo5psjg1hoxzaiU="; + url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip"; + hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY="; }) ]; @@ -31,9 +31,9 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Intel One Mono, an expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind"; homepage = "https://github.com/intel/intel-one-mono"; - changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${version}"; + changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${finalAttrs.version}"; license = licenses.ofl; - maintainers = [ maintainers.simoneruffini]; + maintainers = [ maintainers.simoneruffini ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 0c24c1e5c30e4..61f072a5c4fa4 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "24.1.1"; + version = "24.1.3"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-kzf/DFks/Ovhl6uMw5Bqhq+j+alrUd4E49jgSmp2E2k="; + hash = "sha256-LM47tiFZ5rDGgRqvGZEoCSpij4ZEoulnsAiM2ZlP7fY="; }; - npmDepsHash = "sha256-FKA3D05E5A0Z3wdCYLzoTyYKLay25sc3O61rOzkIN2E="; + npmDepsHash = "sha256-jW1g4n66AFP6fjp0vXKZiBQzDkWamSWQprIE+VkZ6rk="; nativeBuildInputs = [ remarshal diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 0903dc6970969..0904fbe2579f0 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -5,6 +5,7 @@ , python3 , meson , ninja +, sassc , vala , pkg-config , libgee @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.2.0"; + version = "7.3.0"; outputs = [ "out" "dev" ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-LU2eIeaNqO4/6dPUuzOQ/w4tx0dEm26JwZ87yQ16c4o="; + sha256 = "sha256-siFS8BiHVlDtM5odL0Lf1aRMoG6qqQOnbsXGKVyc218="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + sassc vala wrapGAppsHook4 ]; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 3240dcb31980d..af29757299d88 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -116,7 +116,7 @@ ocamlPackages.buildDunePackage rec { bls12-381 bls12-381-signature ptime - mtime + mtime_1 lwt_log secp256k1-internal resto diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 8f83c2055c62c..cc2a292a04932 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmwaw"; - version = "0.3.21"; + version = "0.3.22"; src = fetchurl { url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz"; - sha256 = "sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw="; + sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index fd62b98134357..f5af2e8284c86 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.13"; + version = "0.4.14"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk="; + sha256 = "sha256-xVEdlAngO446F50EZcHMKW7aBvyDcTVu9Egs2oaIadE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index e993cfcf8dede..dce5f18c4fb6d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,5 @@ -{ lib +{ config +, lib , fetchFromGitHub , cmake , SDL @@ -23,6 +24,8 @@ , rubberband , mkDerivation , which +, cudaSupport ? config.cudaSupport or false +, cudaPackages ? {} }: mkDerivation rec { @@ -55,9 +58,17 @@ mkDerivation rec { ladspa-sdk ladspaPlugins rubberband - ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + ]); - nativeBuildInputs = [ cmake which pkg-config ]; + nativeBuildInputs = [ + cmake + which + pkg-config + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); outputs = [ "out" "dev" ]; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 7e13ee15364e2..830fc2d956cce 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -44,6 +44,7 @@ mapAliases { "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 eslint_d = pkgs.eslint_d; # Added 2023-05-26 manta = pkgs.node-manta; # Added 2023-05-06 + readability-cli = pkgs.readability-cli; # Added 2023-06-12 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 635677feb6a1d..8270ebf8665b0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -271,7 +271,6 @@ , "react-native-cli" , "react-static" , "react-tools" -, "readability-cli" , "redoc-cli" , "remod-cli" , "reveal.js" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a4110da48ed1a..e784b8159fb65 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -131037,187 +131037,6 @@ in bypassCache = true; reconstructLock = true; }; - readability-cli = nodeEnv.buildNodePackage { - name = "readability-cli"; - packageName = "readability-cli"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.4.tgz"; - sha512 = "KNVRUT4JKrnNCkD4IuMm9zU5bkFc699lue7xT66lIhjXTARwKlBRwiSZYgx7mCKC/Zj40dw89UULFAyihnXLXQ=="; - }; - dependencies = [ - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@mozilla/readability-0.4.4" - sources."@tootallnate/once-2.0.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.2" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" - sources."bufferutil-4.0.7" - sources."canvas-2.11.2" - sources."chownr-2.0.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."cssom-0.5.0" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - (sources."data-urls-3.0.2" // { - dependencies = [ - sources."whatwg-url-11.0.0" - ]; - }) - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.1" - sources."domexception-4.0.0" - sources."dompurify-2.4.5" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."escalade-3.1.1" - sources."escodegen-2.0.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" - sources."form-data-4.0.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-3.0.0" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-19.0.0" - sources."levn-0.3.0" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.17.0" - (sources."node-fetch-2.6.11" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-gyp-build-4.6.0" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.5" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."optionator-0.8.3" - sources."parse5-6.0.1" - sources."path-is-absolute-1.0.1" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."querystringify-2.2.0" - sources."readable-stream-3.6.2" - sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - sources."semver-7.5.1" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."symbol-tree-3.2.4" - sources."tar-6.1.15" - sources."tough-cookie-4.1.3" - sources."tr46-3.0.0" - sources."type-check-0.3.2" - sources."universalify-0.2.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-3.0.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-encoding-2.0.0" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-10.0.0" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-8.13.0" - sources."xml-name-validator-4.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Firefox Reader Mode in your terminal - get useful text from a web page using Mozilla's Readability library"; - homepage = "https://gitlab.com/gardenappl/readability-cli#readme"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 27665af01e4c8..11bb7a0da5991 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -433,26 +433,6 @@ final: prev: { ''; }; - readability-cli = prev.readability-cli.override (oldAttrs: { - # Wrap src to fix this build error: - # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..." - # - # Need to wrap the source, instead of patching in patchPhase, because - # buildNodePackage only unpacks sources in the installPhase. - src = pkgs.srcOnly { - src = oldAttrs.src; - name = oldAttrs.name; - patchPhase = "chmod a-x readable.ts"; - }; - - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ - pixman - cairo - pango - ]; - }); - reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index f421e59ce7da8..8b8833b14eb6e 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -9,6 +9,10 @@ buildDunePackage rec { hash = "sha256-q3OyGLajAmfSu8QzEtzzE5gbiwvsVV2SsGuHZkst0w4="; }; + postPatch = '' + substituteInPlace src/dune --replace 'libraries unix bytes' 'libraries unix' + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix index 835570dc9ab6b..7e5f256a1a743 100644 --- a/pkgs/development/ocaml-modules/bz2/default.nix +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionAtLeast ocaml.version "5.0" then throw "bz2 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 6cef074498d62..18ea3defa1936 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -1,46 +1,27 @@ -{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }: +{ lib, buildDunePackage, ocaml, fetchFromGitLab, extlib, ounit2 }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-cudf"; - version = "0.9"; +buildDunePackage rec { + pname = "cudf"; + version = "0.10"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; - sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw="; - }; + minimalOCamlVersion = "4.07"; - buildFlags = [ - "all" - "opt" - ]; + src = fetchFromGitLab { + owner = "irill"; + repo = pname; + rev = "v${version}"; + hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM="; + }; - nativeBuildInputs = [ - findlib - ocaml - ocamlbuild - pkg-config - perl - ]; - buildInputs = [ - glib - stdlib-shims - ]; propagatedBuildInputs = [ extlib ]; - checkTarget = [ - "all" - "test" - ]; checkInputs = [ - ounit + ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; - installFlags = [ "BINDIR=$(out)/bin" ]; - meta = with lib; { description = "A library for CUDF format"; homepage = "https://www.mancoosi.org/cudf/"; diff --git a/pkgs/development/ocaml-modules/domain-local-await/default.nix b/pkgs/development/ocaml-modules/domain-local-await/default.nix new file mode 100644 index 0000000000000..b5c4c980f0630 --- /dev/null +++ b/pkgs/development/ocaml-modules/domain-local-await/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, fetchurl +, mdx +}: + +buildDunePackage rec { + pname = "domain-local-await"; + version = "0.2.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "2DCJsI3nGPtbXnU8jRvzR1iNAkNuekVy4Lid1qnHXDo="; + }; + + checkInputs = [ + mdx + ]; + + nativeCheckInputs = [ + mdx.bin + ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; + changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + description = "A scheduler independent blocking mechanism"; + license = with lib.licenses; [ bsd0 ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 1146da5d3067f..4210dde025c0a 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchFromGitLab -, camlzip, ocamlgraph, parmap, re, stdlib-shims -, base64, bz2, extlib, cudf -, dpkg, git, ocaml, ounit, python39, python39Packages +, ocamlgraph, parmap, re, stdlib-shims +, base64, extlib, cudf +, ocaml, ounit }: buildDunePackage rec { @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; - minimalOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.07"; buildInputs = [ parmap @@ -24,8 +23,6 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 - bz2 - camlzip cudf extlib ocamlgraph @@ -33,17 +30,10 @@ buildDunePackage rec { stdlib-shims ]; - nativeCheckInputs = [ - python39 # Replaces: conf-python-3 - python39Packages.pyyaml # Replaces: conf-python3-yaml - git - ]; checkInputs = [ - dpkg # Replaces: conf-dpkg ounit ]; - doCheck = false; # Tests are failing. - # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { description = "Dose library (part of Mancoosi tools)"; diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix new file mode 100644 index 0000000000000..c925928433a02 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildDunePackage +, bigstringaf +, cstruct +, domain-local-await +, dune-configurator +, fetchurl +, fmt +, hmap +, lwt-dllist +, mtime +, optint +, psq +, alcotest +, crowbar +, mdx +}: + +buildDunePackage rec { + pname = "eio"; + version = "0.10"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "OQ94FFB7gTPWwl46Z6dC1zHHymYlKyh7H7DjrU0Q7sw="; + }; + + propagatedBuildInputs = [ + bigstringaf + cstruct + domain-local-await + fmt + hmap + lwt-dllist + mtime + optint + psq + ]; + + checkInputs = [ + alcotest + crowbar + mdx + ]; + + nativeCheckInputs = [ + mdx.bin + ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; + changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + description = "Effects-Based Parallel IO for OCaml"; + license = with lib.licenses; [ isc ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/development/ocaml-modules/eio/linux.nix b/pkgs/development/ocaml-modules/eio/linux.nix new file mode 100644 index 0000000000000..62f9800790b58 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/linux.nix @@ -0,0 +1,23 @@ +{ buildDunePackage +, eio +, fmt +, logs +, uring +}: + +buildDunePackage { + pname = "eio_linux"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + propagatedBuildInputs = [ + eio + fmt + logs + uring + ]; +} diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix new file mode 100644 index 0000000000000..32a6affef0e06 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -0,0 +1,23 @@ +{ lib +, stdenv +, buildDunePackage +, eio +, eio_posix +, uring +}: + +buildDunePackage { + pname = "eio_main"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + propagatedBuildInputs = [ + eio_posix + ] ++ lib.optionals stdenv.isLinux [ + uring + ]; +} diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix new file mode 100644 index 0000000000000..6c3042e65fae3 --- /dev/null +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -0,0 +1,28 @@ +{ buildDunePackage +, dune-configurator +, eio +, fmt +, logs +, iomux +}: + +buildDunePackage { + pname = "eio_posix"; + inherit (eio) meta src version; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + dontStrip = true; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + eio + fmt + logs + iomux + ]; +} diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix new file mode 100644 index 0000000000000..f1dc827a32d09 --- /dev/null +++ b/pkgs/development/ocaml-modules/iomux/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchurl +, buildDunePackage +, dune-configurator +, alcotest +}: + +buildDunePackage rec { + pname = "iomux"; + version = "0.3"; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/haesbaert/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "zNJ3vVOv0BEpHLiC8Y610F87uiMlfYNo28ej0H+EU+c="; + }; + + buildInputs = [ + dune-configurator + ]; + + checkInputs = [ + alcotest + ]; + + meta = { + homepage = "https://github.com/haesbaert/ocaml-${pname}"; + description = "IO Multiplexers for OCaml"; + license = with lib.licenses; [ isc ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index 4aaaf11450bbf..3974024818398 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, stdenv -, ocaml, findlib, ocamlbuild +, fetchpatch +, ocaml, findlib, ocamlbuild, camlp-streams , ctypes, mariadb, libmysqlclient }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") @@ -14,8 +15,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; }; + patches = fetchpatch { + url = "https://github.com/andrenth/ocaml-mariadb/commit/9db2e4d8dec7c584213d0e0f03d079a36a35d9d5.patch"; + hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; + }; + + postPatch = '' + substituteInPlace setup.ml --replace '#use "topfind"' \ + '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"' + ''; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ mariadb libmysqlclient ]; + buildInputs = [ mariadb libmysqlclient camlp-streams ocamlbuild ]; propagatedBuildInputs = [ ctypes ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/mtime/1_x.nix b/pkgs/development/ocaml-modules/mtime/1_x.nix new file mode 100644 index 0000000000000..e10f2b7d7a3ba --- /dev/null +++ b/pkgs/development/ocaml-modules/mtime/1_x.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, mtime }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "mtime is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-mtime"; + version = "1.4.0"; + + src = fetchurl { + url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; + sha256 = "VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; + + inherit (topkg) buildPhase installPhase; + inherit (mtime) meta; +} diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 3ca6e4ac973b7..ff53efb9d9a4e 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - version = "1.4.0"; + version = "2.0.0"; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "sha256-VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; + sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 18e1975b698d5..a8885aa27f274 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, buildDunePackage, dune-configurator }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator }: buildDunePackage rec { pname = "parmap"; - version = "1.2.4"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "sha256-BTkSEjIK3CVNloJACFo6eQ6Ob9o/cdrA9xuv87NKas4="; + src = fetchFromGitHub { + owner = "rdicosmo"; + repo = pname; + rev = version; + hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index 399f499b380cc..ab357dc618568 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.5.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U="; + hash = "sha256-lMgD315movmr+u+8BMaqhb1L46Wf0Ak56VAT2jpg1kM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index e1f5758377e13..03aa8543ffbe7 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo="; + hash = "sha256-VVfDH9QWF9gBhd2pOjKH5+VdNSvl1q0iauAbo88wNaM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 16a496ad2c3b3..e73d330044475 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index 6a4fcdb265f47..94a9b413c4fd1 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -1,25 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { pname = "keepalive"; version = "0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1"; + hash = "sha256-PGuW+QYqWnYCLwydQenvVVLYCxyt1PzMG/jxg7odHsE="; }; + patches = [ + # https://github.com/wikier/keepalive/pull/11 + (fetchpatch { + name = "remove-use_2to3.patch"; + url = "https://github.com/wikier/keepalive/commit/64393f6c5bf9c69d946b584fd664dd4df72604e6.patch"; + hash = "sha256-/G1eEt8a4Qz7x5oQnDZZD/PIQwo9+oPZoy9OrXGHvR4="; + excludes = ["README.md"]; + }) + ]; + # No tests included doCheck = false; meta = with lib; { - description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; + description = "An HTTP handler for `urllib` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; - license = licenses.asl20; - broken = true; # uses use_2to3, which is no longer supported for setuptools>=58 + license = licenses.lgpl21Plus; }; - } diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 4ccdbd94c1287..2865da5cd7aa4 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.7"; + version = "0.27.8"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-C952ZBp458kPge9ZTUBY6EoPh6Vrq9D2y1WQpCG1rEQ="; + hash = "sha256-7D7oi3NCqq0QSW66MqYMmc9ga02T5G4xFVic4PjgFRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index ee02705f35554..cb26153044494 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -86,8 +86,9 @@ dependencies = [ [[package]] name = "arrow2" -version = "0.17.0" -source = "git+https://github.com/ritchie46/arrow2?branch=polars_2023-04-29#0a711a1a371edba0fa0f18c61e16bbf8096a3dcc" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ae0428d69ab31d7b2adad22a752d6f11fef2e901d2262d0cad4f5cb08b7093" dependencies = [ "ahash", "arrow-format", @@ -104,8 +105,6 @@ dependencies = [ "futures", "getrandom", "hash_hasher", - "indexmap", - "json-deserializer", "lexical-core", "lz4", "multiversion", @@ -139,7 +138,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -150,7 +149,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -184,9 +183,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" [[package]] name = "bitflags" @@ -228,9 +227,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -249,16 +248,10 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -331,9 +324,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -342,31 +335,21 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "comfy-table" version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -487,60 +470,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.15", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] name = "dyn-clone" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -584,9 +513,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -672,7 +601,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -706,15 +635,6 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] name = "getrandom" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -735,7 +655,7 @@ checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -765,11 +685,10 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "halfbrown" -version = "0.1.18" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2a3c70a9c00cc1ee87b54e89f9505f73bb17d63f1b25c9a462ba8ef885444f" +checksum = "f985624e90f861184145c13b736873a0f83cdb998a292dbb0653598ab03aecbf" dependencies = [ - "fxhash", "hashbrown 0.13.2", "serde", ] @@ -819,11 +738,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -842,12 +761,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -888,11 +806,10 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7741301a6d6a9b28ce77c0fb77a4eb116b6bc8f3bef09923f7743d059c4157d3" +checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" dependencies = [ - "ctor", "ghost", ] @@ -939,23 +856,14 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] [[package]] -name = "json-deserializer" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f63b421e16eb4100beb677af56f0b4f3a4f08bab74ef2af079ce5bb92c2683f" -dependencies = [ - "indexmap", -] - -[[package]] name = "jsonpath_lib" version = "0.3.0" source = "git+https://github.com/ritchie46/jsonpath?branch=improve_compiled#24eaf0b4416edff38a4d1b6b17bc4b9f3f047b4b" @@ -1040,15 +948,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -1078,15 +986,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -1094,9 +1002,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1105,15 +1013,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "lock_api" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1154,10 +1053,11 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] @@ -1187,18 +1087,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1212,14 +1112,14 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "multiversion" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a87eede2251ca235e5573086d01d2ab6b59dfaea54c2be10f9320980f7e8f7" +checksum = "8cda45dade5144c2c929bf2ed6c24bebbba784e9198df049ec87d722b9462bd1" dependencies = [ "multiversion-macros", "target-features", @@ -1227,9 +1127,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af1abf82261d780d114014eff4b555e47d823f3b84f893c4388572b40e089fb" +checksum = "04bffdccbd4798b61dce08c97ce8c66a68976f95541aaf284a6e90c1d1c306e1" dependencies = [ "proc-macro2", "quote", @@ -1373,7 +1273,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1471,9 +1371,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "planus" @@ -1486,7 +1386,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.28.0" +version = "0.30.0" dependencies = [ "getrandom", "polars-core", @@ -1500,7 +1400,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-core", "polars-lazy", @@ -1509,9 +1409,10 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", + "atoi", "chrono", "chrono-tz", "hashbrown 0.13.2", @@ -1524,7 +1425,7 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1557,7 +1458,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "regex", @@ -1566,7 +1467,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1587,6 +1488,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-error", + "polars-json", "polars-time", "polars-utils", "rayon", @@ -1599,8 +1501,24 @@ dependencies = [ ] [[package]] +name = "polars-json" +version = "0.30.0" +dependencies = [ + "ahash", + "arrow2", + "fallible-streaming-iterator", + "hashbrown 0.13.2", + "indexmap", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "simd-json", +] + +[[package]] name = "polars-lazy" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "bitflags", @@ -1609,6 +1527,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-io", + "polars-json", "polars-ops", "polars-pipe", "polars-plan", @@ -1621,7 +1540,7 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.28.0" +version = "0.30.0" dependencies = [ "argminmax", "arrow2", @@ -1632,6 +1551,7 @@ dependencies = [ "memchr", "polars-arrow", "polars-core", + "polars-json", "polars-utils", "serde", "serde_json", @@ -1640,7 +1560,7 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.28.0" +version = "0.30.0" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1660,7 +1580,7 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1682,7 +1602,7 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "polars-error", @@ -1691,7 +1611,7 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-arrow", "polars-core", @@ -1704,7 +1624,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "atoi", @@ -1723,8 +1643,10 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.28.0" +version = "0.30.0" dependencies = [ + "ahash", + "hashbrown 0.13.2", "once_cell", "rayon", "smartstring", @@ -1739,16 +1661,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.17.11" +version = "0.18.0" dependencies = [ "ahash", "built", @@ -1840,9 +1762,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1926,13 +1848,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.0", + "regex-syntax 0.7.2", ] [[package]] @@ -1943,9 +1865,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rle-decode-fast" @@ -1987,12 +1909,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2009,22 +1925,22 @@ checksum = "e6b44e8fc93a14e66336d230954dda83d18b4605ccace8fe09bc7514a71ad0bc" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2071,11 +1987,14 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.7.0" -source = "git+https://github.com/ritchie46/simd-json?branch=alignment#cbd37361769d900620944618a39123f37edf3d83" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b001e6c10fcba79ac15990241d37c3f8c6ba4f9a14ee35fcebc0c067514b83a" dependencies = [ + "ahash", "halfbrown", "lexical-core", + "once_cell", "serde", "serde_json", "simdutf8", @@ -2139,9 +2058,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67dc6ef36edb658196c3fef0464a80b53dbbc194a904e81f9bd4190f9ecc5b" +checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" dependencies = [ "log", ] @@ -2205,9 +2124,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -2216,9 +2135,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2230,24 +2149,15 @@ dependencies = [ [[package]] name = "target-features" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24840de800c1707d75c800893dbd727a5e1501ce921944e602f0698167491e36" +checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "thiserror" @@ -2266,7 +2176,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2297,16 +2207,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2364,9 +2274,9 @@ dependencies = [ [[package]] name = "value-trait" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995de1aa349a0dc50f4aa40870dce12961a30229027230bad09acd2843edbe9e" +checksum = "09a5b6c8ceb01263b969cac48d4a6705134d490ded13d889e52c0cfc80c6945e" dependencies = [ "float-cmp", "halfbrown", @@ -2400,9 +2310,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2410,24 +2320,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2437,9 +2347,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2447,22 +2357,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-timer" @@ -2481,9 +2391,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2506,15 +2416,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2539,6 +2440,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 264b7a28b4da5..49d23e2d07e01 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -10,12 +10,12 @@ }: let pname = "polars"; - version = "0.17.11"; + version = "0.18.0"; # Can't update to >0.18.0 until we get rust 1.71 rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-zNp/77an9daUfHQ+HCaHtZzaq0TT9F+8aH3abrF7+YA="; + hash = "sha256-uzo8KPEegaVuzrfKUmsHheQfmm9hVMgkNJMWdfqDrw8="; }; in buildPythonPackage { @@ -28,16 +28,14 @@ buildPythonPackage { # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package preBuild = '' - cd py-polars - #sed -i 's/version = "0.17.11"/version = "${version}"/g' Cargo.lock + cd py-polars + #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "arrow2-0.17.0" = "sha256-jjrwTP+ZKem9lyrmAWJ+t9cZBkGqAR1VlgNFXDtx1LA="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - "simd-json-0.7.0" = "sha256-tlz6my4vhUQIArPonJml8zIyk1sbbDSORKp3cmPUUSI="; }; }; cargoRoot = "py-polars"; @@ -66,7 +64,6 @@ buildPythonPackage { # ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index d24d3f362eb32..3edf1adf02843 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, isPy27 , fetchPypi , pkg-config , dbus @@ -15,9 +14,7 @@ , pythonOlder , withMultimedia ? true , withWebSockets ? true -# FIXME: Once QtLocation is available for Qt6 enable this -# https://bugreports.qt.io/browse/QTBUG-96795 -#, withLocation ? true +, withLocation ? true # Not currently part of PyQt6 #, withConnectivity ? true , withPrintSupport ? true @@ -26,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.0"; + version = "6.5.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uXy0vpssiZeQTqZozzsKSuWCIZb3eSWQ0F7N5iFqn7w="; + hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M="; }; patches = [ @@ -83,7 +80,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; buildInputs = with qt6Packages; [ @@ -97,7 +94,7 @@ buildPythonPackage rec { ] # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; propagatedBuildInputs = [ @@ -132,7 +129,7 @@ buildPythonPackage rec { ++ lib.optional withWebSockets "PyQt6.QtWebSockets" ++ lib.optional withMultimedia "PyQt6.QtMultimedia" # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" - # ++ lib.optional withLocation "PyQt6.QtPositioning" + ++ lib.optional withLocation "PyQt6.QtPositioning" ; meta = with lib; { diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 59c3b8ae8eefb..a8807bb9f1756 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.16.9"; + version = "2.17.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NHMrReRw8x7N7vy8BqmKx9fDfQYjlOWY7ChdLz+qGxQ="; + hash = "sha256-NkSyX+ajNFwkgO0Lq4UfrvjADgHXiT2oLp2RCQDJv0w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 78b3486c72e60..77d5ea8a4eba2 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = licenses.asl20; maintainers = with maintainers; [ mhaselsteiner ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a10b051952aaf..ca7e0ff61ca8e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.285"; + version = "2.3.288"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e451r8md6HOOhEIsjFitQ0IGacQ6bhA/jBFmaz/zVv8="; + hash = "sha256-m/AZfHT9ZW4K82WHxlj1iddh+Na4+Rvwgl46fdHRVhA="; }; patches = [ diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 91d90044b5a09..5ec86e7031274 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.21"; + version = "3.16.23"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iNj3E5JtvOHAiEC+81KnAb32TWi+Zq8Av24oLm01ty4="; + sha256 = "sha256-Ofem3oSwas5X3D8zSzS5HpJANR6TNVSJ8hWb13hr0W4="; }; subPackages = [ "." ]; - vendorHash = "sha256-29LwvekhevOn/1zrtQEZWqeQMEAN2xPxSRzas/5EhVM="; + vendorHash = "sha256-wuT58Weyc8AB9i5bVe0696BGRWsl814Fz9bmnuJwgPM="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/development/tools/json2tsv/default.nix index 9f074fd8b2e54..49d0812eba444 100644 --- a/pkgs/development/tools/json2tsv/default.nix +++ b/pkgs/development/tools/json2tsv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "json2tsv"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz"; - hash = "sha256-BOamDWszYDqKGdKOlAOLY7F9ScZaBJXNdhz38iYW3ps="; + hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index c5b78e6e48293..4323a6ab52319 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] ++ lib.optionals stdenv.isDarwin [ "test.basedir" + "test.fileclone" # flaky on hydra (possibly filesystem-specific?) "test.multi_arch" "test.nocpp2" ]; diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index f15c8cc43bb63..1944b3d73adc2 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.2.1"; + version = "10.2.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-gmxcr+WIQw/SeEvJpSFLKOuTb36qUe6WdlVWIq5tClo="; + hash = "sha256-UAxqywIMrP42Nul0GV6mkKkXtnS7ah9rl4y1ykpJsxM="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index fcbe980031516..7ece35e9c94ea 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.0.0"; + version = "1.0.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Ua8ENLxmfYv6zF/uihT49ZpphFaC3zS882cttJ/rvc4="; + sha256 = "sha256-KSpfi8hXMz5A5ra+oxOmKieKpjCTB565JDNrRwtIwxU="; }; - cargoHash = "sha256-IzjOAy9zTtsD4jHjI1oVXBg7Si1AeDNH8ATK4yO8WVw="; + cargoHash = "sha256-tmbJBxQoXpHmBJI1z42Kg1XrZ+9+DE5nLmkIp5cWCF4="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 5a1a710ba3b78..3f23b8c1344db 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -41,7 +41,7 @@ assert (versionAtLeast version "4.9"); DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; - REFCOUNT_FULL = whenOlder "5.5" yes; + REFCOUNT_FULL = whenOlder "5.4.208" yes; # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 758acecc93ecd..92955d9d8e91b 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "23.3.2.37"; + version = "23.3.3.52"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - hash = "sha256-G/5KZ4vd9w5g0yB6bzyM8VX3l32Di+a6Ll87NK3GOrg="; + hash = "sha256-yeoL3HA1wRDg2+t3FtrM4wBtuu94Lpe4xxGxc09duQI="; name = "clickhouse-${rev}.tar.gz"; postFetch = '' # compress to not exceed the 4GB output limit diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index ee8145dca40c1..171724598d44b 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.15.2"; + version = "1.15.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-8C06arK7QnrT5qQZWBjamOOlejy69pxRHXKoncfMKAc="; + sha256 = "sha256-Xe+baALN8Ow6vjneWAvC65cBSsrMAsdxjEQRBcvWxCw="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-Vcl23cWErAycmza1CS9rl+xJ7CBuocMAdSG9AA88SrQ="; + vendorHash = "sha256-tbwX/uF9+yIhd+KSGF2v7HjxGtfaZYSm+1GIspQmC9A="; doCheck = false; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 228fc367bef9d..7420aa339946c 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-P2CjoT7D9o6Ev6fhna/2Y8grzx3pbk9T8iRlJedzono="; + sha256 = "sha256-j6ykTima0pFfoACIerFjJjHqaHCcYs418RC/5yHs8hQ="; }; prePatch = '' diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix new file mode 100644 index 0000000000000..f0c104f619ab1 --- /dev/null +++ b/pkgs/servers/gotosocial/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchurl +, fetchFromGitHub +, buildGoModule +, nixosTests +}: +let + owner = "superseriousbusiness"; + repo = "gotosocial"; + + version = "0.9.0"; + source-hash = "sha256-UZRIQTdVESCYv2KW7HUS2c4bS5qnB7wdwiYAgEJ60fU="; + web-assets-hash = "sha256-OvgAr3obsK1JndLKmnjNY06dEbQKyP4xG/viBjCivvs="; + + web-assets = fetchurl { + url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; + hash = web-assets-hash; + }; +in +buildGoModule rec { + inherit version; + pname = repo; + + src = fetchFromGitHub { + inherit owner repo; + rev = "refs/tags/v${version}"; + hash = source-hash; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + postInstall = '' + tar xf ${web-assets} + mkdir -p $out/share/gotosocial + mv web $out/share/gotosocial/ + ''; + + # tests are working only on x86_64-linux + doCheck = stdenv.isLinux && stdenv.isx86_64; + + passthru.tests.gotosocial = nixosTests.gotosocial; + + meta = with lib; { + homepage = "https://gotosocial.org"; + changelog = "https://github.com/superseriousbusiness/gotosocial/releases/tag/v${version}"; + description = "Fast, fun, ActivityPub server, powered by Go"; + longDescription = '' + ActivityPub social network server, written in Golang. + You can keep in touch with your friends, post, read, and + share images and articles. All without being tracked or + advertised to! A light-weight alternative to Mastodon + and Pleroma, with support for clients! + ''; + maintainers = with maintainers; [ misuzu ]; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 8055990c1a231..c095c86108d77 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - hash = "sha256-OIvLgI853qQ4Nc8xBKfwWKohyW/b53UBxpNauAgOS48="; + hash = "sha256-xgmh5oFI6Pd0q31zJluLtbhF0ZfuXy2cEPk06sW9SH8="; }; - vendorHash = "sha256-BfEnMGP3IMtJwOjZRFpNc58PaQ116U/p9jRsiGdIpCQ="; + vendorHash = "sha256-LKHs6KHdXtCMImYiUmi2pfMbfpt9alpvWS4rlo5kuCI="; proxyVendor = true; # darwin/linux hash mismatch ldflags = let diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix new file mode 100644 index 0000000000000..4d4f0516e3040 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -0,0 +1,19 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-clickhouse-datasource"; + version = "3.1.0"; + zipHash = { + x86_64-linux = "sha256-x/Uruhk7mhPbsfAcST6tLnxJDd4vlqIkOUI4nAOZN50="; + aarch64-linux = "sha256-nNAIKoXYyhT1fwSB/a+uD1XUe5RxE9MYrbtHHx6T1fI="; + x86_64-darwin = "sha256-u9KRR7k/ktMu1KO5tpN/A+x48yDyXXPEnSNEx0hkT8Y="; + aarch64-darwin = "sha256-ME/LkVXoN1Sp4L3e9qFXgBfa7mCLRyKfEGHiBbaN8iY="; + }; + meta = with lib; { + description = "Connects Grafana to ClickHouse"; + license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ moody yuka ]; + platforms = attrNames zipHash; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 3b3cee88fd7a1..7894e759b168c 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -1,14 +1,27 @@ -{ stdenvNoCC, fetchurl, unzip }: +{ stdenvNoCC, fetchurl, unzip, lib }: { pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: -stdenvNoCC.mkDerivation ({ +let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({ inherit pname version; - src = fetchurl { - name = "${pname}-${version}.zip"; - url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; - hash = zipHash; - }; + src = if lib.isAttrs zipHash then + fetchurl { + name = "${pname}-${version}-${plat}.zip"; + hash = zipHash.${plat} or (throw "unsupported system"); + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + { + x86_64-linux = "?os=linux&arch=amd64"; + aarch64-linux = "?os=linux&arch=arm64"; + x86_64-darwin = "?os=darwin&arch=amd64"; + aarch64-darwin = "?os=darwin&arch=arm64"; + }.${plat} or (throw "unknown system"); + } + else + fetchurl { + name = "${pname}-${version}.zip"; + hash = zipHash; + url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download"; + } + ; nativeBuildInputs = [ unzip ]; @@ -25,4 +38,4 @@ stdenvNoCC.mkDerivation ({ meta = { homepage = "https://grafana.com/grafana/plugins/${pname}"; } // meta; -} // (builtins.removeAttrs args [ "pname" "version" "sha256" "meta" ])) +} // (builtins.removeAttrs args [ "zipHash" "pname" "version" "sha256" "meta" ])) diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 163de4c96025c..8bbd738f7ab92 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -6,6 +6,7 @@ doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; + grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index 54ad80228191c..fa0998b31772b 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-ZsRN/h96Lt0znXmtMGjR6TXKa1ka0rbk/XXNVolBNk8="; + hash = "sha256-UaflfU27GR8VK6AduPDBcQyO3u1uX6YlGP9O4LFwn9A="; }; - vendorHash = "sha256-vW/iODlOWD8JmoDO6Ty+Eajoj0IAHak/abWW2OSp34M="; + vendorHash = "sha256-cIl35wbdPCQJLudXphMbjO2Ztd/H1clI43xaMU6T0D4="; preCheck = let skippedTests = [ diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix new file mode 100644 index 0000000000000..2abf5ace252a8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "junos-czerwonk-exporter"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "junos_exporter"; + rev = "${version}"; + sha256 = "sha256-XYISwq6xcVKhXUK6j22pQ5eOfuKNH0uXOEK1MUzSq90="; + }; + + vendorSha256 = "sha256-IV0FZb1rjOMLf+vkzz/ZxUBMFD8VRDS51Wdud/yz32E="; + + meta = with lib; { + description = "Exporter for metrics from devices running JunOS"; + homepage = "https://github.com/czerwonk/junos_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4f8108472dc52..45a793ee2abf2 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.26.3"; + version = "1.27.0"; excludedPackages = "test"; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-B1jYtJFj9hQT2ub9KaeoiWJZN9CHyZzA7juk0JZ0ZAo="; + sha256 = "sha256-uA3vmFVYTr0iUDFpYPHSzpsCXzGE0qdIw+5LoVzfkug="; }; - vendorHash = "sha256-dwUVmUzQn66Pz4vY9JIHVImiM4FwbAPZctSach/jH4c="; + vendorHash = "sha256-CHYJOnPfE7En9PXnpt+nWFPRDMh8RPDcgOS/gJu9l3w="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index cf13954ad8630..c200c867bfe23 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.1.0", - "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4" + "version": "4.1.2", + "sha256": "003p0985fr3l09qpw44rhys3dp9zl2bl46vasix18p2cxq0j8sw5" } diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index f43a9576b5ccd..4756ae22ab7d1 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sE+HeXg6JovLXhFFJhgsASfObvzgeYX+MjwI5b7G0gI="; + sha256 = "sha256-UsoNsGS2JWiI1EotUXjKwtR0WIk+z/5/a0AJySw4xnQ="; fetchSubmodules = true; }; - cargoHash = "sha256-7ykVKPjCFwpLqdPiWlxO/rBofgbfv+U3aM50RhzjGVY="; + cargoHash = "sha256-lQVWpIhWTUQTcMaPJ1z8wJI7/EBU+YoFkC92JhLCxe8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 4d9b0fce6f2e8..20ef33ea32160 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-5cVfZk2bFop/EQjvfObiN/AF/iv3DqDIKb/BkbEyKbE="; + hash = "sha256-01d5pH7QK72orttbelTzqwpDBS9+qYYgn7cc9qGZ/RI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch index c8840db42e7be..0731e64fefd0c 100644 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -1,10 +1,11 @@ --- a/plugins/GeoIp2/config/config.php +++ b/plugins/GeoIp2/config/config.php -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ <?php return [ - 'path.geoip2' => DI\string('{path.root}/misc/'), + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + 'geopip2.ispEnabled' => true ]; \ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 57b70abe46690..fbf16151ef106 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,19 +3,18 @@ let versions = { matomo = { - version = "4.10.1"; - sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U="; + version = "4.14.2"; + hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo="; }; - matomo-beta = { - version = "4.11.0"; + version = "4.14.3"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc2"; - sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8="; + beta = "b6"; + hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg="; }; }; - common = pname: { version, sha256, beta ? null }: + common = pname: { version, hash, beta ? null }: let fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; @@ -27,7 +26,7 @@ let src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -109,7 +108,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ]; }; }; in diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0fea9e35bd298..393fc0d3df208 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { version = "3.69.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-oXsU4h4CwukJHttYLT7JiW2He8Yq5qAwnxL8+G5FIpc="; + sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index aa7d9727fb89a..8c9d1513b2852 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI="; + sha256 = "sha256-h67c8c6CI1lJRu9Eiz3/Ax/MrgU/TPIAdLrLcSDF6zY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index bf17556b03a6c..ea8e304099c0b 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "str4d"; repo = pname; rev = "v${version}"; - hash = "sha256-JLtP3zimNL1UIFsbvtV2JO3PVV6w9VnfjpROs2UoFcU="; + hash = "sha256-hFuuwmwe0ti4Y8mSJyNqUIhZjFC6qtv6W5cwtNjPUFQ="; }; cargoHash = "sha256-1gtLWU6uiWzUfYy9y3pb2vcnUC3H+Mf9rglmqNd989M="; diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index efddd0ab6c790..839e36bba8f45 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-kfpCu79lJUxPvxSKplRziVnDyohY8xnxnO3ZoG2WgEs="; + hash = "sha256-Oq6bJ/cX+kDyVUVP/RpCIcNeWpT3HESUMmR6mEi9X4Q="; }; - vendorHash = "sha256-oPI6FPfBIPKZDLoyGblcG5UcmoFWufZ2NIEClpSIJzU="; + vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; excludedPackages = [ "./e2etests" ]; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index acbc2eb44dbd1..c3b6288ecea39 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - sha256 = "sha256-mrByeZt/EkTbcqcp3eUquKkrz4tReEms1VEla511uQc="; + hash = "sha256-E7oxi0rwVCzA/pBJ9SS6t+zR+J+dF7SW+oP+vXXN2FQ="; }; vendorHash = null; diff --git a/pkgs/tools/text/readability-cli/default.nix b/pkgs/tools/text/readability-cli/default.nix new file mode 100644 index 0000000000000..5c0fedd752c35 --- /dev/null +++ b/pkgs/tools/text/readability-cli/default.nix @@ -0,0 +1,40 @@ +{ lib, buildNpmPackage, fetchFromGitLab, installShellFiles }: + +buildNpmPackage rec { + pname = "readability-cli"; + version = "2.4.4"; + + src = fetchFromGitLab { + owner = "gardenappl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pvAp3ZJ8/FPhrSMC8B4U1m5zuBNRP/HcsXkrW6QYgSQ="; + }; + + postPatch = '' + # Set a script name to avoid yargs using index.js as $0 + substituteInPlace common.mjs \ + --replace '.version(false)' '.version(false).scriptName("readable")' + ''; + + npmDepsHash = "sha256-X1pcgDm8C4G+hIsgx3sAVFQPadWsULvXrdLAIHnpjmE="; + + nativeBuildInputs = [ installShellFiles ]; + + dontNpmBuild = true; + + postInstall = '' + installManPage readability-cli.1 + installShellCompletion --cmd readable \ + --bash <(SHELL=bash $out/bin/readable --completion) \ + --zsh <(SHELL=zsh $out/bin/readable --completion) + ''; + + meta = with lib; { + description = "Firefox Reader Mode in your terminal - get useful text from a web page using Mozilla's Readability library"; + homepage = "https://gitlab.com/gardenappl/readability-cli"; + license = licenses.gpl3Only; + maintainers = [ maintainers.marsam ]; + mainProgram = "readable"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e26435ed865e4..9bb2c80d05f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11940,6 +11940,8 @@ with pkgs; qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; + readability-cli = callPackage ../tools/text/readability-cli { }; + recutils = callPackage ../tools/misc/recutils { }; recoll = libsForQt5.callPackage ../applications/search/recoll { }; @@ -25733,6 +25735,8 @@ with pkgs; mastodon = callPackage ../servers/mastodon { }; + gotosocial = callPackage ../servers/gotosocial { }; + materialize = callPackage ../servers/sql/materialize { inherit (buildPackages.darwin) bootstrap_cmds; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; @@ -26245,6 +26249,7 @@ with pkgs; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-junos-czerwonk-exporter = callPackage ../servers/monitoring/prometheus/junos-czerwonk-exporter.nix { }; prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; @@ -27984,6 +27989,8 @@ with pkgs; upower = callPackage ../os-specific/linux/upower { }; + upscayl = callPackage ../applications/graphics/upscayl { }; + usbguard = callPackage ../os-specific/linux/usbguard { }; usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; @@ -36024,6 +36031,7 @@ with pkgs; go-exploitdb = callPackage ../tools/security/go-exploitdb { }; groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { + stdenv = darwin.apple_sdk_11_0.stdenv; boost = boost17x; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8321fe79251ea..18967e28651a7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -46,10 +46,7 @@ let inherit sha256; }; extraMeta = { - broken = - kernel.meta.broken || - lib.versions.majorMinor version == "4.14" || - (stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5"); + broken = kernel.meta.broken; }; }; kernelPatches = kernel.kernelPatches ++ [ @@ -256,9 +253,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; @@ -600,23 +606,14 @@ in { linux_testing = packagesFor kernels.linux_testing; linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); - linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); + linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); - linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); - linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); + linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened); + linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); + linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); + linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); + linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); + linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d8c4a51505fc2..64fabf5d1b32b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,11 +54,11 @@ let atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { }; - awa = callPackage ../development/ocaml-modules/awa { }; + awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; }; - awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { }; + awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { mtime = mtime_1; }; - awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; }; ### B ### @@ -321,11 +321,11 @@ let dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { }; - dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { }; + dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { mtime = mtime_1; }; - dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { mtime = mtime_1; }; - dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { }; + dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { mtime = mtime_1; }; dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { }; @@ -345,6 +345,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + domain-local-await = callPackage ../development/ocaml-modules/domain-local-await { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; domainslib = callPackage ../development/ocaml-modules/domainslib { }; @@ -417,6 +419,11 @@ let eigen = callPackage ../development/ocaml-modules/eigen { }; + eio = callPackage ../development/ocaml-modules/eio { }; + eio_linux = callPackage ../development/ocaml-modules/eio/linux.nix { }; + eio_main = callPackage ../development/ocaml-modules/eio/main.nix { }; + eio_posix = callPackage ../development/ocaml-modules/eio/posix.nix { }; + either = callPackage ../development/ocaml-modules/either { }; elina = callPackage ../development/ocaml-modules/elina { }; @@ -571,6 +578,7 @@ let git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; + mtime = mtime_1; }; github = callPackage ../development/ocaml-modules/github { }; @@ -622,7 +630,7 @@ let happy-eyeballs = callPackage ../development/ocaml-modules/happy-eyeballs { }; - happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { }; + happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { mtime = mtime_1; }; happy-eyeballs-mirage = callPackage ../development/ocaml-modules/happy-eyeballs/mirage.nix { }; @@ -652,7 +660,7 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; - index = callPackage ../development/ocaml-modules/index { }; + index = callPackage ../development/ocaml-modules/index { mtime = mtime_1; }; inifiles = callPackage ../development/ocaml-modules/inifiles { }; @@ -662,6 +670,8 @@ let integers_stubs_js = callPackage ../development/ocaml-modules/integers_stubs_js { }; + iomux = callPackage ../development/ocaml-modules/iomux { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; @@ -672,15 +682,15 @@ let iri = callPackage ../development/ocaml-modules/iri { }; - irmin = callPackage ../development/ocaml-modules/irmin { }; + irmin = callPackage ../development/ocaml-modules/irmin { mtime = mtime_1; }; irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; - irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { }; + irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { mtime = mtime_1; }; irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; - irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; + irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { mtime = mtime_1; }; irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { }; @@ -692,9 +702,9 @@ let irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { }; - irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; + irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { mtime = mtime_1; }; - irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; + irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { mtime = mtime_1; }; irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { }; @@ -961,6 +971,7 @@ let metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; + mtime = mtime_1; }; mew = callPackage ../development/ocaml-modules/mew { }; @@ -1007,11 +1018,11 @@ let mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; - mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { mtime = mtime_1; }; mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; - mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { mtime = mtime_1; }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; @@ -1073,6 +1084,7 @@ let mrmime = callPackage ../development/ocaml-modules/mrmime { }; + mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1249,7 +1261,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { }; + opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; opti = callPackage ../development/ocaml-modules/opti { }; @@ -1400,7 +1412,7 @@ let prometheus = callPackage ../development/ocaml-modules/prometheus { }; - progress = callPackage ../development/ocaml-modules/progress { }; + progress = callPackage ../development/ocaml-modules/progress { mtime = mtime_1; }; promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { }; |