Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-06-11 00:03:05 +00:00 committed by GitHub
commit 847b49213d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 1001 additions and 408 deletions

View file

@ -3560,6 +3560,12 @@
fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D";
}];
};
dariof4 = {
name = "dariof4";
email = "dazedtank@gmail.com";
github = "dariof4";
githubId = 9992814;
};
darkonion0 = {
name = "Alexandre Peruggia";
email = "darkgenius1@protonmail.com";

View file

@ -525,7 +525,7 @@ In addition to numerous new and updated packages, this release has the following
- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.
- `openjdk` from versioggn 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`.
- `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`.
- [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.

View file

@ -173,24 +173,24 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
version = "2023-06-06";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "0731f08ee43138b61eaf02ac00110babf61be99d";
sha256 = "1rkb321a8za0dp12vln131kc420al620v2c36n00kj2xk19qlk75";
rev = "e049928b8bb3a385a186617a97c56cfb8f74a6f8";
sha256 = "105sm7qyyypa2y1lxr00a01x322z6f1zwiz9wgdrdsi6bn9zmbh6";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2023-05-30";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "5746281bb6467522e959f75939976e98da277f1e";
sha256 = "0fxaady67l9pj8cyyfb7fxxbx84y3vxp26jy8nvsm1fsx32dw8pi";
rev = "124bcbf036c44ec33e4e6e4b356811b2c086faf0";
sha256 = "0aidvlynckh1c203pa2mbvgz538jl4559cpng4s9r5g4apyn1aqq";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2023-06-05";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "bd6b279322f0628e4a58cb8129129d6106fea56a";
sha256 = "09spmva9yjvzq9pfyvrjhnj3kviwk275dih6y1nbclargsmm7kbl";
rev = "f323ed8e03d2484a1abdaa267b839315f4b34c80";
sha256 = "0pviayxswcx0s0qvia11fpp9zywpmsp0g342xgfxgwm4099kdpf7";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -365,12 +365,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2023-05-31";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "1061082e005acdd10e3b1167df37f8005fce5483";
sha256 = "1lvnq0swjm1207p1qkldzs3jdg8xl5w1shmwf2prlrf9svy6rl8z";
rev = "9d80f93a85ea99442fc3539ab2a0acbaef6c7058";
sha256 = "10wjc6ypdf9gvagm7ywdp1q6xsx58f4s6wl4rm3zvnky30pdl70i";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -835,12 +835,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2023-05-29";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "e3234c489397b46a2b7949d6169d61b69a30c015";
sha256 = "18c2jyp79rl68x4wfh00aln9zqm14g7vqbk7dnsxzr5vyyr6yssa";
rev = "d91509611981759419ee2fe5e2ef436d5ec8d0eb";
sha256 = "04bnrmnbi1a5zrgnsng5y24xvfwrzx6hvlf07x1bz4rly2b8cd7s";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@ -1195,12 +1195,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
version = "2023-06-05";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
rev = "dd85d91080fbb4399505e595eef90f190d21aeab";
sha256 = "1yw3bh3skdbj89zkyim0qf5h89ls5vnh6bfmjhkkm8c6928h502c";
rev = "5e85133b895b10f7dc7ce46bdad852c990a3f4b9";
sha256 = "13c8b6qrc03zblb7pq8ndy76mdb5b5pscbih6gqsx2qb6y9hxz39";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@ -1375,12 +1375,12 @@ final: prev:
cmp-cmdline = buildVimPluginFrom2Nix {
pname = "cmp-cmdline";
version = "2023-04-24";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-cmdline";
rev = "5af1bb7d722ef8a96658f01d6eb219c4cf746b32";
sha256 = "02xpxdbjvic4l2s4fmhiy38igvvg0mdpi6hr49kvnibx1dyzhx5k";
rev = "8ee981b4a91f536f52add291594e89fb6645e451";
sha256 = "03j79ncxnnpilx17x70my7s8vvc4w81kipraq29g4vp32dggzjsv";
};
meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
};
@ -2853,12 +2853,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-06-05";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "6ca4cce071d527fa16c27781f98b843774ae84a7";
sha256 = "0rra1m176bhbj6w83mi9ay078n1xshq017fir80giai5q2s8h80n";
rev = "9f00ed07c16662bd4280ecc4bfe7d35a65b1f6b7";
sha256 = "0c1vyd7q8jfn0hc55fsnramxa862299k29dsinbq0yz2k60plvsz";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2961,12 +2961,12 @@ final: prev:
edgy-nvim = buildVimPluginFrom2Nix {
pname = "edgy.nvim";
version = "2023-06-06";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "folke";
repo = "edgy.nvim";
rev = "cb82974725e7730c847a5764f51da4b84361b502";
sha256 = "1ha7sqcbjf9jmiscqgd513fwp6x3pigrcb2l75jnx1nhh6nc1zxm";
rev = "f4f2d0fdaf73f282b38527cd8aac04cda33bcecf";
sha256 = "1pgics6arbif2a7js1hcwc38kjyy8xzl31l1sf75v30cqkfz9m6j";
};
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-05";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "elixir-tools";
repo = "elixir-tools.nvim";
rev = "c709578ca3b34d9c24da41ad385fe187a8212cce";
sha256 = "049lhvimhjdb73y12ccfbh7sk2z2bwfi6nx45zyl01yyc1y0wqd2";
rev = "27c488da1548e62d3e0d09afa1be00f1ba7d73bd";
sha256 = "02gln7mzgx7357mvzg4xkvm7wi7k82zj2fj1gd7b5qr3liipr631";
};
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-04";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "9025d37189f26b6ca0b965a9e5eec3e69c37d2e9";
sha256 = "0y3lbpqm2yby1i3mvybkkxn8sfiwbwxs685zpvpjq6l3b184h9jc";
rev = "0eb246a7dbb06d3d9e560696be210241cc27c081";
sha256 = "1lglrhf34qkb6zaxsiy3pkdvsxsx1wnb0l4dw2plwbgwvmcnwl9h";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3538,6 +3538,18 @@ final: prev:
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
git-conflict-nvim = buildVimPluginFrom2Nix {
pname = "git-conflict.nvim";
version = "2023-05-23";
src = fetchFromGitHub {
owner = "akinsho";
repo = "git-conflict.nvim";
rev = "3c89812a83ac749b8851a473863958325a1cd57c";
sha256 = "1ajzx3sp95fyx2w70x2s66qi1qc0qz2sx6bmk8gn73p9s3rda2y9";
};
meta.homepage = "https://github.com/akinsho/git-conflict.nvim/";
};
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger.vim";
version = "2022-08-30";
@ -3588,12 +3600,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2023-05-25";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "f868d82a36f7f7f5e110eb0a9659993984f59875";
sha256 = "1pbrm7y6z1b96yy8v9chn69jfbznlzrkygp802cb4946snnb5dj7";
rev = "4455bb5364d29ff86639dfd5533d4fe4b48192d4";
sha256 = "0zhsrfr5gqij7yg28q0ds9qnxadjxnms0ws345rj3drz2lmysrhf";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -3648,12 +3660,12 @@ final: prev:
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
version = "2023-05-31";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
rev = "8a0498ee48a26f928b1dc1c02fb3d84d648a1c63";
sha256 = "08iig6g3mmpkany1vnkpv0icm4i55542gsyq77dygigwriqlzkkq";
rev = "a8095eb334495caec3099b717cc7f5b1fbc3e628";
sha256 = "1f21zyj875m4hk39ar2cd48mcw3z74wy436nkdfgiamibk03k77a";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@ -4451,12 +4463,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
version = "2023-06-06";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
rev = "ae25448d39fb2bdc38a139339233270edec44484";
sha256 = "03vdi199hxngfmkaizqgdwh7vxg86pw0ngmmv87vx8hnl9il8gps";
rev = "d1b02c2dda88422ca573f2a1ebdfb213ce0124d6";
sha256 = "12283fg12qrh2wbd304p34m2n9w8awf9rv0n9sm82k44fjryrlsi";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@ -4619,12 +4631,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
version = "2023-05-20";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
rev = "8a2e7ab946dd995d693e30744665d15eabe4c369";
sha256 = "1ld4z3smmw4s1inbk1ry04k5bpqp48xksbpbq2abx58x3brhg782";
rev = "718508395f4047eb8cd05389c1fec709cb7df90a";
sha256 = "04pz3j1875adri8hjz6qir496jjmxjxppj3q3q5jqd08jcp9h2qx";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@ -4811,12 +4823,12 @@ final: prev:
lsp-inlayhints-nvim = buildVimPluginFrom2Nix {
pname = "lsp-inlayhints.nvim";
version = "2023-05-25";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "lvimuser";
repo = "lsp-inlayhints.nvim";
rev = "3700e6458fb1702c12a7e33037fb17f649679552";
sha256 = "1n21z138a1dbqzsmdj9m36qm8npbpgd9ggxl350a9qpw35q9czkl";
rev = "d981f65c9ae0b6062176f0accb9c151daeda6f16";
sha256 = "1x1ri9gcavl2swwhi0vn5cknh2db4p5r274r70zfwc2yxhks586k";
};
meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/";
};
@ -4978,12 +4990,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2023-05-31";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "51ebb4b6637290e1b8e0fb0d6f38b605d3c24940";
sha256 = "1g08v69fcwzrwpbfzfym7pzvwlva8wx7cx3g7smiw9309aj72ysc";
rev = "a13af80734eb28f744de6c875330c9d3c24b5f3b";
sha256 = "1z90ly989xc59fpvnf3x40nfpydga8k33s6q8r1d3xmm0dj80v5f";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5003,12 +5015,12 @@ final: prev:
lush-nvim = buildNeovimPluginFrom2Nix {
pname = "lush.nvim";
version = "2023-05-01";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "fb148c0082488ba048f681792c4044e3229fd1a6";
sha256 = "0l3hhnskai22lwy78x9gblc0qr928vcbfnzjpawcx5lrmg3a3d44";
rev = "25cf75a5347d664783fce3d16f7fee3f58f37e1d";
sha256 = "117frxw7gwac21y3xbkc1ykwb5d4cj0fsax78m7bl668b6dvxah7";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@ -5183,12 +5195,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-06-04";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "b1a6d9692e2f67ee35f77792b61eb7d44651c535";
sha256 = "03kihvjnpqx1bbywbbb1k056r0s914xd2vza90zd71nk22alkx1h";
rev = "296ebbbd3e5ba5e43f5125efe18ad76fe3b632cc";
sha256 = "1z86b6gzgr6smzz6zkv3y052whm27h5ffmah8ginmvxdhvrr8bv8";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5519,12 +5531,12 @@ final: prev:
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
version = "2023-05-20";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
rev = "8c89efb93b8383666a6f989762c2f610f5f2c930";
sha256 = "09hv1d5mpf0fqw4nzml8773lm250gsnkf51dnyh855m0shsqxjln";
rev = "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa";
sha256 = "1hmfajbj61gh6jjrj0gbanhshp4ajp2jbi00h5lgzwwr9abv1gn6";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@ -5543,12 +5555,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-06-03";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "17aaf0462f7cd6b2c70c9a32988126bec71a2504";
sha256 = "0qd48zxh7lnszs137y24dyky6iflqfnnszfycq6bjwaadd6mcp89";
rev = "4cfa8a11e4de565c95636643db77b44f926f4f25";
sha256 = "0dqarykny6aszyv9wj5vvakjjaxi3f873dnkaxjdzgg7kdls1486";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5567,12 +5579,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2023-06-06";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "1dffaffd6eadd39daba4a102d1ead42dd198e2c2";
sha256 = "1146pjml56rgis3waxha40dlg0r3a3d5n65mim9jac9l91pbl76y";
rev = "a24a910ad0842be997f34a4811c10b4f92aa53af";
sha256 = "0riy2n99zrj1y2h2nd1m8w906jf1ack4zwc6si613ad98ykcw3rp";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@ -5591,12 +5603,12 @@ final: prev:
neogen = buildVimPluginFrom2Nix {
pname = "neogen";
version = "2023-05-31";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "danymat";
repo = "neogen";
rev = "72238bfb7099ed346e3742e815f13c3fe35f51ab";
sha256 = "1sfxcirkpsgwpbad2al41dwdcjwls5k2vzq1wf3k8sk23kdmq2q2";
rev = "d8c8145304190b1889452b50ef437d9d49bdc033";
sha256 = "087ckq04l4nlzb7i5j25jync568i4w4kbg5jmn9vfcj9g8il0cah";
};
meta.homepage = "https://github.com/danymat/neogen/";
};
@ -5663,12 +5675,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-06-06";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "474af829b0f3e25e09e68d2842ffcb6ca24d359b";
sha256 = "054901bdaw6a0aqwdxbm66cii0h03inyrww7k0dw6ahbni7rswgp";
rev = "9a55117b6175e63d86346bb893392cdf0b6ad2cc";
sha256 = "0xgfvb9psv1i3nq2gjrs051g6wzjljlw17qg5bdrk438y9w9nfq3";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5795,12 +5807,12 @@ final: prev:
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
version = "2023-06-04";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
rev = "f2967821af53c5f2da70fa93a9299b5ab1d1981b";
sha256 = "06rfnz59c7774lqcg1xsywpliw508ijg14j3d6rj1qjlc0knpyhx";
rev = "1d11827a3af27a0828279ec65e5a65ae7a30afa5";
sha256 = "1r230i39ac6na7b9j3gqs06w89h46dyjw249pj28252n10n6w28f";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
@ -6095,12 +6107,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-06-06";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "8f136a9e341b8ef9d306d8ed378f023f179c9501";
sha256 = "0ca15pxv66k7hvfwd8cg9wf44075n3m353mqm7q86dr041f5zhc8";
rev = "c3480a10179ad17f0241d8c6534e5751d9049c11";
sha256 = "1rp7wczxay5hb67gf52cx0wgpgsd6r4bh7q1qz0dh4016crrzxpj";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -6191,12 +6203,12 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
version = "2023-06-04";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "d5a82aae64426a805e19d8ef5a379292f9dc55d3";
sha256 = "14mnskwvzsva5pxh909xgrzg1cy7r4459f0g85dkqr8z4c9yajic";
rev = "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e";
sha256 = "08hws2h2wc60i2swyh0lbqr6xxdpk0b2mm8h5vs6gbgk8vmvp5gx";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
@ -6227,12 +6239,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
version = "2023-06-01";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
rev = "f8a489ea1a670569eead0fe5651c0c48add743e8";
sha256 = "0xq9rmhgqy3jbzdyw5x8lnynhs22dw8vsy0nzkinbhc58b0jlr2l";
rev = "c3c349c8302c4318a66c3c1a1a4d79f3d746381d";
sha256 = "0mbfgc0vsmyr4hw71kcpawk9m0xk70mdhd29pdbfy3ac3720gld4";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@ -6311,12 +6323,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2023-03-09";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "1276701ed0216b94d7919d5c07845dcdf05fbde5";
sha256 = "0vkd6vhjprb6s6mz6rgfr179yfd9s7vjd5pf4np11cbn99r57186";
rev = "5895e26e34d032f48d0b9a843da1eb24e25680ea";
sha256 = "16pw9mpckscbi03p7lfxygyr3s8264dzy56rs3wdj4bm85lqf6cb";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@ -6347,12 +6359,12 @@ final: prev:
nvim-cmp = buildNeovimPluginFrom2Nix {
pname = "nvim-cmp";
version = "2023-05-30";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "fc0f694af1a742ada77e5b1c91ff405c746f4a26";
sha256 = "1vmsa4vrx7nsrq2kzh8pyjfssfhb9b7xy7qqcyja4g0xp9z9z077";
rev = "b5a636d46c69bb371995c22d7a10ee1544004879";
sha256 = "00ij5f441xg1d3xg21f3kdmxmiyywzqv5kp1nklfmsp45ahxyhmi";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@ -6551,12 +6563,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
version = "2023-06-04";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
rev = "5cc067e0a251bf3912540ca14024294164f27d54";
sha256 = "0982sddvsbvhsgjmpgn63ykg8bsndbjb945kyljnhjvwzn2vn24v";
rev = "43c15a3440d0026888e25053dc4607e23d46b515";
sha256 = "07vhfjr1b3khr12rkn8gjbz9przsan87km5vq9wir9ngrjyy4rwk";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@ -6707,12 +6719,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-06-06";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "00d7063cdca8d39eb4e3308277cc21eae7bb44f7";
sha256 = "0s4lwpafikfjl4kbp7dpll0akz1ir11bw5zgcy2zll2z2zdsb447";
rev = "0f598b9ab9f2a6d7e137074be99c8d89af44b990";
sha256 = "1nnf06sxa3bvlk1hzivnsh5r5yq9rfdywyqnj9qp043nczrdki2p";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6767,12 +6779,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2023-06-02";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "1b9053139342ed9ab47b29e5a1076fcbd971a565";
sha256 = "1fqc4bl5c9r1sgigfc1kmnzgnmgjpcb0sw32a2g2syz0fg9n7h6k";
rev = "34a82230e3b9c2a09defec79abd444da4902a1f1";
sha256 = "0nb7br4rb3ns0g6b46zxdr6bbbdr1mggh21npfw407bnvyq2ag54";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@ -6911,12 +6923,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-06-06";
version = "2023-06-09";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "b4a7bb3f54e180e6203071ffa80f375bef9239fd";
sha256 = "014bis349y6j2ll17xbanikcaw0v54yiz69pi8k1pmkif7n08c6d";
rev = "ca91af0a81694f65f2e4da5e76e395484f70a034";
sha256 = "1cjgbgm994ivbkdf3c1jlm9gzm87gmh768jjmhd8azr90h0fk6dv";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -7019,12 +7031,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-05";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "1b5a7334bb9862abafcf6676d2a2a6973d15ae3a";
sha256 = "0rf603j2i7a1y1xli2yvv2ddl82qnr2sraii5mc442k1lmwbbk8d";
rev = "2c59e0ff3da6514b03d853ebecb6c36c515a5d7d";
sha256 = "1h3amaa9p24k3rnj8l9jzq2a2lif7n0hz1z15ygssqqqc0vakvva";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7079,12 +7091,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2023-06-02";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "23e883b99228f8d438254e5ef8c897e5e60e75d1";
sha256 = "1xjwah0g96mjv01lhd7yfml2gd15syhj2axbvid9xk4yn4m6hks8";
rev = "2d6d3c7e49a24f6ffbbf7898241fefe9784f61bd";
sha256 = "1mlx0hkx42al578ilwsj4547rqny85x089is189hdic287yw59gp";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -7115,12 +7127,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2023-05-25";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "nvim-ts-rainbow";
rev = "85279555783702b4bed6518e4494ec96d1ae1dfe";
sha256 = "1waxbcvs61g61rgfbs3dpcmz9scyjb94szkq23bp6kkl7fadl2wr";
rev = "8312b513ce930e7669a1721befbe56f2e1853301";
sha256 = "16s8kppsn9m831ymcz5w3kpnq40sxg98nykd0gz3hfj27hinqag5";
};
meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/";
};
@ -7319,12 +7331,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2023-05-28";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "382c689c08803233da58f1141f713415772d9dc3";
sha256 = "082rvkfhkpd9w9kjpixp0a624cy9f3vyyvq5j3pgdnz3b5ddbx1l";
rev = "266eea8c4dc931c6ef863b8cffcf43b9df88353c";
sha256 = "0pargiy0mkwmr695pmj7i191ymlxnsd35sz2r0yga7gnbwjv8hib";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -7343,12 +7355,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
version = "2023-06-01";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
rev = "acd97c26d253884f8b58e68c89d8340c5e0f4456";
sha256 = "113lv721w4xh46cf0czv0vy6vybrx33m1srqrr6czmh7axd514qs";
rev = "3b3ae8a1f32d9f735b5c9ccf287b73e0f5e6d7a5";
sha256 = "1zdrc2x4c3wxq6ds8lavbmvrlkmljqmr7pja4m2a3xdc98hdbw6m";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@ -7415,12 +7427,12 @@ final: prev:
oxocarbon-nvim = buildVimPluginFrom2Nix {
pname = "oxocarbon.nvim";
version = "2023-06-04";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "nyoom-engineering";
repo = "oxocarbon.nvim";
rev = "00dd30d8a61af143d437b89768eb2050e8dc32af";
sha256 = "0inysh2vhr5izslq19yys31wxijzxskl22y4hlvc1jiiv40s8rw4";
rev = "12a7507f1cd5ac6edb890d12268e4444a35956f2";
sha256 = "0l6akk6yx06yfz83y041qnxghgrhbgmvlvsfqqahknxsc2bakh1r";
};
meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
};
@ -7921,12 +7933,12 @@ final: prev:
rest-nvim = buildNeovimPluginFrom2Nix {
pname = "rest.nvim";
version = "2023-05-31";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
rev = "c21eed6cbbc76e120a31b8eafa8f77c338bcbce7";
sha256 = "1zyzl2fyaxwn7w037yy01xg4lnqb3x65bnjwd9krwpwdq6bm9gs1";
rev = "aea7c64bdff1073beed9bd7fddb60cce7796d7ff";
sha256 = "08xh9x05z2zfq2ynnbkhqpgmbks940mw22x6987qf6rnqw4khp5p";
};
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
};
@ -8643,12 +8655,12 @@ final: prev:
swift-vim = buildVimPluginFrom2Nix {
pname = "swift.vim";
version = "2023-04-04";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "keith";
repo = "swift.vim";
rev = "51108a710e194c0c75f1cf4683650faa407fab6b";
sha256 = "0axcs72bh156pd1ykfl8z4rvrd89n1c4fnan6z7m6h9kjajf2nf0";
rev = "ad758089614335ff0eed514c15fbb87c28e14441";
sha256 = "1yra92ylzrzd780nl77fwgp9h9axrjx6sn1hq3j617r22pv0qglw";
};
meta.homepage = "https://github.com/keith/swift.vim/";
};
@ -8897,12 +8909,12 @@ final: prev:
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
pname = "telescope-file-browser.nvim";
version = "2023-05-21";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-file-browser.nvim";
rev = "6cf29d5139601993343c4e70ee2d1f67959d9cc5";
sha256 = "1vwwgjzgnsbvpi4jzqbg66cw6v2wv8axwwimfhc79ag5s1g02z8n";
rev = "fc70589a93d7bb42f4671ad75c8628a29995bcbe";
sha256 = "00advlsr3rbmqrk5cpj8jli29sdi5i2bka2dz0fzsqz5zx3aqvk8";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
};
@ -9127,12 +9139,12 @@ final: prev:
telescope-nvim = buildNeovimPluginFrom2Nix {
pname = "telescope.nvim";
version = "2023-05-25";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "6d3fbffe426794296a77bb0b37b6ae0f4f14f807";
sha256 = "171f5lprqfdyh2lg2wkakzdxkxpzxdd9x2nhmvhv63rbskf0v00l";
rev = "42267407ae588fd6c07238777d48869571193a49";
sha256 = "02ycgspcyvxfm7b62mqavvhii2z9r181qbk5ikkcy9nskgi2figd";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -9464,12 +9476,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
version = "2023-06-03";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
rev = "23c1327b85bd51258f9f8bd8f77f024acef6de69";
sha256 = "1y4zxz84lksdva4cfp2pzp5kand8m29s1vws9ifkj83qrlsfx7p4";
rev = "2af0dd9767526410c88c628f1cbfcb6cf22dd683";
sha256 = "1wyiyijs7cjmn7qq2x6fgwm12zrr2sn3w5ray3d8rmrvzl0059ni";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@ -9596,12 +9608,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-06-04";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "9954a5f2f1c0caa62b40203eb7e5650c5c38b9ff";
sha256 = "0glps9fli4jgpmxvs6r4y0p2qj35vhk56mvk0b0g8lqlmzrvh0sv";
rev = "cc7a0dd28a16cb89ec9838a4290fd30c95ad15d5";
sha256 = "1884ql4nnsvxci2d744rlrghl7w5bi029advif2jpp603zawaa6d";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -10820,12 +10832,12 @@ final: prev:
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
version = "2023-06-05";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
rev = "c9cf284637d8c777597646c6fad338bdc35ac54f";
sha256 = "1vaypsynl1xpbi9nw4d5waibmk9cn2nrcirfba6pkp8vghbqqz4h";
rev = "191341c06ccfaacd81d8fc8bbc0a789459f86a88";
sha256 = "0ws5r54z5b8j3gz9i74390xwklagry8pr80yz9r6v06l5wa0j2vl";
};
meta.homepage = "https://github.com/justinmk/vim-dirvish/";
};
@ -11204,12 +11216,12 @@ final: prev:
vim-flutter = buildVimPluginFrom2Nix {
pname = "vim-flutter";
version = "2023-06-03";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "thosakwe";
repo = "vim-flutter";
rev = "a1edd853ac9533d0014923aac1ae587e626cc4ab";
sha256 = "1ygg7d489r9vgcn341s6v5px6xswjjhjbhkin6l9akpmh96fgrpy";
rev = "422ff301a4fe7b989b79b83adf95add0c71ffda5";
sha256 = "0sk4fr6gizmxhm4smqqvb1ynhcqnmznrqj5cqgm5b7dyb31jrkzm";
};
meta.homepage = "https://github.com/thosakwe/vim-flutter/";
};
@ -11444,12 +11456,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
version = "2023-06-06";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
rev = "75614aff9669abd7f8b0aae58fdfbaddfebee1e0";
sha256 = "0bszxd8f0qyydx0w9dff46spc36s35jdpgshr616wlfwpgi4l1z4";
rev = "67d28c1031e4970b07627fe30262f1862755b915";
sha256 = "0rdsvnpj4n4ji0k5pb7sjrcqanxahqdn6bvil8zl6ss15f1b3phx";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@ -12130,12 +12142,12 @@ final: prev:
vim-localvimrc = buildVimPluginFrom2Nix {
pname = "vim-localvimrc";
version = "2023-01-27";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "embear";
repo = "vim-localvimrc";
rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13";
sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71";
rev = "ebb73832e6795967e5a52db3636a37282871b218";
sha256 = "1gqyjpxz5np1c5xsgli5c6mk8d49ly6q23b8fp9f800vgg4cianz";
};
meta.homepage = "https://github.com/embear/vim-localvimrc/";
};
@ -13499,12 +13511,12 @@ final: prev:
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
version = "2023-04-18";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
rev = "bb152854fc21193729bf587aa055e738d50c8b48";
sha256 = "1hxcjqy6xga0jr5z6s71vsl1s45z1fkhcvwxwr571n1azfhb8znk";
rev = "69fd61ba2b1fe1e0c13d09fef24290ba5ed6a85f";
sha256 = "1fzka877p9clfhh8jdf99c2d1wlyizgqdw6lzx1nrgsv53ayhd7l";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@ -14292,12 +14304,12 @@ final: prev:
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
version = "2023-05-09";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
rev = "02be9238319937e04afea73fd0fc7da5413ee041";
sha256 = "0izlgvx9p64wpv1ycwy2viyqgb75f10dhy0jq13r2zjprskgx20c";
rev = "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f";
sha256 = "1hpyjdv72ycpsn3r3mk6f6bk9rl1rf093mgm1mi8zf5nhcid6f3x";
};
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
};
@ -14617,12 +14629,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2023-06-05";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "1306bdaabc58c72838fc8dde3f7755bcbdecfabc";
sha256 = "0axwdmaw7plrvd2zh8l13xyiinwyamvas9h23j0byh4dq8xfr5ds";
rev = "127c0a2ec8c6ca5f4c33902f004d302bd88a7c3e";
sha256 = "0pmjazhskmdczj1azdyry8pcaxb9d23ap6imn5dg9z9ymximhk33";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -14773,12 +14785,12 @@ final: prev:
wiki-vim = buildVimPluginFrom2Nix {
pname = "wiki.vim";
version = "2023-05-29";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "lervag";
repo = "wiki.vim";
rev = "10340eb9779dd9703f0231427276c5651ed29d10";
sha256 = "1q30lxzdjys8arf1fpmbxsxhqhwx337gsqpxn24l07zprblwiyr2";
rev = "4f0bc3db6ffdd0529766f1c4ba6ab658e8a25a4d";
sha256 = "0y8ajgdjlyk6csv44y6yydkjczyyp19ky70l1vihp2dy07garl80";
};
meta.homepage = "https://github.com/lervag/wiki.vim/";
};
@ -15170,12 +15182,12 @@ final: prev:
nvchad-ui = buildVimPluginFrom2Nix {
pname = "nvchad-ui";
version = "2023-05-31";
version = "2023-06-07";
src = fetchFromGitHub {
owner = "nvchad";
repo = "ui";
rev = "4f5cec09455a27ca8e59a8c082991cf40013ea82";
sha256 = "0i4wp2fr1mgwmna9al2c9spa4g5ri2kn0g2rgjqxjvq7fdcr5754";
rev = "d35fb613352cc21a0dea172a1e97a5ab0d79ffd0";
sha256 = "1icg53mqwy8n803smm64i4lh8rf9j4c16sl08hy49kfch2b1789m";
};
meta.homepage = "https://github.com/nvchad/ui/";
};
@ -15194,12 +15206,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
version = "2023-05-29";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
rev = "15aac8c529bb38ac39fdb22f7be7f37c0e39dd0c";
sha256 = "0w60dz8ifgvfk5av1f1ny2g6gchdh4y2q8r3x3nsfg2s2r3wazmp";
rev = "6b7b38bbb3dac648dbf81f2728ce1101f476f920";
sha256 = "03hsav7w4rx6h0c6i4afj4siq7pzp652iqq4q2q2lz1qhy7lnz5k";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};

View file

@ -5,12 +5,12 @@
{
ada = buildGrammar {
language = "ada";
version = "0.0.0+rev=42cc2eb";
version = "0.0.0+rev=ba7951a";
src = fetchFromGitHub {
owner = "briot";
repo = "tree-sitter-ada";
rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba";
hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM=";
rev = "ba7951a8f3fb08f9ea923625153e7670c89f30b4";
hash = "sha256-Rs+7wSsoV9ol0zV8occOeuvJaIofAe7qDXLmOxrjVw0=";
};
meta.homepage = "https://github.com/briot/tree-sitter-ada";
};
@ -203,12 +203,12 @@
};
commonlisp = buildGrammar {
language = "commonlisp";
version = "0.0.0+rev=5b83fc6";
version = "0.0.0+rev=747a6e1";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-commonlisp";
rev = "5b83fc6c2e45df43333db605e87615cdf00eb164";
hash = "sha256-jEUQe0YkQ/HTF6Ld1/7bkBvpRR4nDYgNNkoKe3xQeMc=";
rev = "747a6e161ee8ab000f00f3adf0bec8dfbf6a8403";
hash = "sha256-KufA/oSVJG50J7lSYr6bkKUK33ODdALvo5UoTnFlAHM=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp";
};
@ -303,12 +303,12 @@
};
dart = buildGrammar {
language = "dart";
version = "0.0.0+rev=8aa8ab9";
version = "0.0.0+rev=0033b22";
src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "8aa8ab977647da2d4dcfb8c4726341bee26fbce4";
hash = "sha256-62Mwn1PnGxVWST396vX/aRkNgzloq3H23TOPZ4oqqiM=";
rev = "0033b223b5876b0db07da487dc799dcb63aedd1b";
hash = "sha256-KPe03jEeWP8XtxgFU1ThLxqQAV/edl2PQV5PGAijs4s=";
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
@ -447,12 +447,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "0.0.0+rev=6228b1d";
version = "0.0.0+rev=c431b0b";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "6228b1df25f25dbd69e4e0342c4c65eb9b5e957d";
hash = "sha256-1oM9mLtUU2u2GiSFULFvfqnUtHg9XvmMxXz6qLOP//Q=";
rev = "c431b0b2d9228ed0869f7a6bb88fc9d2796d44b1";
hash = "sha256-dawA0Iem7naBhEvrrvQwk+wNBDPflC1UmLVqewTiLlA=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@ -645,12 +645,12 @@
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=7cccc30";
version = "0.0.0+rev=3a3a8ee";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "7cccc30535a40da07092626031120ae6b36202d7";
hash = "sha256-b9735WP4EyU7gGNuKwwt6orIqXWMy4iQDthMKU52pQE=";
rev = "3a3a8ee53777eaa6cbfc032afd11af407ee1f7fe";
hash = "sha256-nsbQ1RNCLlgnVD+F2bfcIUjZQwOQUJCCyQVVnYw8rPo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@ -1030,12 +1030,12 @@
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=dcc44f7";
version = "0.0.0+rev=d8360bc";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "dcc44f7473ecec4d7b99af0a9529705d98a769f1";
hash = "sha256-vcss4Ux4DYJHyW8WCFBejPcq711QhemBHsVg482zNY8=";
rev = "d8360bc472ca1d55d437624ee7299152b693e1a0";
hash = "sha256-Gc8EHDeduNhJueB6beqonoJ81+63wXKFp+Ds6Aj4JPw=";
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
@ -1586,12 +1586,12 @@
};
ruby = buildGrammar {
language = "ruby";
version = "0.0.0+rev=206c707";
version = "0.0.0+rev=74fde5e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "206c7077164372c596ffa8eaadb9435c28941364";
hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8=";
rev = "74fde5e5fb2bb5978aaee7895188eb199f7facf0";
hash = "sha256-U8pEd4kEh9LSxugG9k7WkjF+PaHenZO+VIisLGKHJUs=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
@ -1608,12 +1608,12 @@
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=236c7b2";
version = "0.0.0+rev=007a184";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "236c7b20dbddedb031ce40517fafc027434f6860";
hash = "sha256-M6HOkS/E5OKDUpzG5hgXdD7ZkWIVIdbFUXW4TC+Spkg=";
rev = "007a1845a46d3b4c1edfd157491ffc5739e2340f";
hash = "sha256-o6wwnb8BCYgtUAsZzLND2ImAULXoiFKvFQugz7p9qFo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};

View file

@ -296,6 +296,7 @@ https://github.com/ndmitchell/ghcid/,,
https://github.com/eagletmt/ghcmod-vim/,,
https://github.com/lambdalisue/gina.vim/,,
https://github.com/f-person/git-blame.nvim/,,
https://github.com/akinsho/git-conflict.nvim/,HEAD,
https://github.com/rhysd/git-messenger.vim/,,
https://github.com/ThePrimeagen/git-worktree.nvim/,,
https://github.com/vim-scripts/gitignore.vim/,,

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.90";
version = "0.7.92";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
hash = "sha256-88YOwMWHUxJ+P485O31XmtpZk3QNoROSJ8v02l4DLaU=";
hash = "sha256-wRGoeud4EY2N/seG0Kd7CJt1IkDdJMJwFwpQNoLOl2g=";
fetchSubmodules = true;
};

View file

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "6.19.1";
version = "6.20.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-Fm2484ztsSc80waJBvy7rHGnNBFxCvbbrsHDBCZ2kxA=";
hash = "sha256-1X7folCrXzNwSCWnepD9MFW9Ujx+PwoK0ih+zgEtA7o=";
};
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1

View file

@ -24,11 +24,14 @@ stdenv.mkDerivation rec {
glib gdk-pixbuf cairo
mailcap pango gtk3
glib-networking gsettings-desktop-schemas
xclip notify-osd enchant
notify-osd enchant
] ++ gstBuildInputs;
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs;
# The executable is already built in sbclPackages.nyxt, buildPhase tries to build using the makefile which we ignore
dontBuild = true;
dontWrapGApps = true;
installPhase = ''
mkdir -p $out/share/applications/
@ -38,7 +41,9 @@ stdenv.mkDerivation rec {
cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png"
done
# Need to suffix PATH with xclip to be able to copy/paste in Nyxt even if xclip/xsel/wl-clipboard are not in the user's PATH
mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \
--suffix PATH : ${lib.makeBinPath [ xclip ]} \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \
--argv0 nyxt "''${gappsWrapperArgs[@]}"
'';
@ -51,7 +56,7 @@ stdenv.mkDerivation rec {
description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
homepage = "https://nyxt.atlas.engineer";
license = licenses.bsd3;
maintainers = with maintainers; [ lewo payas ];
maintainers = with maintainers; [ lewo dariof4 ];
platforms = platforms.all;
};
}

View file

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "16.1.9";
version = "16.1.13";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-QGduoUKWNUjNlMEYO0wD5+igjuF03V5SVlgq44d2HDs=";
hash = "sha256-BiCv1meuefFgzuhm/u5XmQNzM94xBOQsGtJceEBnu6s=";
};
patchPhase = ''

View file

@ -0,0 +1,86 @@
From 5c41e49b79ef85e7e23748fbeeaf65df8b769263 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 10 Jun 2023 14:17:16 +0200
Subject: [PATCH] Make arch detection optional and fix targets
---
Makefile | 6 +++---
configure.sh | 22 +++++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index d21c53bf..fe982b24 100644
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,8 @@ stuff/%.o: stuff/%.c ctx.h stuff/*.h stuff/*.inc Makefile build.conf
libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile
$(AR) rcs $@ $(CTX_OBJS) deps.o itk.o
libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile
- $(LD) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@
- #$(LD) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@
+ $(CCC) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@
+ #$(CCC) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@
ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a
$(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS)
@@ -276,5 +276,5 @@ itk/w3c-constants.h: itk/css.h Makefile squoze/squoze
for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \
>> $@
echo '#endif' >> $@
-static.inc: static/* static/*/* tools/gen_fs.sh
+static.inc: static/* tools/gen_fs.sh
./tools/gen_fs.sh static > $@
diff --git a/configure.sh b/configure.sh
index ad388a5d..fd9d3b96 100755
--- a/configure.sh
+++ b/configure.sh
@@ -43,16 +43,20 @@ ENABLE_FAST_FILL_RECT=1
ENABLE_SWITCH_DISPATCH=1
pkg-config sdl2 && HAVE_SDL=1
-pkg-config babl && HAVE_BABL=1
-pkg-config cairo && HAVE_CAIRO=1
-pkg-config libcurl && HAVE_LIBCURL=1
-pkg-config alsa && HAVE_ALSA=1
-pkg-config libdrm && HAVE_KMS=1
+# https://github.com/GNOME/gimp/blob/828a8a7fe7ecd1825387f37a42922bc50fa32be9/meson.build#L349
+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
+if [ $HAVE_BABL != 1 ];then
+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
+fi
+pkg-config cairo && HAVE_CAIRO=1
+pkg-config libcurl && HAVE_LIBCURL=1
+pkg-config alsa && HAVE_ALSA=1
+pkg-config libdrm && HAVE_KMS=1
#pkg-config harfbuzz && HAVE_HARFBUZZ=1
-ARCH=`uname -m`
+: "${ARCH:="$(uname -m)"}"
case "$ARCH" in
"x86_64") HAVE_SIMD=1 ;;
@@ -229,8 +233,8 @@ echo >> build.conf
if [ $HAVE_BABL = 1 ];then
echo "#define CTX_BABL 1 " >> local.conf
echo "#define CTX_ENABLE_CM 1 " >> local.conf
- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
+ echo "CTX_CFLAGS+= `pkg-config "$BABL_NAME" --cflags`" >> build.conf
+ echo "CTX_LIBS+= `pkg-config "$BABL_NAME" --libs` " >> build.conf
else
echo "#define CTX_BABL 0 " >> local.conf
echo "#define CTX_ENABLE_CM 0 " >> local.conf
@@ -348,7 +352,7 @@ echo "LIBS=$LIBS" >> build.conf
#echo "Generating build.deps"
#make build.deps 2>/dev/null
-echo -n "configuration summary, architecture $(arch)"
+echo -n "configuration summary, architecture $ARCH"
[ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
echo ""
echo "Backends:"
--
2.40.1

View file

@ -1,44 +1,62 @@
{ lib
, stdenv
, fetchgit
, pkg-config
, xxd
, SDL2
, alsa-lib
, babl
, bash
, cairo
, curl
, libdrm # Not documented
, pkg-config
, enableFb ? false
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "ctx";
version = "0.pre+date=2021-10-09";
version = "unstable-2023-06-05";
src = fetchgit {
name = "ctx-source"; # because of a dash starting the directory
url = "https://ctx.graphics/.git/";
rev = "d11d0d1a719a3c77712528e2feed8c0878e0ea64";
sha256 = "sha256-Az3POgdvDOVaaRtzLlISDODhAKbefpGx5KgwO3dttqs=";
rev = "2eb3886919d0a0b8c305e4f9e18428dad5e73ca0";
sha256 = "sha256-PLUyGArxLU742IKIgpzxdBdc94mWWSkHNFoXGW8L/Zo=";
};
patches = [
./0001-Make-arch-detection-optional-and-fix-targets.patch
];
postPatch = ''
patchShebangs ./tools/gen_fs.sh
'';
strictDeps = true;
env.ARCH = stdenv.hostPlatform.parsed.cpu.arch;
nativeBuildInputs = [
pkg-config
xxd
];
buildInputs = [
SDL2
alsa-lib
babl
bash # for ctx-audioplayer
cairo
curl
libdrm
];
configureScript = "./configure.sh";
configureFlags = lib.optional enableFb "--enable-fb";
configurePlatforms = [];
dontAddPrefix = true;
hardeningDisable = [ "format" ];
dontDisableStatic = true;
installFlags = [
"PREFIX=${placeholder "out"}"

View file

@ -261,17 +261,211 @@ let
lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ];
};
quri_7_0 = build-asdf-system {
inherit (super.quri) pname systems lispLibs;
version = "0.7.0";
src = pkgs.fetchFromGitHub {
owner = "fukamachi";
repo = "quri";
rev = "0.7.0";
sha256 = "sha256-/9p67rfbkdrx5nn4kXEUAM9MzV7NYUsRcKsrP/e2MlA=";
};
};
cl-colors2_0_5_3 = build-asdf-system {
inherit (super.cl-colors2) pname systems lispLibs;
version = "0.5.3";
src = pkgs.fetchgit {
url = "https://notabug.org/cage/cl-colors2";
rev = "refs/tags/v0.5.3";
sha256 = "sha256-anYkLJoNOVBQoXzWVBgbEusQDdud0RA8nZzedl8V93w=";
};
};
cl-webkit2_3_5_8 = build-asdf-system {
inherit (super.cl-webkit2) pname systems nativeLibs lispLibs;
version = "3.5.8";
src = pkgs.fetchFromGitHub {
owner = "joachifm";
repo = "cl-webkit";
rev = "3.5.8";
sha256 = "sha256-wZ/zRRJlTiOIny4BsU+wsFtxtS5YKx3WalwpCVQPFSY=";
};
};
prompter = build-asdf-system {
pname = "prompter";
version = "0.1.0";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "prompter";
rev = "0.1.0";
sha256 = "sha256-Duv7L2lMjr3VXsoujQDOMNHCbdUDX4RWoncVm9LDCZE=";
};
lispLibs = [
self.cl-containers
self.nclasses_0_5_0
super.alexandria
super.calispel
super.closer-mop
super.lparallel
super.moptilities
super.serapeum
super.str
super.trivial-package-local-nicknames
];
};
nasdf-unstable = build-asdf-system {
inherit (super.nasdf) pname systems;
version = "20230524-git";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "ntemplate";
rev = "51a884f388ec526c32914093fcad6bb2434e3c14";
sha256 = "sha256-bjQPkiHAxhjsHCnWpCGMsmQlGDJFGtQEdevnhK2k+kY=";
};
};
njson_1_0_0 = build-asdf-system {
inherit (super.njson) pname;
version = "1.0.0";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "njson";
rev = "1.0.0";
sha256 = "sha256-zeOxkoi5cPl1sw1oEOaMsKhhs3Pb8EzzKTjvuDNj/Ko=";
};
lispLibs = [ self.nasdf-unstable super.cl-json ];
systems = [ "njson" "njson/cl-json" ];
};
nsymbols_0_3_1 = build-asdf-system {
inherit (super.nsymbols) pname;
version = "0.3.1";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nsymbols";
rev = "0.3.1";
sha256 = "sha256-KcrE06bG5Khp5/807wb/TbPG3nWTlNWHrDpmK6bm7ZM=";
};
lispLibs = [ super.closer-mop ];
systems = [ "nsymbols" "nsymbols/star" ];
};
nclasses_0_5_0 = build-asdf-system {
inherit (super.nclasses) pname systems;
version = "0.5.0";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nclasses";
rev = "0.5.0";
sha256 = "sha256-UcavZ0fCA2hkVU/CqUZfyCqJ8gXKPpXTCP0WLUIF1Ss=";
};
lispLibs = [ self.nasdf-unstable super.moptilities ];
};
nfiles_1_1_2 = build-asdf-system {
inherit (super.nfiles) pname systems;
version = "1.1.2";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nfiles";
rev = "1.1.2";
sha256 = "sha256-YsVcCFrJIFL9Z4wQNAv6chiz6wB/eB8v/EUMXPLs3fw=";
};
lispLibs = [
self.nasdf-unstable
self.nclasses_0_5_0
self.quri_7_0
super.alexandria
super.iolib
super.serapeum
super.trivial-garbage
super.trivial-package-local-nicknames
super.trivial-types
];
};
nyxt-gtk = build-asdf-system {
inherit (super.nyxt) pname;
version = "2.2.4";
version = "3.1.0";
lispLibs = super.nyxt.lispLibs ++ (with super; [
cl-cffi-gtk cl-webkit2 mk-string-metrics cl-css
]);
lispLibs = with super; [
self.nasdf-unstable
self.prompter
self.cl-colors2_0_5_3
self.njson_1_0_0
self.nsymbols_0_3_1
self.nclasses_0_5_0
self.nfiles_1_1_2
self.quri_7_0
self.cl-webkit2_3_5_8
self.swank
alexandria
bordeaux-threads
calispel
cl-base64
cl-gopher
cl-html-diff
cl-json
cl-ppcre
cl-ppcre-unicode
cl-prevalence
cl-qrencode
cl-tld
closer-mop
cl-containers
dissect
moptilities
dexador
enchant
flexi-streams
history-tree
idna
iolib
lass
local-time
lparallel
log4cl
montezuma
ndebug
nhooks
nkeymaps
osicat
parenscript
py-configparser
serapeum
str
phos
plump
clss
spinneret
slynk
trivia
trivial-clipboard
trivial-features
trivial-garbage
trivial-package-local-nicknames
trivial-types
unix-opts
cluffer
cl-cffi-gtk
cl-gobject-introspection
];
src = pkgs.fetchzip {
url = "https://github.com/atlas-engineer/nyxt/archive/2.2.4.tar.gz";
sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
rev = "3.1.0";
sha256 = "sha256-H3AlslECb/VvIC6zAGkLNTaGJ/nb97J6RXAN8sEgAgY=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
@ -284,27 +478,27 @@ let
pkgs.gnome.adwaita-icon-theme
];
buildScript = pkgs.writeText "build-nyxt.lisp" ''
(load "${super.nyxt.asdfFasl}/asdf.${super.nyxt.faslExt}")
(asdf:load-system :nyxt/gtk-application)
(sb-ext:save-lisp-and-die "nyxt" :executable t
#+sb-core-compression :compression
#+sb-core-compression t
:toplevel #'nyxt:entry-point)
# This is needed since asdf:make tries to write in the directory of the .asd file of the system it's compiling
postConfigure = ''
export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)//
'';
buildScript = pkgs.writeText "build-nyxt.lisp" ''
(load "${super.nyxt.asdfFasl}/asdf.${super.nyxt.faslExt}")
;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:make instead
(asdf:make :nyxt/gi-gtk-application)
'';
# Run with WEBKIT_FORCE_SANDBOX=0 if getting a runtime error
# See https://github.com/atlas-engineer/nyxt/issues/1781
# TODO(kasper): use wrapGAppsHook
installPhase = super.nyxt.installPhase + ''
rm -v $out/nyxt
mkdir -p $out/bin
cp -v nyxt $out/bin
wrapProgram $out/bin/nyxt \
--set WEBKIT_FORCE_SANDBOX 0 \
--prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \
--prefix XDG_DATA_DIRS : $XDG_ICON_DIRS \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
--prefix GIO_EXTRA_MODULES ":" ${pkgs.dconf.lib}/lib/gio/modules/ \
--prefix GIO_EXTRA_MODULES ":" ${pkgs.glib-networking}/lib/gio/modules/
'';

View file

@ -2,14 +2,16 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pillow
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.2.2";
format = "setuptools";
version = "2.3.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -17,11 +19,16 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ZvyAZ/VLkkZkDTBzuxt7hrCuYxNsMHm0C0wkabnE3Ek=";
hash = "sha256-vKIqBbWQNgv1v73P6K51K+yaqXgC1BtllZ59yTNPr2g=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
async-timeout
pillow
];
nativeCheckInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "4.11.0";
version = "4.13.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-qoUaKbbB2x3eO6IiXwn3kl/C6NA5biZbzRHctoNFdQE=";
hash = "sha256-Za/cyt/tCvzLTfIgS5Ifjbb9jPtdCojNzzI5WeBiO6I=";
};
propagatedBuildInputs = [

View file

@ -1,10 +1,17 @@
{ lib, buildPythonPackage, fetchFromGitHub
, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, wheel
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
version = "0.18.6";
pname = "bacpypes";
disabled = pythonAtLeast "3.9";
version = "0.18.6";
format = "setuptools";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "JoelBender";
@ -13,19 +20,33 @@ buildPythonPackage rec {
hash = "sha256-BHCHI36nTqBj2dkHB/Y5qkC4uJCmzbHGzSFWKNsIdbc=";
};
propagatedBuildInputs = [ wheel ];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," "" \
--replace "(3, 8): 'py34'," "(3, 8): 'py34', (3, 9): 'py34', (3, 10): 'py34', (3, 11): 'py34', (3, 12): 'py34',"
'';
propagatedBuildInputs = [
wheel
];
nativeCheckInputs = [
pytestCheckHook
];
# Using pytes instead of setuptools check hook allows disabling specific tests
nativeCheckInputs = [ pytestCheckHook pytest-runner ];
dontUseSetuptoolsCheck = true;
disabledTests = [
# Test fails with a an error: AssertionError: assert 30 == 31
"test_recurring_task_5"
];
pythonImportsCheck = [
"bacpypes"
];
meta = with lib; {
description = "Module for the BACnet application layer and network layer";
homepage = "https://github.com/JoelBender/bacpypes";
description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces.";
changelog = "https://github.com/JoelBender/bacpypes/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ bachp ];
};

View file

@ -1,25 +1,39 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, pytest, pytest-runner, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
version = "1.0.0";
pname = "ci-py";
version = "1.0.0";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7";
hash = "sha256-R/6bLsXOKGxiJDZUvvOuvLp3usEhfg698qvvgOwBXYk=";
};
nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires
nativeCheckInputs = [ pytest pytestCheckHook ];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner', " ""
'';
pythonImportsCheck = [ "ci" ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"ci"
];
meta = with lib; {
description = "Library for working with Continuous Integration services";
homepage = "https://github.com/grantmcconnaughey/ci.py";
changelog = "https://github.com/grantmcconnaughey/ci.py/blob/master/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "elkm1-lib";
version = "2.2.3";
version = "2.2.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "elkm1";
rev = "refs/tags/${version}";
hash = "sha256-d676gLABChQn67E4q4koxwBRmurBWuFxSo/u+W5F8CI=";
hash = "sha256-qqkKsVSspVBVxX96vlM8+6SqfdIBTcVyODJzQ4Ga+6g=";
};
nativeBuildInputs = [

View file

@ -6,6 +6,7 @@
, google-auth
, google-auth-oauthlib
, google-cloud-pubsub
, pydantic
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "2.2.4";
version = "2.2.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = "refs/tags/${version}";
hash = "sha256-HQzU6no/DV2QOC+LV7kUSrygTwgAvfMSmYIKaBd/PCE=";
hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis=";
};
propagatedBuildInputs = [
@ -32,6 +33,7 @@ buildPythonPackage rec {
google-auth
google-auth-oauthlib
google-cloud-pubsub
pydantic
requests-oauthlib
];

View file

@ -1,26 +1,34 @@
{ buildPythonPackage
{ lib
, blessed
, buildPythonPackage
, fetchPypi
, lib
, mockito
, nvidia-ml-py
, psutil
, pytest-runner
, pythonRelaxDepsHook
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "gpustat";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WB6P+FjDLJWjIruPA/HZ3D0Xe07LM93L7Sw3PGf04/E=";
};
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "nvidia-ml-py" ];
pythonRelaxDeps = [
"nvidia-ml-py"
];
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
blessed
@ -33,11 +41,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "gpustat" ];
pythonImportsCheck = [
"gpustat"
];
meta = with lib; {
description = "A simple command-line utility for querying and monitoring GPU status";
homepage = "https://github.com/wookayin/gpustat";
changelog = "https://github.com/wookayin/gpustat/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ billhuang ];
};

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.25";
version = "0.26";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "dr-prodigy";
repo = "python-holidays";
rev = "refs/tags/v.${version}";
hash = "sha256-D6MCLbuNnafWMDyEc/jeyfOs0VVV92AndtNsjyFDgEg=";
hash = "sha256-4kRIhIjOQB23ihZBs6J6/ZriLiMD87m/xOqMXga5Ypw=";
};
propagatedBuildInputs = [

View file

@ -16,20 +16,20 @@
buildPythonPackage rec {
pname = "johnnycanencrypt";
version = "0.13.1";
version = "0.14.1";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "kushaldas";
repo = "johnnycanencrypt";
rev = "v${version}";
hash = "sha256-1zHdV0QNYgeJIMaSljIMtqjpkwih2+s8jAaQnCumdgw=";
hash = "sha256-13zIC+zH/BebMplUfdtiwEEVODS+jTURC1vudbmQPlA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-nsVC2plY2yXjOZBvM4GYNQJqHR+ZWxfiDjPcTCoe6+0=";
hash = "sha256-u3qKli76XGS0Ijg15BQzbFlfLPpBPFKh++EZLfnO9ps=";
};
format = "pyproject";

View file

@ -1,23 +1,58 @@
{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }:
{ lib
, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
, responses
, six
}:
buildPythonPackage rec {
pname = "lyricwikia";
version = "0.1.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "enricobacis";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-P88DrRAa2zptt8JLy0/PLi0oZ/BghF/XGSP0kOObi7E=";
};
buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ six beautifulsoup4 requests ];
# upstream has no code tests
doCheck = false;
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'" ""
'';
propagatedBuildInputs = [
beautifulsoup4
requests
six
];
nativeCheckInputs = [
pytestCheckHook
responses
];
pythonImportsCheck = [
"lyricwikia"
];
disabledTests = [
# Test requires network access
"test_integration"
];
meta = with lib; {
homepage = "https://github.com/enricobacis/lyricwikia";
maintainers = [ maintainers.kmein ];
description = "LyricWikia API for song lyrics";
homepage = "https://github.com/enricobacis/lyricwikia";
changelog = "https://github.com/enricobacis/lyricwikia/releases/tag/${version}";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ kmein ];
};
}

View file

@ -1,38 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, requests
, python
# For tests/setup.py
, pytest
, pytest-runner
, requests-mock
}:
buildPythonPackage rec {
pname = "packet-python";
version = "1.44.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WVfMELOoml7Hx78jy6TAwlFRLuSQu9dtsb6Khs6/cgI=";
};
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ requests ];
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
requests
];
nativeCheckInputs = [
pytest
pytest-runner
pytestCheckHook
requests-mock
];
checkPhase = ''
${python.interpreter} setup.py test
'';
pythonImportsCheck = [
"packet"
];
meta = {
description = "A Python client for the Packet API.";
homepage = "https://github.com/packethost/packet-python";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ dipinhora ];
meta = with lib; {
description = "Python client for the Packet API";
homepage = "https://github.com/packethost/packet-python";
changelog = "https://github.com/packethost/packet-python/blob/v${version}/CHANGELOG.md";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ dipinhora ];
};
}

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "18.1.5";
version = "18.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-X8I0359Wq0jojDq0e7jJjxoRlQ8ZdUzIWPnV/1A+Mwg=";
hash = "sha256-inu0lTY2JQhlFEgJOejMhcHJhYvH6OzYo8qmAy9xBFo=";
};
postPatch = ''

View file

@ -1,38 +1,47 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
, msgpack
, greenlet
, pythonOlder
, isPyPy
, pytest-runner
}:
buildPythonPackage rec {
pname = "pynvim";
version = "0.4.3";
disabled = pythonOlder "3.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OnlTeL3l6AkvvrOhqZvpxhPSaFVC8dsOXG/UZ+7Vbf8=";
};
nativeBuildInputs = [
pytest-runner
postPatch = ''
substituteInPlace setup.py \
--replace " + pytest_runner" ""
'';
propagatedBuildInputs = [
msgpack
] ++ lib.optional (!isPyPy) [
greenlet
];
# Tests require pkgs.neovim,
# which we cannot add because of circular dependency.
# Tests require pkgs.neovim which we cannot add because of circular dependency
doCheck = false;
propagatedBuildInputs = [ msgpack ]
++ lib.optional (!isPyPy) greenlet;
pythonImportsCheck = [
"pynvim"
];
meta = {
meta = with lib; {
description = "Python client for Neovim";
homepage = "https://github.com/neovim/python-client";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
homepage = "https://github.com/neovim/pynvim";
changelog = "https://github.com/neovim/pynvim/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

View file

@ -1,22 +1,24 @@
{ lib
, buildPythonPackage
, defusedxml
, fetchPypi
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pyobihai";
version = "1.4.1";
version = "1.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
# GitHub release, https://github.com/dshokouhi/pyobihai/issues/10
src = fetchPypi {
inherit pname version;
hash = "sha256-L/AQy9IxsBDeSlu+45j+/86jjMFzTjAkPGwZoa1QYho=";
src = fetchFromGitHub {
owner = "ejpenney";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-tDPu/ceH7+7AnxokADDfl+G56B0+ri8RxXxXEyWa61Q=";
};
propagatedBuildInputs = [
@ -24,16 +26,18 @@ buildPythonPackage rec {
requests
];
# Project has no tests
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pyobihai"
];
meta = with lib; {
description = "Python package to interact with Obihai devices";
homepage = "https://github.com/dshokouhi/pyobihai";
description = "Module to interact with Obihai devices";
homepage = "https://github.com/ejpenney/pyobihai";
changelog = "https://github.com/ejpenney/pyobihai/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View file

@ -1,41 +1,51 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pytest
, pylint
, six
, pytest-runner
, pytest
, pytestCheckHook
, pythonOlder
, toml
}:
buildPythonPackage rec {
pname = "pytest-pylint";
version = "0.19.0";
disabled = isPy27;
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI=";
};
nativeBuildInputs = [ pytest-runner ];
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
buildInputs = [ pytest ];
buildInputs = [
pytest
];
propagatedBuildInputs = [
pylint
six
toml
];
# tests not included with release
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pytest_pylint"
];
meta = with lib; {
description = "pytest plugin to check source code with pylint";
description = "Pytest plugin to check source code with pylint";
homepage = "https://github.com/carsongee/pytest-pylint";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

View file

@ -0,0 +1,63 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pydantic
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "python-opensky";
version = "0.0.10";
format = "pyproject";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "joostlek";
repo = "python-opensky";
rev = "refs/tags/v${version}";
hash = "sha256-QhcnbFp37gj1/37OlRxnQnIhgyNi/D19PXRh5hagHvE=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace "--cov" ""
substituteInPlace src/python_opensky/opensky.py \
--replace ".joinpath(uri)" "/ uri"
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
pydantic
yarl
];
nativeCheckInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"python_opensky"
];
meta = with lib; {
description = "Asynchronous Python client for the OpenSky API";
homepage = "https://github.com/joostlek/python-opensky";
changelog = "https://github.com/joostlek/python-opensky/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,38 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, virtualenv
, pytest-runner
, pytest-virtualenv
, pythonOlder
, twisted
, pathlib2
}:
buildPythonPackage rec {
pname = "setuptools_trial";
pname = "setuptools-trial";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12";
pname = "setuptools_trial";
inherit version;
hash = "sha256-FCIPj3YcSLoeJSbwhxlQd89U+tcJizgs4iBCLw/1mxI=";
};
buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ];
propagatedBuildInputs = [ twisted pathlib2 ];
postPatch = ''
sed -i '12,$d' tests/test_main.py
'';
propagatedBuildInputs = [
twisted
];
# Couldn't get tests working
doCheck = false;
pythonImportsCheck = [
"setuptools_trial"
];
meta = with lib; {
description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit.";
description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit";
homepage = "https://github.com/rutsky/setuptools-trial";
license = licenses.bsd2;
maintainers = with maintainers; [ ryansydnor ];
};
}

View file

@ -0,0 +1,56 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, netifaces
, python-engineio
, python-socketio
, pythonOlder
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "sisyphus-control";
version = "3.1.3";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "jkeljo";
repo = "sisyphus-control";
rev = "refs/tags/v${version}";
hash = "sha256-FbZWvsm2NT9a7TgHKWh/LHPsse6NBLK2grlOtHDbV2Y=";
};
pythonRelaxDeps = [
"python-engineio"
"python-socketio"
];
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
aiohttp
netifaces
python-engineio
python-socketio
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"sisyphus_control"
];
meta = with lib; {
description = "Control your Sisyphus Kinetic Art Table";
homepage = "https://github.com/jkeljo/sisyphus-control";
changelog = "https://github.com/jkeljo/sisyphus-control/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "solax";
version = "0.3.1";
version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-kseU6JK00GTPyqdWku2ceT5/mChMVVPgEEib3BmjI/g=";
hash = "sha256-7UDTG8rw9XJd5LPqcAe2XyE7DQa96dBj9YOcgW+/aFc=";
};
nativeBuildInputs = [

View file

@ -1,20 +1,22 @@
{ buildPythonPackage
, isPy27
{ lib
, buildPythonPackage
, fetchPypi
, pytest-runner
, setuptools-scm
, pytestCheckHook
, pythonOlder
, setuptools-scm
, six
, lib
}:
buildPythonPackage rec {
pname = "variants";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version ;
sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90";
inherit pname version;
hash = "sha256-UR91tM90g8J+TYbZrM8rUxcmeQDBZtF2Nr7u0RiSm5A=";
};
nativeBuildInputs = [
@ -26,9 +28,14 @@ buildPythonPackage rec {
six
];
pythonImportsCheck = [
"variants"
];
meta = with lib; {
description = "Library providing syntactic sugar for creating variant forms of a canonical function";
homepage = "https://github.com/python-variants/variants";
changelog = "https://github.com/python-variants/variants/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ rakesh4g ];
};

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "xknxproject";
version = "3.1.0";
version = "3.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = "xknxproject";
rev = "refs/tags/${version}";
hash = "sha256-j9Bfzl1cYhmDV2Cw4/aobo6Uai50V5JrzQWrrkDm3lw=";
hash = "sha256-4FZJsw/x7yYPyAc26YTMWMzJuSGC3fkh3PunfUXmEUw=";
};
nativeBuildInputs = [

View file

@ -8,14 +8,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "memray";
version = "1.7.0";
version = "1.8.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "bloomberg";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-FM6DVBnYgvciTeF9bf2NDvHGsnccxKqcR5ATj6daQ4w=";
hash = "sha256-jn14bWluN8kApIVpXX5TeoFA1FDTlkOaz6QfFSz0ojU=";
};
nativeBuildInputs = [

View file

@ -22,41 +22,41 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.181-hardened1.patch",
"sha256": "0dp50zakzxxalc4zdsw8jjhzi1vnb4x3wkdcnxxjpcikn9mg6jj7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.181-hardened1/linux-hardened-5.10.181-hardened1.patch"
"name": "linux-hardened-5.10.182-hardened1.patch",
"sha256": "1230wh6wjvmv3mv2sylwcqvqbz83b4vwwpbn7zikd7mmz2619k5w",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.182-hardened1/linux-hardened-5.10.182-hardened1.patch"
},
"sha256": "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc",
"version": "5.10.181"
"sha256": "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny",
"version": "5.10.182"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.114-hardened1.patch",
"sha256": "1nhx1k6dxnqrgv6m6c69858018cda65l4135742wlyd4vgi7ikq7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.114-hardened1/linux-hardened-5.15.114-hardened1.patch"
"name": "linux-hardened-5.15.115-hardened1.patch",
"sha256": "1gkmhhfv86vnja37xfrnl65n6hzq429lc5zlxjvjmrpagl2x1pfc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.115-hardened1/linux-hardened-5.15.115-hardened1.patch"
},
"sha256": "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9",
"version": "5.15.114"
"sha256": "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv",
"version": "5.15.115"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.244-hardened1.patch",
"sha256": "1ap8ipkxbsqflf2lwppz41v5jrl6qbblf6ig2id6x3mjd6v0lph3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.244-hardened1/linux-hardened-5.4.244-hardened1.patch"
"name": "linux-hardened-5.4.245-hardened1.patch",
"sha256": "0n5ifykd1gq8yiw3snw6lhpz2hhydj3nk9k2f80b9svmza2h4vi6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.245-hardened1/linux-hardened-5.4.245-hardened1.patch"
},
"sha256": "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch",
"version": "5.4.244"
"sha256": "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn",
"version": "5.4.245"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.31-hardened1.patch",
"sha256": "04baw5z9nk4fjinnj1plg47b8wi8fqwj0v8si91zz19mzgpkfkkz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch"
"name": "linux-hardened-6.1.32-hardened1.patch",
"sha256": "00sg3zmvvnyvc4j82lcj4r7yw5hwvc253w0g2fr1hqqvh4fhinhw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.32-hardened1/linux-hardened-6.1.32-hardened1.patch"
},
"sha256": "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8",
"version": "6.1.31"
"sha256": "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w",
"version": "6.1.32"
}
}

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.316";
version = "4.14.317";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0xlg93va7dbz2w428kiw7vr2sds3542fqq57rwyf51ykq7qii0xc";
sha256 = "0c1wy0m0jnjpc6scrw1y97wsg2d18vb1bi31i1qzlxvgmrd8zwlc";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.284";
version = "4.19.285";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0gnhgxcpx9s96wa3dqgxmdjb7x12i94yh0gmv7k9nbz5qwhfxfbz";
sha256 = "05nwivdk4w939vrrbn5p2yai1rz7kxqa4bl5f3n6d867b59pg8da";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.182";
version = "5.10.183";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny";
sha256 = "06b1nlwaqs7g3323zxp1bxfilqpbj700x591vqa9dx6a6p39g520";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.115";
version = "5.15.116";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv";
sha256 = "16hpdqlkz2g2pjcml7j55yfym6nbp0zg8f2r969wq9jkpg8wj5zn";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.245";
version = "5.4.246";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn";
sha256 = "1snrgvpqpmc0d4aphq8flsmlcjjx9kgknymjlrmazl4ghl57jf09";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.32";
version = "6.1.33";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w";
sha256 = "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.3.6";
version = "6.3.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1vr418rf0zd16fq4vaxda1w2ccng2n9l0ysakmgz9xqbz86iysks";
sha256 = "1acpbddgxna1g8xzsil5r1fbsiw8z3wdr69y8xxjllkck51rfdpy";
};
} // (args.argsOverride or { }))

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.180-rt88"; # updated by ./update-rt.sh
version = "5.10.78-rt55"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys";
sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1509lg9gdjbjmg8rpx17n34xid2v1qz1lmil05b78sz86bscb2s2";
sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";
};
}; in [ rt-patch ] ++ kernelPatches;

View file

@ -5,8 +5,8 @@
let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.10.5";
libsSha256 = "sha256-5a5ePcMHAlniJ8sU/5kKdRp5YkJ6tcr4h5Ru4Oc2kQY=";
libsRev = "0.11.0";
libsSha256 = "sha256-QvRTz3yMS6i+qdiSG51wvho9D7w/dMQhY72OYd3qOgU=";
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
valijson = fetchFromGitHub {
@ -16,11 +16,12 @@ let
sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
};
# https://github.com/draios/sysdig/blob/0.31.5/cmake/modules/driver.cmake
driver = fetchFromGitHub {
owner = "falcosecurity";
repo = "libs";
rev = libsRev;
sha256 = libsSha256;
rev = "5.0.1+driver";
sha256 = "sha256-CQ6QTcyTnThpJHDXgOM1Zdp5SG7rngp9XtEM+2mS8ro=";
};
in
@ -35,6 +36,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-RuoPqVulATtn7jSga/8fECs7weNfjt/YFh7iHmfCKjw=";
};
# to fix the build against the latest kernel
patches = [
(fetchpatch {
url = "https://github.com/draios/sysdig/compare/35ded9aab87801281e22898242e24e0bc63873b2...954e6fc6238f21d4870a491395d68a7dd3062aa9.patch";
sha256 = "sha256-gnLURnv8FW5LvqjbreCf9DPGdBcn7rfizGeznFqJ+Fk=";
})
];
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
buildInputs = [
luajit
@ -84,8 +93,11 @@ stdenv.mkDerivation rec {
"-DCREATE_TEST_TARGETS=OFF"
] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
# needed since luajit-2.1.0-beta3
env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
env.NIX_CFLAGS_COMPILE =
# needed since luajit-2.1.0-beta3
"-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " +
# fix compiler warnings been treated as errors
"-Wno-error";
preConfigure = ''
if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
@ -114,9 +126,13 @@ stdenv.mkDerivation rec {
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
else
xz -d $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko.xz
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
xz $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do
if test -f "$i"; then
xz -d $i
sed -i "s#$kernel_dev#................................#g" ''${i%.xz}
xz -9 ''${i%.xz}
fi
done
fi
'';

View file

@ -3646,7 +3646,8 @@
"siren" = ps: with ps; [
];
"sisyphus" = ps: with ps; [
]; # missing inputs: sisyphus-control
sisyphus-control
];
"sky_hub" = ps: with ps; [
pyskyqhub
];

View file

@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tagref";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-igzlSkoVffn0X/eJrNi9u0aLc17KREuUtIwxGvsF6hc=";
sha256 = "sha256-BZ0by5H6yZuvksMneor02rx0kXlvO9tdpWivRDB9qDs=";
};
cargoHash = "sha256-FNgMM+fOEbkCqRPgJmGiuoUJP9NRBxjSTwFIPyaT5d0=";
cargoHash = "sha256-w+YU0+/vba/fRYbLAmOloOuHMWbFiEyt3b0mfIvFE0Q=";
meta = with lib; {
description = "Tagref helps you refer to other locations in your codebase.";

View file

@ -25136,10 +25136,12 @@ with pkgs;
sbcl_2_3_4 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; };
faslExt = "fasl";
flags = [ "--dynamic-space-size" "3000" ];
};
sbcl_2_3_5 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; };
faslExt = "fasl";
flags = [ "--dynamic-space-size" "3000" ];
};
sbcl = sbcl_2_3_5;

View file

@ -7821,6 +7821,8 @@ self: super: with self; {
python-openems = callPackage ../development/python-modules/python-openems { };
python-opensky = callPackage ../development/python-modules/python-opensky { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };
python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
@ -11231,6 +11233,8 @@ self: super: with self; {
sipyco = callPackage ../development/python-modules/sipyco { };
sisyphus-control = callPackage ../development/python-modules/sisyphus-control { };
siuba = callPackage ../development/python-modules/siuba { };
six = callPackage ../development/python-modules/six { };