ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-12-12 00:04:22 +00:00 committed by GitHub
commit 7caf38af18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 432 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/games/factorio.nix
View File

@ -39,7 +39,7 @@ let
} // cfg.extraSettings;
serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins);
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat;
in
{
options = {
@ -136,6 +136,15 @@ in
derivations via nixos-channel. Until then, this is for experts only.
'';
};
mods-dat = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Mods settings can be changed by specifying a dat file, in the [mod
settings file
format](https://wiki.factorio.com/Mod_settings_file_format).
'';
};
game-name = mkOption {
type = types.nullOr types.str;
default = "Factorio Game";

6
pkgs/applications/audio/reaper/default.nix
View File

@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.66";
version = "6.71";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs=";
aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo=";
x86_64-linux = "sha256-AHi0US3U4PU/IrlCahJbm+tkmsz+nh0AFOk0lB2lI3M=";
aarch64-linux = "sha256-/yCV7wllQ024rux4u4Tp9TZK8JMN9Tk0DFJY3W2BGAk=";
}.${stdenv.hostPlatform.system};
};

4
pkgs/applications/backup/unifi-protect-backup/default.nix
View File

@ -2,7 +2,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "unifi-protect-backup";
version = "0.8.3";
version = "0.8.7";
format = "pyproject";
@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "ep1cman";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3iOaJZAvkhjiWLKI1m2hmVkWLaNtq74nQZYIm/XCgeA=";
hash = "sha256-VIA7/jWMuAWYle3tBDgKU5PJ9wkHChEjNns8lhYr1K8=";
};
preBuild = ''

198
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -437,12 +437,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2022-11-19";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "2d1de481a94a3be428c87ab0404c38e58b386813";
sha256 = "0g780ykjiya6clc3yi8ky4lxhyj2ayc629wn5i2iq8siwm4ab07v";
rev = "508b8c64bfbc2ad3106ae67b7828936035b3095e";
sha256 = "19i19r1z0dqb24fg2z5fpi5m2n155n3v5pw2hq8cq28m0392rbvd";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -535,12 +535,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2022-12-06";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "42a17dec166783dc50b7105a0837f715fe9bd432";
sha256 = "1l8g4aiyxw207nrrb0vjbyqc1n91smxv5g8n8m0hd6wlw0fia1ls";
rev = "8bcbb2995822c4062d00cb41df713fd76092f04f";
sha256 = "0n7adhyc30778zd0l1pfml0xna8zfxcahzr9fxryqkx0ragp94jn";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -751,12 +751,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2022-11-22";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "da03666a61af32eb0f57b37f18c020a3a33a44d4";
sha256 = "06ygwxgxzrma96waa3dc8sk258kfv4gjdjf80lg5sc41iv972x6r";
rev = "9639b071d9680764b6e57b08c9fa4a336453558d";
sha256 = "034ynhab8mq00w6zhdni8qz6fvvwaa33fshk5q36379lamcrlxq4";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@ -979,12 +979,12 @@ final: prev:
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar.vim";
version = "2022-12-05";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
rev = "8eee411e280277cd186a3fea0debe754132b5b7b";
sha256 = "0haf5ls2y7p6b6nc7b9wlr47h7wbxnk8v6m2mpgvdmbrqylwp9zp";
rev = "3b91377f0e8655894b29c166c796ab9e2c0bf077";
sha256 = "1121rlyd9kj08ixnjq541x02ckf5g2l1gyic342d11lpwwbpmqc7";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@ -2023,24 +2023,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "3cc371dbddb400c0fc5e8edeb423b14cd5084276";
sha256 = "1wblwq215xldsl86m728866n677q064x55xm425riisd376xarka";
rev = "9a1f60036152f55337095f754d2cba7c56224357";
sha256 = "1idfkgvgswz2jlrp06ijazfh6j3qd57x9m1swzq0r412q504bnll";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "ccc1f692da9fbb9a87fe7eb5ccd341a3c35283a6";
sha256 = "021cyhwza7skml7j0k26mf159myr4d8j8m9rq01id0j3xy5zqjgb";
rev = "eb30460696570af7d6adc75870274ec541cfce71";
sha256 = "1d67vyvz8fwibsp8vbiqjkjdkxcixgj53czc1v2p50q3d98bhv49";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2059,12 +2059,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "95d658235c75016dcfd4e1468d07de72a4bfad49";
sha256 = "1nsy1j221hps1z3rxvq9xd4k29wxjl3wss2dcpgcillgspl9rrrz";
rev = "6a49da213ab217360cbcad46df01f3be74a2970e";
sha256 = "0dn47bwk4irpwb0r99zw2m23nqvas9hc5k78vxssr1zpilcbg58d";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2625,12 +2625,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2022-12-06";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "7645a4de7d60a31ff75ddda52f224889ee4cc3f5";
sha256 = "0nc4pzwa6nzk5nc5h6qx9srawq5vb0nl2f7dhkcrwv2k4mci3b56";
rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff";
sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@ -3348,12 +3348,12 @@ final: prev:
graphviz-vim = buildVimPluginFrom2Nix {
pname = "graphviz.vim";
version = "2021-04-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "graphviz.vim";
rev = "12b04c512694ace2fc15735676f5afdd05519466";
sha256 = "1ky9rar3gxvsf0n3y71qfln4pxmz3hpq3dqimbf0r8l8q7sw483r";
rev = "773d5a5d014af5ed19ec3f2c182c1a167ff958f2";
sha256 = "1hhn96pm7vkxjridf0piqy400z79injvqw1hg943w0aa7pq2y46z";
};
meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
};
@ -3467,12 +3467,12 @@ final: prev:
haskell-tools-nvim = buildVimPluginFrom2Nix {
pname = "haskell-tools.nvim";
version = "2022-12-06";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "d21677e8901577b52b37dadec03030c4e5f4cd53";
sha256 = "1jlr8yp5vkx3vs5i3cprmhljsnrq54ssj1nqcjgmmak2brhlgrjz";
rev = "c2701b5d15f9634dbdcae0e34d6f6ec952adc5da";
sha256 = "1s8vm54d3n5c1g89cw04n88fmyn6cgcyygshpj46m0qgykpigs20";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -4295,12 +4295,12 @@ final: prev:
litee-nvim = buildVimPluginFrom2Nix {
pname = "litee.nvim";
version = "2022-10-15";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ldelossa";
repo = "litee.nvim";
rev = "c28f62b9eb78afc398e070b650c59e1fb8668b66";
sha256 = "06mn4np083am7l3dspf7j8nfkin5k86pdg3gymyqzf6mj8vs90y8";
rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2";
sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq";
};
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
};
@ -4486,12 +4486,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2022-12-05";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "5ce70a08442e97ac55ce14e71dd7d151ea5f4d8e";
sha256 = "1fncj4l72pwhwx9drqplm432zjg76y4clyw2kdpivs6nvghisjfv";
rev = "40b5c6272384d90365e7149e0fcc73afae5e87cc";
sha256 = "1hsp7d9mb877whm7rcbvg4k3l9rjz3p3jfjwsr6n6wpspq9xids1";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -4607,12 +4607,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2022-12-02";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "6402c79d73c07ad19374dc7b4f9d4bdfc2f57f42";
sha256 = "0iqc4l9qdr1y3nbkzijcp2c1in8r1ybqvbjl9p92x6zdvmxff2jr";
rev = "82e04074117635ebe7ae2202953a0c3d78db5146";
sha256 = "1rr5xb4nkwm4vjk8v2065dy7d55qgh8wr6fhgash2gzrfjvm7b8a";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -4967,12 +4967,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "44da95e38c294ddc43fe6b39df6b6e99ecfda52a";
sha256 = "1hkzf105900zfclan6qckpvljs0mk48dgjxdf80fq0khy0c1whhy";
rev = "7c59fa1292377a43e314d6d493438ff8af8aa853";
sha256 = "0n4n5cyppnhwg5gd865iy6ifm36ysw876v5rphnhlvlsa34alng6";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5135,12 +5135,12 @@ final: prev:
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
rev = "a77f3ab85518b0cfb43d6074c27f3a2abc0aac75";
sha256 = "1fwmx1b6z8pfbb2baj198saliwf5572bvh69ma1ch6zm593vkp2z";
rev = "21f4b943ea3a39c3046aac9d286bdc13be6f50da";
sha256 = "0g79qsa34d7xz45cn6apcp1npkkbjwbijkgzylxllaz27pd7g2k4";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
@ -5399,12 +5399,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "a0acd495f5edce6d4d5d3c6bd63d2319ccded9ed";
sha256 = "1d5ybbpl0vfszfxjx9rkvd76j8jibcjqbgb9njy36d15qq3fv0ph";
rev = "adaa799264c92eea42d500c8b98e19caf32c14dc";
sha256 = "1vi9n07mf258pkkhh8c28l846j88f248gzwcrv40i8n3v3mxz7f6";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -5639,12 +5639,12 @@ final: prev:
nvim-dap-go = buildVimPluginFrom2Nix {
pname = "nvim-dap-go";
version = "2022-11-04";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "leoluz";
repo = "nvim-dap-go";
rev = "c75921726ccfe97070285f206de49eddff276ea5";
sha256 = "1sgz5vkkw0zmpnmdfla2k3bvkax5pvn2y9g79xq3vhg9x6gyil5s";
rev = "4dd9c899997599c93a28aadf864a7924a4031f3e";
sha256 = "19r5fhn9iy6bis84q373dslb15pi30ca2dv85ll7dwizyz8kvdac";
};
meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
};
@ -5879,12 +5879,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "8a3e5f9add9cd408c7063619c8d612700bf25d4d";
sha256 = "1cjv3pdbmgjh956sp02vjg4i5bjfimj8awahvw9a9bjkwr56d8wl";
rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386";
sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -6107,24 +6107,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2022-12-03";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "f8489c992998e1e1b45aec65bdb9615e5cd59a61";
sha256 = "0md5xavzksj4lh1vbd24zq29bwgcb7057dw31invc7adm7sfh1wr";
rev = "7177d95ac0f46bf02ff3f8375e135149a3fc79b8";
sha256 = "1h0qvy6dh1lkm74r11r6d989adfbcx3xszyj13pchcangp7mhfrv";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-12-09";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "35ad87384b3e47b3b5758d1642bbea08c70200c0";
sha256 = "0jy5lq1r7dq1ib3mmx3izihcxv985rda468h33y0hvk11l36mx88";
rev = "619f1ace03860d668c7a661332c38480f2db2584";
sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -6167,12 +6167,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2022-11-27";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "98476e7364821989ab9b500e4d20d9ae2c5f6564";
sha256 = "1gvksha3l3pripy7rsk1axr9n0wmzsh2xr1461vjz3314sdfikyj";
rev = "e8b7807e0398754bd7dbb5cae043340374975f77";
sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -6215,12 +6215,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2022-11-26";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
rev = "189ad3790d57c548896a78522fd8b0d0fc11be31";
sha256 = "1k45pgz1jldkrczxyhhv6abj1klbkl07g2lxw7hhlsbyflg7h9sv";
rev = "05e1072f63f6c194ac6e867b567e6b437d3d4622";
sha256 = "1b53nrmzga6bkf6cdck3hdwjyrlslyrsa7jv55198jy153y8qq2z";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@ -6383,12 +6383,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
version = "2022-11-06";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
rev = "0cd9f681bee019715bfbe928891579a3af3331e8";
sha256 = "0rgmzi1ivh1xjjmsfdjwljvm175sr0pbmbf2gixqmi22dfkndcwq";
rev = "d6ff2f0f4b4e16cc458a45abafa80718f3101db9";
sha256 = "1whk7afv98yc786a12dls2x9x0x6i2ydmy6lgqjqls8c89q30j19";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@ -6419,12 +6419,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2022-12-07";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "d3980a5cda71266579ef773168d7750e04911877";
sha256 = "1wlmzsj70x891bcxkdcwgx7hiljhgcl73w2i9vadk4n51hxc57h7";
rev = "aba09c510a60ad469f3fd46e0a7c492ec610e5fb";
sha256 = "0mv1wa4p5bsylvjc7z979bhh3flpyndkvzvz079l2kanja033996";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@ -7105,12 +7105,12 @@ final: prev:
seoul256-vim = buildVimPluginFrom2Nix {
pname = "seoul256.vim";
version = "2022-08-18";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "junegunn";
repo = "seoul256.vim";
rev = "1c48e3e1e3f3521920788d90a83819cff14eadc9";
sha256 = "092szdfi1nmap52i7pcm51k2ymqj0hd4kii66pgaqsskslnc03gk";
rev = "9faf491b28c747707037b6b47c6a52af313b9c17";
sha256 = "1n39rfb1747yrziv2cja1ahlmj4ja2w7ww4lyr2q1r3whb71jrw0";
};
meta.homepage = "https://github.com/junegunn/seoul256.vim/";
};
@ -8082,12 +8082,12 @@ final: prev:
thesaurus_query-vim = buildVimPluginFrom2Nix {
pname = "thesaurus_query.vim";
version = "2022-01-30";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ron89";
repo = "thesaurus_query.vim";
rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332";
sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi";
rev = "92be7e003236f4d43b86ad1b84d092fceb982ed4";
sha256 = "0xpkns5c8f0svcj6h9kff6y0909vw0yzg1fs9n9xgnx7r1qgcb5k";
};
meta.homepage = "https://github.com/ron89/thesaurus_query.vim/";
};
@ -8239,12 +8239,12 @@ final: prev:
treesj = buildVimPluginFrom2Nix {
pname = "treesj";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "Wansmer";
repo = "treesj";
rev = "1c4447d01cfed64fdb9a62fd69611dc8d6b9ade0";
sha256 = "188xd9zwy9kx3gmlagbk4rw2wsspszx8zqg57kv6xa15zb4c6366";
rev = "3a28195c7d683fe076df51849f8252c7da50c8b4";
sha256 = "1aj8m1845dajiffisw23fha6w5r34m2k7dipdarm9qkipf59i3b2";
};
meta.homepage = "https://github.com/Wansmer/treesj/";
};
@ -9859,12 +9859,12 @@ final: prev:
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
version = "2022-04-19";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
rev = "b6bef833b56632df917bcf33bc50b8a5d1e26139";
sha256 = "1b0qw5l8gyq3bf8ii1f2xb7kfdgyi0c4yivcmmziq8nqvrzwwzwp";
rev = "09729769c47a5afc1da0682116425e103e817e28";
sha256 = "0ymab8zyznf2ylh8smngd3nq4dpzgrx6zh5i5b149vrm9jiymxqz";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@ -10713,12 +10713,12 @@ final: prev:
vim-lawrencium = buildVimPluginFrom2Nix {
pname = "vim-lawrencium";
version = "2021-11-08";
version = "2022-01-19";
src = fetchFromGitHub {
owner = "ludovicchabant";
repo = "vim-lawrencium";
rev = "eee52c9da9a58c1f079adb4a3134a0620bc6e945";
sha256 = "12431h344dhjswg0pm8nvfszy8hp8b61nm0r8gsry9a6w1j1a86b";
rev = "cfda83655a3885f410fcf96ea1104ea0431570c3";
sha256 = "0jxk4xc10n6llr4hx67laxkx9rygrk0w6zyfvb2cpzcjranfmxnp";
};
meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/";
};
@ -11060,6 +11060,18 @@ final: prev:
meta.homepage = "https://github.com/phanviet/vim-monokai-pro/";
};
vim-monokai-tasty = buildVimPluginFrom2Nix {
pname = "vim-monokai-tasty";
version = "2022-11-25";
src = fetchFromGitHub {
owner = "patstockwell";
repo = "vim-monokai-tasty";
rev = "55dcb855be754178967b860b0fa63621c319ce0a";
sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8";
};
meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/";
};
vim-move = buildVimPluginFrom2Nix {
pname = "vim-move";
version = "2022-07-01";
@ -13513,12 +13525,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2022-12-09";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "d55d81eabfeacbfb167e2948790ae94aaba3b149";
sha256 = "0xhcrh1zyjq7i5kdsvw1v2f83m0d3ikv8hzpvpkm13zkhzasj018";
rev = "1d22da687d36c37133b13f2b41658c1c989e77e0";
sha256 = "1mrdb8l4qpq39fbanwgk55mjhx55j8yif2h9bm4q6f0vqqs0n505";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -13537,12 +13549,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "e61b0e2760e62a72a858e7e51733b52c22927dd3";
sha256 = "10i68hk8q8m6w9r7pmk4m18x6k931w6nl095452cag0ijc6rsxkd";
rev = "75b70f46770332e1bd51a4b0f2798a16b448e37b";
sha256 = "05jkbs77ffn9cpm8r005r208g6c03ammlmn7x62rlp25in4gyd0n";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

12
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -238,12 +238,12 @@
};
diff = buildGrammar {
language = "diff";
version = "330eb64";
version = "1d63cd4";
source = fetchFromGitHub {
owner = "the-mikedavis";
repo = "tree-sitter-diff";
rev = "330eb648bbc257b4e91621e82a85372be7dde27a";
hash = "sha256-WK6pEUvIu6Xwsy5RuuUyNWLuSKkNkWh5R0hmyksIu8k=";
rev = "1d63cd49529ef3153393cf8f620718b274bba715";
hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk=";
};
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
};
@ -1016,12 +1016,12 @@
};
php = buildGrammar {
language = "php";
version = "b4a8a60";
version = "64a2abb";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "b4a8a6048d66fcda4e8e4988bd0d9095980e303a";
hash = "sha256-Pm0FuY34eMhX4K7pbYpNAY1WYBOO+9cFCx/j992fsg8=";
rev = "64a2abb98a0cbf2bce23e4af6c05c78f06068886";
hash = "sha256-iAi+Cr7bW4mEbFHba+rv0afhY4v1suPGhsCK4IhcMLo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -928,6 +928,7 @@ https://github.com/david-a-wheeler/vim-metamath/,,
https://github.com/xolox/vim-misc/,,
https://github.com/crusoexia/vim-monokai/,,
https://github.com/phanviet/vim-monokai-pro/,,
https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
https://github.com/matze/vim-move/,,
https://github.com/lifepillar/vim-mucomplete/,,
https://github.com/terryma/vim-multiple-cursors/,,

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "20.6.1";
version = "20.6.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "8d1e3d44e53e62dd6dc7f231af5b682c9ff0e798a6480528444ba52cce02b4c9";
sha256 = "cf408c19622d7812b93f0f778b7f091a4387992f9d9a767f4bc1c417b61b7058";
};
nativeBuildInputs = [

1
pkgs/applications/graphics/tev/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.unix;
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
maintainers = with maintainers; [ ];
};
}

4
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -22,14 +22,14 @@
}:
mkDerivation rec {
version = "1.3.0";
version = "1.3.1";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "sha256-uhVRO9aiYJbUmwDp1+LIYF3wNBbVduVpTtVzaS0oUMU=";
sha256 = "sha256-0rmfDkPvgubVqfbIOZ+mnv/x1p2sb88zGeg/Q2JCy3I=";
};
patches = [

8
pkgs/applications/networking/cluster/nixops/default.nix
View File

@ -69,6 +69,14 @@ let
};
})
(self: super: {
certifi = super.certifi.overridePythonAttrs (old: {
meta = old.meta // {
knownVulnerabilities = [ "CVE-2022-23491" ];
};
});
})
];
}
).python;

20
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
View File

@ -1,27 +1,35 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, libiconv, Security
, pkg-config, openssl
, libiconv
, Security
, pkg-config
, openssl
, testers
, git-workspace
}:
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
version = "1.0.3";
version = "1.1.0";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sPvb8EKrr9ZUMV1yMTXkFYgjW+LRJwJAXoc7lrWykaI=";
sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI=";
};
cargoSha256 = "sha256-WAoYFCJCWKFvWN8XyRBZdzjCrcR6jMp8ZztSLHDP+r0=";
cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
passthru.tests.version = testers.testVersion { package = git-workspace; };
meta = with lib; {
description = "Sync personal and work git repositories from multiple providers";
homepage = "https://github.com/orf/git-workspace";

41
pkgs/applications/window-managers/jay/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, libinput
, libxkbcommon
, mesa
, pango
, udev
}:
rustPlatform.buildRustPackage rec {
pname = "jay";
version = "unstable-2022-11-20";
src = fetchFromGitHub {
owner = "mahkoh";
repo = pname;
rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2";
sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw=";
};
cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU=";
buildInputs = [
libxkbcommon
mesa
pango
udev
libinput
];
RUSTC_BOOTSTRAP = 1;
meta = with lib; {
description = "A Wayland compositor written in Rust";
homepage = "https://github.com/mahkoh/jay";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dit7ya ];
};
}

2
pkgs/desktops/gnome/core/zenity/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool to display dialogs from the commandline and shell scripts";
homepage = "https://wiki.gnome.org/Projects/Zenity";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}

6
pkgs/development/lua-modules/nfd/default.nix
View File

@ -1,5 +1,5 @@
{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity }:
{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity, AppKit }:
buildLuarocksPackage {
pname = "nfd";
@ -25,6 +25,8 @@ buildLuarocksPackage {
extraVariables.LUA_LIBDIR = "${lua}/lib";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
fixupPhase = ''
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
'';

9
pkgs/development/python-modules/autobahn/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, attrs
, argon2-cffi
, base58
@ -53,6 +54,14 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
patches = [
(fetchpatch {
# https://github.com/crossbario/autobahn-python/pull/1604
url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch";
sha256 = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k=";
})
];
src = fetchPypi {
inherit pname version;
sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k=";

20
pkgs/development/python-modules/bitstring/default.nix
View File

@ -1,33 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
, setuptools
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "bitstring";
version = "3.1.9";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "scott-griffiths";
repo = pname;
rev = "bitstring-${version}";
sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa";
hash = "sha256-eHP20F9PRe9ZNXjcDcsI3iFVswA6KtRWhBMAT7dkCv0=";
};
patches = [
(fetchpatch {
name = "fix-running-unit-tests-using-unittest-hook.patch";
url = "https://github.com/scott-griffiths/bitstring/commit/e5ee3fd41cad2ea761f4450b13b0424ae7262331.patch";
hash = "sha256-+ZGywIfQQcYXJlYZBi402ONnysYm66G5zE4duJE40h8=";
})
nativeBuildInputs = [
setuptools
];
checkInputs = [ unittestCheckHook ];
unittestFlagsArray = [ "-s" "test" ];
pythonImportsCheck = [ "bitstring" ];
meta = with lib; {

38
pkgs/development/python-modules/calver/default.nix
View File

@ -1,24 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, fetchFromGitHub
, pretend
, pytestCheckHook
}:
let
buildPythonPackage rec {
pname = "calver";
version = "2022.6.26";
version = "2022.06.26";
in
buildPythonPackage {
inherit pname version;
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s=";
format = "setuptools";
src = fetchFromGitHub {
owner = "di";
repo = "calver";
rev = version;
hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=calver_version(True)" 'version="${version}"'
'';
checkInputs = [
pretend
pytestCheckHook
];
pythonImportsCheck = [ "calver" ];
meta = {
description = "Setuptools extension for CalVer package versions";
homepage = "https://github.com/di/calver";
license = lib.licenses.asl20;
maintainers = [ ];
maintainers = with lib.maintainers; [ dotlambda ];
};
}

30
pkgs/development/python-modules/certifi/env.patch
View File

@ -1,8 +1,8 @@
diff --git a/certifi/core.py b/certifi/core.py
index de02898..3ec9147 100644
index de02898..c033d20 100644
--- a/certifi/core.py
+++ b/certifi/core.py
@@ -4,6 +4,7 @@ certifi.py
@@ -4,15 +4,25 @@ certifi.py
This module returns the installation location of cacert.pem or its contents.
"""
@ -10,16 +10,26 @@ index de02898..3ec9147 100644
import sys
@@ -12,7 +13,7 @@ if sys.version_info >= (3, 11):
+def get_cacert_path_from_environ():
+ path = os.environ.get("NIX_SSL_CERT_FILE", None)
+
+ if path == "/no-cert-file.crt":
+ return None
+
+ return path
+
+
if sys.version_info >= (3, 11):
from importlib.resources import as_file, files
_CACERT_CTX = None
- _CACERT_PATH = None
+ _CACERT_PATH = os.environ.get("NIX_SSL_CERT_FILE", None)
+ _CACERT_PATH = get_cacert_path_from_environ()
def where() -> str:
# This is slightly terrible, but we want to delay extracting the file
@@ -39,14 +40,16 @@ if sys.version_info >= (3, 11):
@@ -39,14 +49,16 @@ if sys.version_info >= (3, 11):
return _CACERT_PATH
def contents() -> str:
@ -34,11 +44,11 @@ index de02898..3ec9147 100644
_CACERT_CTX = None
- _CACERT_PATH = None
+ _CACERT_PATH = os.environ.get("NIX_SSL_CERT_FILE", None)
+ _CACERT_PATH = get_cacert_path_from_environ()
def where() -> str:
# This is slightly terrible, but we want to delay extracting the
@@ -74,7 +77,9 @@ elif sys.version_info >= (3, 7):
@@ -74,7 +86,9 @@ elif sys.version_info >= (3, 7):
return _CACERT_PATH
def contents() -> str:
@ -49,16 +59,16 @@ index de02898..3ec9147 100644
else:
import os
@@ -84,6 +89,8 @@ else:
@@ -84,6 +98,8 @@ else:
Package = Union[types.ModuleType, str]
Resource = Union[str, "os.PathLike"]
+ _CACERT_PATH = os.environ.get("NIX_SSL_CERT_FILE", None)
+ _CACERT_PATH = get_cacert_path_from_environ()
+
# This fallback will work for Python versions prior to 3.7 that lack the
# importlib.resources module but relies on the existing `where` function
# so won't address issues with environments like PyOxidizer that don't set
@@ -102,7 +109,14 @@ else:
@@ -102,7 +118,14 @@ else:
def where() -> str:
f = os.path.dirname(__file__)

48
pkgs/development/python-modules/dnfile/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pefile
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dnfile";
version = "0.12.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "malwarefrank";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-r3DupEyMEXOFeSDo9k0LmGM/TGMbbpVW7zCoUA4oG8Y=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
pefile
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dnfile"
];
meta = with lib; {
description = "Module to parse .NET executable files";
homepage = "hhttps://github.com/malwarefrank/dnfile";
changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/fontmath/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "fontMath";
version = "0.9.2";
version = "0.9.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TIsccR4cv0upPD0IQ5NbBmGXMTEmGvCGCL3hfeEBhAQ=";
sha256 = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
extension = "zip";
};

5
pkgs/development/python-modules/graphene/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "graphene";
version = "3.1.1";
version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = "graphene";
rev = "refs/tags/v${version}";
sha256 = "sha256-04ocm/Q/CDi5dRNhReuvr5nAiowMZUJrZol/wJOjG50=";
hash = "sha256-2o/IR6XjnS57D4ZjADrcI18acfJ+Q0zdnXeb5ZeCpM4=";
};
propagatedBuildInputs = [
@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "GraphQL Framework for Python";
homepage = "https://github.com/graphql-python/graphene";
changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};

4
pkgs/development/python-modules/hg-evolve/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
version = "10.5.2";
version = "10.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-45FOAQDJgAfhlTF/XBmIfvmMM1X7LUzsHAb7NMQl9Fs=";
sha256 = "sha256-0frkG8HqzC1ZftGDMv4vk47vc9tQWGBQbL4bzFdaCL4=";
};
checkInputs = [

16
pkgs/development/python-modules/malduck/default.nix
View File

@ -3,18 +3,20 @@
, capstone
, click
, cryptography
, dnfile
, fetchFromGitHub
, pefile
, pycryptodomex
, pyelftools
, pythonOlder
, pytestCheckHook
, typing-extensions
, yara-python
}:
buildPythonPackage rec {
pname = "malduck";
version = "4.2.0";
version = "4.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,13 +25,14 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM=";
hash = "sha256-1gwJhlhRLnh01AIJj07Wpba8X7V5AfACuJmZX+cfT6Y=";
};
propagatedBuildInputs = [
capstone
click
cryptography
dnfile
pefile
pycryptodomex
pyelftools
@ -39,11 +42,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "pefile==2019.4.18" "pefile"
--replace "pefile==2019.4.18" "pefile" \
--replace "dnfile==0.11.0" "dnfile"
'';
# Project has no tests. They will come with the next release
doCheck = false;
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"malduck"
@ -52,6 +57,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Helper for malware analysis";
homepage = "https://github.com/CERT-Polska/malduck";
changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/pychromecast/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "13.0.1";
version = "13.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
hash = "sha256-IDqvA3r7rKEnY6OpEZKd0lsKinse4A0BDTQ5vTGpglI=";
hash = "sha256-G1IOR3SSzY/gIuTQQeZ2BW1f/7tsBbL0UJgBoGvGe+w=";
};
postPatch = ''

6
pkgs/development/python-modules/wakeonlan/default.nix
View File

@ -8,15 +8,15 @@
buildPythonPackage rec {
pname = "wakeonlan";
version = "2.1.0";
version = "3.0.0";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "remcohaszing";
repo = "pywakeonlan";
rev = version;
sha256 = "sha256-5ri4bXc0EMNntzmcUZYpRIfaXoex4s5M6psf/9ta17Y=";
rev = "refs/tags/${version}";
sha256 = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo=";
};
nativeBuildInputs = [

30
pkgs/development/tools/selene/default.nix
View File

@ -1,30 +1,46 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, robloxSupport ? true
, pkg-config
, openssl
, stdenv
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "selene";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
owner = "kampfkarren";
repo = pname;
rev = version;
sha256 = "sha256-z1jefnWtaV97kq7CpfKsnFOgLHXDBonsmZTfUKJ4VIM=";
sha256 = "sha256-gD49OzhpO059wawA+PJc8SIYQ23965LF21zqIfj62Y4=";
};
cargoSha256 = "sha256-TjkileWGB7ocBJPGh2Bm1ucigwL4j/uXgIOAonPHjbA=";
cargoSha256 = "sha256-oekqM/Jvh0z6O6iJhSi7Ph5gsF5Fssr5ItKpmyozhPk=";
nativeBuildInputs = lib.optional robloxSupport pkg-config;
patches = [
# fix broken test
# https://github.com/kampfkarren/selene/pull/471
(fetchpatch {
name = "fix-test-roblox-incorrect-roact-usage.patch";
url = "https://github.com/kampfkarren/selene/commit/f4abf9f3fb639b372fe4ac47449f8a1e455c28a5.patch";
sha256 = "sha256-nk7HGygXXu91cqiRZBA/sLBlaJLkNg90C2NX8Kr1WGA=";
})
];
buildInputs = lib.optional robloxSupport openssl
++ lib.optional (robloxSupport && stdenv.isDarwin) Security;
nativeBuildInputs = lib.optionals robloxSupport [
pkg-config
];
buildInputs = lib.optionals robloxSupport [
openssl
] ++ lib.optional (robloxSupport && stdenv.isDarwin) [
darwin.apple_sdk.frameworks.Security
];
buildNoDefaultFeatures = !robloxSupport;

6
pkgs/games/factorio/default.nix
View File

@ -3,6 +3,8 @@
, libSM, libICE, libXext, factorio-utils
, releaseType
, mods ? []
, mods-dat ? null
, versionsJson ? ./versions.json
, username ? "", token ? "" # get/reset token at https://factorio.com/profile
, experimental ? false # true means to always use the latest branch
}:
@ -60,7 +62,7 @@ let
# NB `experimental` directs us to take the latest build, regardless of its branch;
# hence the (stable, experimental) pairs may sometimes refer to the same distributable.
versions = importJSON ./versions.json;
versions = importJSON versionsJson;
binDists = makeBinDists versions;
actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download.");
@ -129,7 +131,7 @@ let
fi
'';
modDir = factorio-utils.mkModDirDrv mods;
modDir = factorio-utils.mkModDirDrv mods mods-dat;
base = with actual; {
pname = "factorio-${releaseType}";

6
pkgs/games/factorio/utils.nix
View File

@ -3,7 +3,7 @@
{ lib, stdenv }:
with lib;
{
mkModDirDrv = mods: # a list of mod derivations
mkModDirDrv = mods: modsDatFile: # a list of mod derivations
let
recursiveDeps = modDrv: [modDrv] ++ map recursiveDeps modDrv.deps;
modDrvs = unique (flatten (map recursiveDeps mods));
@ -18,7 +18,9 @@ with lib;
# NB: there will only ever be a single zip file in each mod derivation's output dir
ln -s $modDrv/*.zip $out
done
'';
'' + (lib.optionalString (modsDatFile != null) ''
cp ${modsDatFile} $out/mod-settings.dat
'');
};
modDrv = { allRecommendedMods, allOptionalMods }:

4
pkgs/os-specific/solo5/default.nix
View File

@ -2,7 +2,7 @@
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.7.4";
version = "0.7.5";
# list of all theoretically available targets
targets = [
"genode"
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
sha256 = "sha256-ovDdaS2cDufe5gTgi+t2C8waWiRC40/2flLLJlz+NvU=";
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
};
hardeningEnable = [ "pie" ];

6
pkgs/servers/dendrite/default.nix
View File

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.10.7";
version = "0.10.8";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
sha256 = "sha256-7A2HUGjWjqbLgoXKTQ1oEsoUMwFUvsaRVFvc7QwWTuE=";
sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8=";
};
vendorSha256 = "sha256-G2i5ZHyu71mSo4VCmJpHFjzlZrRmxHObEAc7/09/rA8=";
vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU=";
subPackages = [
# The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith

6
pkgs/servers/http/pomerium/default.nix
View File

@ -14,15 +14,15 @@ let
in
buildGoModule rec {
pname = "pomerium";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
sha256 = "sha256-+YcYrhUQMiLUcBnYhTHxf+NrmQIdYpeO/blMgU33w6o=";
sha256 = "sha256-J8ediRreV80lzPcKIOSl1CNHp04ZW9ePyNyejlN50cE=";
};
vendorSha256 = "sha256-Y8RFMW9nfO6cMCw1SDowKkpPHfUwGhzLPXr7vM6y6Nw=";
vendorSha256 = "sha256-V8asyi1Nm+h3KK/loBRZQN6atfEGUEdRydeZsp9wyQY=";
ui = mkYarnPackage {
inherit version;

24
pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
View File

@ -2,33 +2,15 @@
stdenv.mkDerivation rec {
pname = "tt-rss-plugin-auth-ldap";
version = "unstable-2022-10-31";
version = "unstable-2022-11-30";
src = fetchFromGitHub {
owner = "hydrian";
repo = "TTRSS-Auth-LDAP";
rev = "0cc2a21441f99eef8368cfe0fbdbb78126e28d61";
sha256 = "sha256-pJWyvRnC38Ov1awVLgFZfp8+haADPniP+/P/C74qpcA=";
rev = "582ade49fd433a30b403caa1d0689fca5f3c99e1";
sha256 = "sha256-favz/2KvWqvv8ehTv3gc7TBbFDjkrOmutChnyKPgces=";
};
patches = [
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/47
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/003ca55bbd6e0a87fb729383e51eb269d918313d.patch";
sha256 = "sha256-0YD33JPNOOPH2dpGwA/RbV3Kg4i2oKazBjP3hBcUIes=";
})
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch";
sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A=";
})
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/34
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/b1a873f6a7d18231d2ac804d0146d6e048c8382c.patch";
sha256 = "sha256-t5bDQM97dGwr7tHSS9cSO7qApf2M8KNaIuIxbAjExrs=";
})
];
installPhase = ''
install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php
'';

15
pkgs/shells/nushell/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, runCommand
, rustPlatform
, openssl
@ -33,6 +34,16 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-OVJr+usN+47yBHFAy94rIVlU2F+Klo6xdrV2MwUoKUE=";
};
patches = [
# https://github.com/nushell/nushell/pull/7423: make tests
# more resilient (less dependent on env).
# Already merged upstream, so can be dropped in the next version
(fetchpatch {
url = "https://github.com/nushell/nushell/commit/87631e7068bfc6635d5b31413856f0a791994527.patch";
hash = "sha256-9vrcmBe5gXLLodynb3jyarwi/a0YiurJ6WsDxXl2vjo=";
})
];
cargoSha256 = "sha256-v6mPr+gOT64rKYuog+hS7/AqUZDailoOBXX3Sfeo+sk=";
# enable pkg-config feature of zstd
@ -66,9 +77,7 @@ rustPlatform.buildRustPackage rec {
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
# doCheck = ! stdenv.isDarwin;
# TODO tests are not guaranteed while package is in beta
doCheck = false;
doCheck = ! stdenv.isDarwin;
checkPhase = ''
runHook preCheck

4
pkgs/tools/admin/wander/default.nix
View File

@ -1,4 +1,4 @@
{ wander, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, lib, testers }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, wander }:
buildGoModule rec {
pname = "wander";
@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI=";
ldflags = [ "-X github.com/robinovitch61/wander/cmd.Version=v${version}" ];
ldflags = [ "-s" "-w" "-X=github.com/robinovitch61/wander/cmd.Version=v${version}" ];
nativeBuildInputs = [ installShellFiles ];

12
pkgs/tools/misc/esptool/3.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, python3, openssl }:
{ lib, fetchFromGitHub, fetchpatch, python3, openssl }:
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
@ -11,6 +11,16 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM=";
};
patches = [
# https://github.com/espressif/esptool/pull/802
(fetchpatch {
name = "bitstring-4-compatibility.patch";
url = "https://github.com/espressif/esptool/commit/16fa58415be2a7ff059ece40d4545288565d0a23.patch";
hash = "sha256-FYa9EvyET4P8VkdyMzJBkdxVYm0tFt2GPnfsjzBnevE=";
excludes = [ "setup.py" ];
})
];
postPatch = ''
substituteInPlace test/test_imagegen.py \
--replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY"

6
pkgs/tools/misc/esptool/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
}:
@ -16,6 +17,11 @@ python3.pkgs.buildPythonApplication rec {
patches = [
./test-call-bin-directly.patch
(fetchpatch {
name = "bitstring-4-compatibility.patch";
url = "https://github.com/espressif/esptool/commit/ee27a6437576797d5f58c31e1c39f3a232a71df0.patch";
hash = "sha256-8/AzR3HK79eQQRSaGEKU4YKn/piPCPjm/G9pvizKuUE=";
})
];
propagatedBuildInputs = with python3.pkgs; [

6
pkgs/tools/misc/tere/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tere";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "mgunyho";
repo = "tere";
rev = "v${version}";
sha256 = "sha256-jousyoro1Mn1+yBzUkGxW7/zbNvF7+Y4/WLRj99Iuy0=";
sha256 = "sha256-/712LB7oc27BP5WM20Pk3AucjwDJeBgH7udTgA+jFKc=";
};
cargoSha256 = "sha256-hMAxKijmlckkCtQZiC5ubaZQKU2m99gL/MkYoU7zQxU=";
cargoSha256 = "sha256-Z+qOID2/GRJTzAEWlUUTv6LAKLALu2Vn1umvrAgem00=";
postPatch = ''
rm .cargo/config.toml;

4
pkgs/tools/misc/ytfzf/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
hash = "sha256-3GRCvoClV484xoEEa/9HSgIAdqC6bLBDSVkZ6KXEGY0=";
hash = "sha256-01F3JSpA/SjAZWmXPftT/EvGlLVM3U/zLyABREgePi8=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/networking/ooniprobe-cli/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.16.5";
version = "3.16.7";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-53TFXrzeyEcd8WV7hdb+2VXlN2Iogw3bdCiejRIs8Yw=";
hash = "sha256-GebDgdz45INM1Sf7T0qDjFeBqRftMHjGLIAWTM/1REY=";
};
vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E=";
vendorHash = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E=";
subPackages = [ "cmd/ooniprobe" ];

5
pkgs/tools/package-management/nixops/default.nix
View File

@ -9,6 +9,11 @@ let
overrides = [
poetry2nix.defaultPoetryOverrides
(self: super: {
certifi = super.certifi.overridePythonAttrs (old: {
meta = old.meta // {
knownVulnerabilities = [ "CVE-2022-23491" ];
};
});
pyjwt = super.pyjwt.overridePythonAttrs (old: {
meta = old.meta // {
knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [

6
pkgs/tools/security/pomerium-cli/default.nix
View File

@ -8,16 +8,16 @@ let
in
buildGoModule rec {
pname = "pomerium-cli";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-tmMACV9iISbK+5JTiUOTsepjrtX5s4PrBvMDGJgEix0=";
sha256 = "sha256-lWrEWi9wT//9sTEJqo4BnjjzeYnmb2KFbVetXfsYk04=";
};
vendorSha256 = "sha256-gS7EtRckbqVafTft/N9KYjASx4W4vAbs6cPiwNHHZZ0=";
vendorSha256 = "sha256-uME7g7zhA1ir1drmHB1FjLPJ1Km9XcvHHNIsIdOvYfo=";
subPackages = [
"cmd/pomerium-cli"

6
pkgs/top-level/all-packages.nix
View File

@ -17974,9 +17974,7 @@ with pkgs;
segger-ozone = callPackage ../development/tools/misc/segger-ozone { };
selene = callPackage ../development/tools/selene {
inherit (darwin.apple_sdk.frameworks) Security;
};
selene = callPackage ../development/tools/selene { };
shadowenv = callPackage ../tools/misc/shadowenv {
inherit (darwin.apple_sdk.frameworks) Security;
@ -29425,6 +29423,8 @@ with pkgs;
jackline = callPackage ../applications/networking/instant-messengers/jackline { };
jay = callPackage ../applications/window-managers/jay { };
keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { };
leftwm = callPackage ../applications/window-managers/leftwm { };

1
pkgs/top-level/lua-packages.nix
View File

@ -95,6 +95,7 @@ in
nfd = callPackage ../development/lua-modules/nfd {
inherit (pkgs.gnome) zenity;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
};
vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {

2
pkgs/top-level/python-packages.nix
View File

@ -2670,6 +2670,8 @@ self: super: with self; {
dnachisel = callPackage ../development/python-modules/dnachisel { };
dnfile = callPackage ../development/python-modules/dnfile { };
dnslib = callPackage ../development/python-modules/dnslib { };
dnspython = callPackage ../development/python-modules/dnspython { };