colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-27 18:02:10 +00:00 committed by GitHub
commit c2ec40a74a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 1586 additions and 1195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -6227,6 +6227,12 @@
githubId = 117874;
name = "Jeroen de Haas";
};
jdelStrother = {
email = "me@delstrother.com";
github = "jdelStrother";
githubId = 2377;
name = "Jonathan del Strother";
};
jdreaver = {
email = "johndreaver@gmail.com";
github = "jdreaver";

11
nixos/modules/services/misc/sonarr.nix
View File

@ -35,6 +35,15 @@ in
default = "sonarr";
description = lib.mdDoc "Group under which Sonaar runs.";
};
package = mkOption {
type = types.package;
default = pkgs.sonarr;
defaultText = literalExpression "pkgs.sonarr";
description = lib.mdDoc ''
Sonarr package to use.
'';
};
};
};
@ -52,7 +61,7 @@ in
Type = "simple";
User = cfg.user;
Group = cfg.group;
ExecStart = "${pkgs.sonarr}/bin/NzbDrone -nobrowser -data='${cfg.dataDir}'";
ExecStart = "${cfg.package}/bin/NzbDrone -nobrowser -data='${cfg.dataDir}'";
Restart = "on-failure";
};
};

2
nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
View File

@ -50,7 +50,7 @@ in {
"CAP_SYS_ADMIN"
];
DevicePolicy = "closed";
DeviceAllow = lib.mkOverride 100 (
DeviceAllow = lib.mkOverride 50 (
if cfg.devices != [] then
cfg.devices
else [

10
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, ... }@host:
with lib;
@ -284,7 +284,6 @@ let
DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
};
inherit (config.nixpkgs) localSystem;
kernelVersion = config.boot.kernelPackages.kernel.version;
bindMountOpts = { name, ... }: {
@ -480,10 +479,13 @@ in
merge = loc: defs: (import "${toString config.nixpkgs}/nixos/lib/eval-config.nix" {
modules =
let
extraConfig = {
extraConfig = { options, ... }: {
_file = "module at ${__curPos.file}:${toString __curPos.line}";
config = {
nixpkgs = { inherit localSystem; };
nixpkgs = if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined
then { inherit (host.config.nixpkgs) hostPlatform; }
else { inherit (host.config.nixpkgs) localSystem; }
;
boot.isContainer = true;
networking.hostName = mkDefault name;
networking.useDHCP = false;

4
pkgs/applications/audio/ptcollab/default.nix
View File

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "ptcollab";
version = "0.6.3.0";
version = "0.6.4.1";
src = fetchFromGitHub {
owner = "yuxshao";
repo = "ptcollab";
rev = "v${version}";
sha256 = "sha256-fxFT3wgFHd2YbwUTna5PTvaCcCAaDXGLbqKz6nVrsKI=";
sha256 = "sha256-/Z0UDxZtVnGKVmscNCZAvTGMALq/uMd7/h3r/QvUs0M=";
};
nativeBuildInputs = [ qmake pkg-config ];

4
pkgs/applications/editors/cudatext/default.nix
View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.173.2";
version = "1.174.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-i/MRBbwy/yJHltGXPjIb89hDXiUzNG6YL83LAAMRwdU=";
hash = "sha256-3jj04ndyuJpfXu9z8j/Pdp8yNybmzLbrPr/S+uV7Rfg=";
};
postPatch = ''

8
pkgs/applications/editors/cudatext/deps.json
View File

@ -11,13 +11,13 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2022.10.15",
"hash": "sha256-+UU/+etbxrAfCEklY3mfiSrBANIXZbfrXEPrrCsg9u4="
"rev": "2022.10.24",
"hash": "sha256-IXMOZV4NNL7VHzlbzPCcYOPYneV7bDYm5L7Ge/SlnJs="
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2022.10.15",
"hash": "sha256-TZYaEr5KO8nU6X3tEL2tl+G+JblCeQRwH1EXQXLbPLs="
"rev": "2022.10.25",
"hash": "sha256-eleuHFE+kBmqKBVKOPzUAi+LVgzRr8gIKdCIPzfxUOo="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",

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

@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2022-10-24";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "01c21b6a204b548b78e9cdff451d5d1a42af23d1";
sha256 = "0acpfyl6803kjphbcjgw3xkvhk2g0kvbjlhqbkf1jssya34mzhax";
rev = "7876b7b33fedb6b4cca15b6a84947d7fb00a7d72";
sha256 = "0pyhkdimr9g5nkpnyqb7vd9w2q0crc1sj1yry0a09cdqb68k2gav";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -341,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "1c1d63d923fdbad74b826664e4fd75fb2d068e75";
sha256 = "11pzd5bzin4138iky36idvqd8416h2cchs0xjwlddad1v7s6biyl";
rev = "ed17f52bbb664ae9288e08be7b9af44c7bb93805";
sha256 = "1ldiy2fhy6m2f9zidvhh30lh56ybsvww0hdjhnx9ps0y6jbr39np";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -486,12 +486,13 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
version = "2022-10-21";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
rev = "832024bdccf414d786eabdf2a05f2f117581cb36";
sha256 = "1idxkjh3j3rzh47zlm0fc3nnbj7jzyg643xi8fap72sv597h07vd";
rev = "b4be3b7e503c45a0c3f7a9555d3457edcf4649fb";
sha256 = "0zaxfidd0lyf0y37d3mgh6jm44kp5i7kraqxd34r9n2802qdqhl2";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@ -798,12 +799,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
version = "2022-10-22";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "88fc13534f26d4a6a8fc48caf73f91a0568c5d09";
sha256 = "0gmxby72is161cxdj9wa328z93rxi2ip1sy8v0nbwmvlr9l2vc4b";
rev = "eecabfedc9429f6184feb3b6655bc45a4ed36a7e";
sha256 = "0b1gnbaqb67q876hqnqv1l54xdyv76dzn7hr7drgq33nrmyxcx58";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -990,12 +991,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
version = "2022-10-19";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
rev = "6e526a290877537e29112d511548301b1e1731b2";
sha256 = "1mvnpibq844300h7w6z00yjv815q81yj09clxgjdya3zpjm73d9y";
rev = "312f33f36115e8266b06ea97002b71e4ebc0f006";
sha256 = "15vk2aglwhwikn7rg0pfkbjjr23mkq90nnq1i0dp69cbmwzb7nn6";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@ -1278,12 +1279,12 @@ final: prev:
cmp-fuzzy-path = buildVimPluginFrom2Nix {
pname = "cmp-fuzzy-path";
version = "2022-10-23";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-fuzzy-path";
rev = "72e1fc3922d21fbd6dbc3dd7344bce5f4b2defa8";
sha256 = "1hqdq4d20gww7pkbfr4cd8y98xawf8vmjgaksncj67ry9mrbj8lh";
rev = "13fdf779f833571ae72ca3a540531cfa9e67e714";
sha256 = "1vcwgg9cvidgjwxgwma1lbcf070p9gr60ykalr26rzwd7mwm1xrj";
};
meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/";
};
@ -1722,12 +1723,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
version = "2022-10-24";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "69a596f24e31aa6e6932f30123b809633e27df51";
sha256 = "1b3084ssfj1d1j2cj3gn281y5263rsdw5ccwynl6jv2zjl88vm76";
rev = "ce2eaea1aec1f1c00db5663c08232b2be73ed6f7";
sha256 = "0w71xbmn8ja3kg8n635mya4fkf0ifdi98nw9wk8d11fhic2hdx7d";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -2010,24 +2011,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "8aa3998926d37c238dd76583c8e6aef6604d63d2";
sha256 = "0zgh3gmrnackp9mq6q96y17i5ij9h6psv31s7vawvzw47jfv2nsv";
rev = "c136668e5023fb355c3824c7dc13147b8513d5e3";
sha256 = "01mcr9xwc4jbd79dbq5awyf89nd35mw1x1kdn97z3i1gaayw6h1j";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "7f91024846de1259f211c337ad186a819ae74b3c";
sha256 = "1nzwl690m4bmqlmcpd8ym97jcdapv9n6wvz60nr99l4qbq5y8yv4";
rev = "7b6fc77e8c1018581daae15b247c4c640e69f50d";
sha256 = "14mdn9g4004lpc8zxq5as7wxlbzpbn9yyzlrzyqag6gghpf7q8sc";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2046,12 +2047,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "202aab5417009eda55227fa9e3895dce573a21b4";
sha256 = "136vdi0blkjxj9qyl36v8fjrlk6jmbffrk5bgxg05hsmhd021gnh";
rev = "2997e434965a7488911bb8acd7eba50f60038462";
sha256 = "1948jv3123cwzrs95szn8nfzwprfhz45iwx3a03rnxksdq1nvywk";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2576,12 +2577,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2022-10-08";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "a1fbcaa7e1e154cfa793ab44da4a6eb0ae15458d";
sha256 = "0wffr2g0d2nasbjqabm0arjgv28xlg6xqay9w5gw3hglz33rr5np";
rev = "94a3422415a092db1f2e00af5bd7db4ec1c6b8d7";
sha256 = "01cg3dhwfzjmpz8sh3qppr1qdyrvvpiax5dfzqq7bs8jk6niyh3p";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -2734,12 +2735,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
version = "2022-09-11";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
rev = "765328360ca61f889709c36e68cd44c11a127093";
sha256 = "0kzf9r5q1wb4sl566f0qk0ll5xrp6vnahjw2wwvvbngw3ynqsazc";
rev = "6ef48f9dae89e0f98380fa83628606a2b4074016";
sha256 = "07j9amxy15mbiymf2mjgwbikpc2i3xz7ca090acvfb0860ndmdzb";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@ -2794,12 +2795,12 @@ final: prev:
feline-nvim = buildVimPluginFrom2Nix {
pname = "feline.nvim";
version = "2022-10-06";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "feline-nvim";
repo = "feline.nvim";
rev = "f26dd12e5b0e39a8dd2abcb46066c250b5651de9";
sha256 = "03rla7gwjd8l35pk2mgi0qj23mpssdvfv2iz6c4dj2ixqs1ry9sh";
rev = "0d790837fc7ada5817176acf92fc168eeca86e5a";
sha256 = "0xg3p1n9v9psa3c2qhzhxjkrr8d5xz35riady0q0s5llbanvabg9";
};
meta.homepage = "https://github.com/feline-nvim/feline.nvim/";
};
@ -2939,12 +2940,12 @@ final: prev:
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
version = "2022-09-27";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
rev = "88aa63ba216708611b472d8737b96af71c2f3785";
sha256 = "0x55w1fs0pciinapdvs3vdsiql29753vi2f9sr3jpxlk4rgaygpa";
rev = "1646b0bdc1c7e7d746aa0556d79d7be2394caa7b";
sha256 = "1f6xc3lbb9yw0dikdigkgfpax9cf83kk2mcq4bx74n722bz5h18z";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@ -2963,12 +2964,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2022-10-22";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "b838c362477a4af8a0251518a6865e518f4ed6eb";
sha256 = "166p9hqfx9rhj9g199adb0nmqjx1kq0y5xdpq784jslyfaj3xngv";
rev = "bb318c455e4e8946d64c79753f5bb07f7c27d711";
sha256 = "1fixlb14s38d5wy5a92yraj572q25gxxc9rgpjbq288q96pshnmi";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3227,12 +3228,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2022-10-21";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "21ab05c2629ef613b1c3452d12469f936855648b";
sha256 = "0c7m07h56fk273780awlrx234dlxzbb75a1i2x65i1hvysjw67bz";
rev = "851cd32caaea84f303c4fdf51d72dfa5fcd795bb";
sha256 = "0d5fbxljh2mqsjjmzbk4hgwgq9cyl7vrqplsqvxzrhs58c41f9m5";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -3383,12 +3384,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
version = "2022-09-30";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
rev = "24f9e795bfac5fabbaba703116e747dcf2ad8d2f";
sha256 = "0an08vf70ispd3alywz964vlxkgg17dgfz5n18q60ix2fs6pmgii";
rev = "cb7a8a867cfaa7f0e8ded57eb931da88635e7007";
sha256 = "16c8jggbcs1ikibwbj2w56mf9z224g7zvsnd8h6zz81gxdqk3l93";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@ -3959,24 +3960,24 @@ final: prev:
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit.nvim";
version = "2022-06-14";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
rev = "9c73fd69a4c1cb3b3fc35b741ac968e331642600";
sha256 = "0mij8mrh7fmynhz7d3i11bbsvykf2pdp3ldk8w0sbi15cgfp8fr4";
rev = "c7a8bfb6062e57f3f7cc735720893f2706e6fc8e";
sha256 = "1hn6llvqbmghjjygy9vwx3y31sra647f3ys9626c5zn4x7a09kgh";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
version = "2022-10-16";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
rev = "cecab4cf3e653e76fc97bab9c340b8e9bc834d40";
sha256 = "028vffjdw37zz9822v0l5pwpmaj25fj9d5zff4hbr4hmshj6nm7j";
rev = "46de7a0aed7fab5e38d146fef45074d16cf67d27";
sha256 = "098n6qf3qmpya8ib15ybx02k4cx0sm2idrgqsijq8bsrabvld18c";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@ -4019,12 +4020,12 @@ final: prev:
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2022-10-11";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "edeeb1a50c3936d971681af36c3385d18db3230c";
sha256 = "0ds7mv79k5npa1h64kzxhikkp24j7k6qb1qyb3fsxsc7pjspgqyd";
rev = "accd6a0cdc8c99fc6ef529cc95e1a952c89804fc";
sha256 = "0lrzhm2pf9rnqnjdyv7hg3n6hz28zgbmfq5ci4jl1ab311iwkk5d";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -4535,12 +4536,12 @@ final: prev:
material-nvim = buildVimPluginFrom2Nix {
pname = "material.nvim";
version = "2022-10-24";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "marko-cerovac";
repo = "material.nvim";
rev = "757ce580c0901d7459fe3bfdb4eb0f3d92b38f05";
sha256 = "09bp1pnjza3sixj7z5vg47h5wvfq57jm4mij05zggd01g7ibmnfq";
rev = "da70b62c602ae682b3d091fb8c14a6a3bcac55db";
sha256 = "1hsz66vs858yj0l823v938r69d1ly6fqi03927rh45a58mx94ilh";
};
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
@ -4559,12 +4560,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2022-10-24";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "8b0f423d4d95aaa165b687a687b4651401040986";
sha256 = "1k10fbam4fllkfrqcg54b5p9kcsyhbhyx1n2m0cliq72ygpnm4vv";
rev = "dc0ccf1b0499d649a6177d2a406babcfe73b97de";
sha256 = "1zxhxrac6y3pnsbcay8pxh3jiihhn2sdak0lhaj36dbj915lxrw8";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -4931,12 +4932,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "b475883321cb4fed8e932e462d7d85f0693492a1";
sha256 = "1bapaw8awz9d2zxxs5w8lw027lavfdnfq40jbm2pxbg81z2nsj24";
rev = "92ab5e8b9bce76352d8c45de5b194dc739125437";
sha256 = "0jnlngj0qdngc5fgyab3xsf0f5imjq20z6g0dblz1hqa670yrzyw";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@ -4955,12 +4956,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "b53d6b1302a7b66521500b6dd2810bc5764cb2e6";
sha256 = "1c2pmfxcgx8jdlhcllzx4615cjgz224vyxjsa59pv93rwlpvjm0m";
rev = "3ea1b9c5c572d6432ea44044347ed3a54c277604";
sha256 = "1jnrm5q885gdaan762ga15992i5ky93js43j6i5dbygzipgi3d2n";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -5015,12 +5016,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2022-10-23";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "f5604d9053e375622821ea28db21ea6718310f6f";
sha256 = "1skz1knih9bh3w4q5348b5ma6mpp84bxaksg4m53iy451adp7kry";
rev = "10cd28e3bec3f6583f545ba0d504e65f63a64aae";
sha256 = "15x4zk6661g5g80xj76k2yvq4dc2w9dkac9p5l88cbrkj6xwv0jm";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5195,12 +5196,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2022-10-22";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "28eeaaea2e9fafc1c6b22eef6b9a6e2b53fa02a8";
sha256 = "0al7d2qahbpchmg846ax2w2rmxdpk20nav4dsa444kdfwahk7v8x";
rev = "73bb745cd459732e247ee81027ffeea4c63a7cf8";
sha256 = "0am93qvkic5wwj1k7b73zm65djxi5lflwyyc2j523l84ajplwnz0";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@ -5243,12 +5244,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
rev = "3e440ca16f3f7786ec23f13f2db0c23f306a8d22";
sha256 = "11lx2ggvr2g2f3jf6l4naw4jiz44l3a3spy7bkvdd0xc5kwwrjkh";
rev = "2851fc23a15a3651402ce6adfde92d0d35990e32";
sha256 = "1hqrf8dyymxy5ms0a15vvxhlajr88yg3n0rjmwm8yzdjscp36lnr";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
@ -5279,12 +5280,12 @@ final: prev:
nordic-nvim = buildVimPluginFrom2Nix {
pname = "nordic.nvim";
version = "2022-10-23";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "nordic.nvim";
rev = "31c6b3a97be94abaf021da95cde0f87e5b006e0f";
sha256 = "1v5mc7301jxipc2ds4hsj094a01x7iwx4xpxp5kqmaiang9mwsky";
rev = "d1b1ecf4dd4c85fd6d1746e83e462c9c32b86372";
sha256 = "1z8v5qf1l374v8awcd2y5s417wh13cdgvd9p9fhr7qqmf3808vbd";
};
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
};
@ -5303,24 +5304,24 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
version = "2022-10-19";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "35758e946a64376e0e9625a27469410b3d1f9223";
sha256 = "03clg9m0rzqx8nmjk4brix21mrkr9n7229834d942gb3hssaxni0";
rev = "e3806ee34700727e9cc0b420be226f41929b7d22";
sha256 = "0vm0b65i3m98zf3pk4hrcphx5bcwcqsmmbp4pm2mrkzfplm49chz";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2022-10-24";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "82910058ab2c317816b13c3e5ecebc8eec793b30";
sha256 = "0ylpl6qg9wgigx23pvvhci2dc9jn6k7ky51h82v0rvdwk0lvccax";
rev = "f1add2302e6a01531a007c51054392d2029dbed4";
sha256 = "050lx51x28msshjr4cq04l93brlswbx9w3kzdp35q7mxfmcr6cyg";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -5567,12 +5568,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
version = "2022-10-20";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
rev = "0a63115d72e071223e1711ce630e9e7b5737c948";
sha256 = "1swwyf498g69mm47whdyka7250pqg630fnhwkg0bzslv9ph891rg";
rev = "31a0668b343b231898ab6641ce4a6f42f01c631e";
sha256 = "1zzg4x3vigrpv57lmacs52clpx5vvybfpab95gk71lq5qcng7kp0";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@ -5627,12 +5628,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
version = "2022-10-24";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
rev = "8b0a2e4d072c1451be80b1fd523942553e1e5e50";
sha256 = "17hg58f25sxqidlfkqlijs2k229fpmdf8bai5d2f086nv14s1m6q";
rev = "1226c3fa083b753962aa248f36d2e06612d475f2";
sha256 = "1g2pc5mx6cyayzkwkq66kk8qc5l2rwk7n73byxdqijj8rdsazp0c";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@ -5759,12 +5760,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
version = "2022-10-16";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
rev = "2ad83cad2aba5ac6071d75a32f0792e9e8af1ec5";
sha256 = "0am81inrd6hn3a58afp0mrqsz9v31nxm93dzq0mc4086qfnhvlqg";
rev = "844bb7828557052da765b9b0fa5ab0574eb7187a";
sha256 = "13aczdfdxx7r0sambfhh8awa2azskxlyaks6vsy2jhii8698vhw9";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@ -5783,12 +5784,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "a035031fd6f6bcb5b433fe0f32d755ba7485406d";
sha256 = "1g7gwbwjdwk6x4crkc66331fmi27lbns49hvjmvyvn9b4rq0c1fn";
rev = "2315a397fd5057e3a74a09a240f606af28447ebf";
sha256 = "1rqy3lcxy8lxi041g7s5j0nvmbch6s43r6agnwspqm1ag1i7pin0";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -5843,12 +5844,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
version = "2022-09-30";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
rev = "132b273773768b36e9ecab2138b82234a9faf5ed";
sha256 = "1qs02qkjzq0lczc4sdds0p2rrr1klnmw7n7n3hy6i4sr6gycfg1v";
rev = "9f7f0b797096ee852106c4fd47b6b13d0ebb364e";
sha256 = "1zqbs170ppmjh3njsg24z5ic965ga0plrbjam88qys1ap0gdph2v";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@ -5915,12 +5916,12 @@ final: prev:
nvim-scrollbar = buildVimPluginFrom2Nix {
pname = "nvim-scrollbar";
version = "2022-10-19";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "petertriho";
repo = "nvim-scrollbar";
rev = "b17bc9b4a28cf191dda3964568707577c3e6b03d";
sha256 = "0yjl97iwr580qxwcr4j5gf8qhfvhcl179cj98js9c87bzp25q28v";
rev = "49b5a0f2e2d275df4f2e224f3e1cd7f4c64ecafe";
sha256 = "0i6g9ww2jvvqb45fqvqfa2vwpgq8jpyndmvjv2amirvk1ilhx2i8";
};
meta.homepage = "https://github.com/petertriho/nvim-scrollbar/";
};
@ -6011,24 +6012,24 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "0eff7beaf8cf7e631a7e8edc0d363e0b0a8f6f1d";
sha256 = "0n6cljmljhzdbw8pfkppnkaxzim80d956py34gcm7rapm1h0zj4i";
rev = "2f5be4585ef18ac720810c08f678b4d55e2d5658";
sha256 = "060iq0ckn9ssiwbnw6hicw5cg6jahck5vbkbi35gxlgg3s5gy7mx";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2022-10-23";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
rev = "09455f941a1611666a6343f68b97dd0a12d4c846";
sha256 = "15k66mzkfjz57qfbdxpzjmkks1l63s25s33vaj4364jvlwfwaqrf";
rev = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1";
sha256 = "151lk77jwwm7jnx2x3s4jb214ldjzd5jdvqq35bw29cqczdqdwhp";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@ -6251,12 +6252,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2022-10-24";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "caf2626b3af666a5b2f67f194d453197b71b0b62";
sha256 = "160xrciwbkrjk3p2zxaanzmyy3rmllljn6hrfx6q7rfp0357s0kd";
rev = "05219bc43981109105329428a03fe0ae254e8a12";
sha256 = "16il2l4270jlxf59d7h1d2m5h90jw9dkihnmym3lbj8rysk9m4xc";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -7830,12 +7831,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
version = "2022-10-24";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "5c7db4055d89f9057d562f4f8b9d03189c9f9786";
sha256 = "1mc80m83jfnjwnaxnsl3d96xm03wycal58xwm19fcgs8nsdn3010";
rev = "97847309cbffbb33e442f07b8877d20322a26922";
sha256 = "16haarhd71n6p0ndkl67casbk3ysbxbnsm9dkqaa4cjizdqckbj0";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -7912,6 +7913,18 @@ final: prev:
meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/";
};
text-case-nvim = buildVimPluginFrom2Nix {
pname = "text-case.nvim";
version = "2022-10-08";
src = fetchFromGitHub {
owner = "johmsalas";
repo = "text-case.nvim";
rev = "2cbe6b6653b46d2ec23bb2ba808b5c1fc78e9382";
sha256 = "1fwrvsl4rdsrljb8y6g4zpv5vvlz8hxakcyz6f7zr4xxnr5rlb3c";
};
meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
};
thesaurus_query-vim = buildVimPluginFrom2Nix {
pname = "thesaurus_query.vim";
version = "2022-01-30";
@ -8291,8 +8304,8 @@ final: prev:
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
rev = "5b85bd0e0c165c863d491cf31da15e7805bd09d5";
sha256 = "01vjcqz7rarhbjcfd54njp11gcd9dnzbxr0j4n5fvk1prjk9qawn";
rev = "0a547a2e4c80e78f2f1a002851802ab2a2bfa3c6";
sha256 = "0kdxmammf2gdr6pa8acz6h9wbqbzb14g1glq3sl9hlhgxqxcclxy";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@ -9144,7 +9157,7 @@ final: prev:
owner = "flazz";
repo = "vim-colorschemes";
rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
};
meta.homepage = "https://github.com/flazz/vim-colorschemes/";
};
@ -10437,12 +10450,12 @@ final: prev:
vim-jsonnet = buildVimPluginFrom2Nix {
pname = "vim-jsonnet";
version = "2022-10-24";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "google";
repo = "vim-jsonnet";
rev = "f3b4ae76eeb01ef7c3cc3693455989a62d334327";
sha256 = "1kpqpxbhpfkjy8d7bhgnx9625rbfga6dip90w94b6aybjz7dpgv5";
rev = "f27e1d67dff34ac9cf9c83ea2f2f814e53aa409c";
sha256 = "05zlsn7344zffwjsx4f65rp85jrgfm4wi40iqjj137x11jhwb9a2";
};
meta.homepage = "https://github.com/google/vim-jsonnet/";
};
@ -11074,12 +11087,12 @@ final: prev:
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
version = "2022-10-21";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
rev = "c0653e22a1b935d5dfef6ab61c6788e90d24baed";
sha256 = "1mvvcms3snzc2ki3x28dx85hqx59b6k3sdiyd9359sja44fnl34j";
rev = "50e759ee5b9dfcfc27e197eba60cc863ba0312b6";
sha256 = "0f17aky7rmrjayyp3fbhvpg4h9h1vxqi3csqc4kd8rdkpl9gmv7n";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@ -12058,12 +12071,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2022-09-26";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "1a5fe7b6275d8f62647969012dcd5bcceb2cebc6";
sha256 = "03jhlqb74ki01h7x15gf07vnyg7g1yczz5qn84qn3vvdqay4hj6z";
rev = "fcfa65f98046248ba2ec88ebab756b6d4e42bbc2";
sha256 = "0rhjyiqnmfmn7sm54wg5v6j3n227ixjik29a4rllscrb1s9x91n9";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -12130,12 +12143,12 @@ final: prev:
vim-surround = buildVimPluginFrom2Nix {
pname = "vim-surround";
version = "2022-04-22";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-surround";
rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea";
sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la";
rev = "3d188ed2113431cf8dac77be61b842acb64433d9";
sha256 = "0lfnhwcgfxcg4n59xjxc29fhj08jhdv41l8zpx0fjkx796v3k48d";
};
meta.homepage = "https://github.com/tpope/vim-surround/";
};
@ -12647,12 +12660,12 @@ final: prev:
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
version = "2022-06-30";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
rev = "4d64b2261aff3b9dc1863ebc1ea9ec410965a5de";
sha256 = "0qy6g69r4bqb6c0hbf0bw60i90zqs8z39cwpygf1fb6rk3p7a5p0";
rev = "9875baefb1d3e78abbf8f652a17e130744a37742";
sha256 = "1xvb9xfp9ly210cxj00hp9403ny6r7cs0qhjd0kvcdgxamw1bh3a";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@ -12984,12 +12997,12 @@ final: prev:
vista-vim = buildVimPluginFrom2Nix {
pname = "vista.vim";
version = "2022-09-14";
version = "2022-10-25";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "9c3e31f67653a1d25147a8dd2a0b2724853d9923";
sha256 = "0d06sgq3pfvhlkjf9jn0vywi1qag2g0l2zjs3z07bicmh3y9barw";
rev = "9ddb3707b066cb288aa1ac9c33477280e0ef95d3";
sha256 = "03qls1ggnjqv38xg8sk2ssl02pibd2r2k36g0hxanx7zqq3nvgn0";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@ -13020,12 +13033,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "08c230d4f053df2fb89ab356142bf63559bbab7f";
sha256 = "101lmb4g2xnblcd13akzgmg002php65z16dgyzxrdxlkynswbc7q";
rev = "1b7f09a38afb48e295109137790c3a3099881c2f";
sha256 = "0hzh53ahx96kzhhz9rhxakvdqzy0k2px5693wi3fg9q7i67v945x";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -13261,12 +13274,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2022-10-24";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "0f32c4ba5748f59240478d08823af36dda5b6226";
sha256 = "0zhjyl1xhmdhclx014py8wcwl45w0j7jsw77ia3l1kwynrr12wia";
rev = "98b2b7eb3e743289a674d7255e2557f3a20153ba";
sha256 = "1392y228l2rbg81yzii31c87xgxn4a6cvvj368glc5ss8pia7aih";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -13285,12 +13298,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-10-25";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "758d12cb7deeac9e6a159e02f34a1b6a229aebd2";
sha256 = "0phlszy2prr2zvcp0nzcw79vnwj3plbp5a4wsy1f7wdp3qm7r1sk";
rev = "e7b0e56b11407e0429565985e58bfb2cba598c93";
sha256 = "18i24v89skiyy82a7v7pvdb7xhvy8vgybhlgadcayd6qka8i7gsx";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

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

@ -663,6 +663,7 @@ https://github.com/wincent/terminus/,,
https://github.com/oberblastmeister/termwrapper.nvim/,,
https://github.com/ternjs/tern_for_vim/,,
https://github.com/KeitaNakamura/tex-conceal.vim/,,
https://github.com/johmsalas/text-case.nvim/,HEAD,
https://github.com/ron89/thesaurus_query.vim/,,
https://github.com/itchyny/thumbnail.vim/,,
https://github.com/vim-scripts/timestamp.vim/,,

786
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/networking/cluster/nomad/1.2.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.2.13";
sha256 = "sha256-yDcvN6cKG1BlBq1ygYB58bS1YRHWqJgLXRlqI7lrW1A=";
vendorSha256 = "sha256-dPErDlJ4oNpER3Ij4yrN77V8sZvDUuXY7dM39u9xT4I=";
version = "1.2.14";
sha256 = "sha256-BEbRXakMbgE44z1NOGThUuT1FukFUc1cnPkV5PXAY+4=";
vendorSha256 = "sha256-bOJ/qlvY3NHlR9C08vwfVn4Z/bSH15EPs3vvq78JoKs=";
}

6
pkgs/applications/networking/cluster/nomad/1.3.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.3.6";
sha256 = "sha256-E1+QFaakAsqeXxAfY80ExWVIud7Q/q2TaUVsmADjsgo=";
vendorSha256 = "sha256-kgTRjPr7GsoBeE/s9wrmUWE5jv1ZmszfVDsVaRbdx14=";
version = "1.3.7";
sha256 = "sha256-hMMR7PdCViZdePXy9aFqTFBxoiuuXqIldXyCGkkr5MA=";
vendorSha256 = "sha256-unw2/E048jzDHj7glXc61UNZIr930UpU9RrXI6DByj4=";
}

6
pkgs/applications/networking/cluster/nomad/1.4.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.4.1";
sha256 = "sha256-LQ/fypao6Amun9MY5FRCRasxqnywzI5gpzcO2PPJdWg=";
vendorSha256 = "sha256-kfT2UGC8Wl7CM9lOU75UqKc0/O1okGCoGDpmQntakbU=";
version = "1.4.2";
sha256 = "sha256-GGLy/6FgMTSZ701F0QGwcw1EFZSUMyPOlokThOTtdJg=";
vendorSha256 = "sha256-dd8rTGcO4GVMRuABwT4HeucZqYKxrgRUkua/bSPLNH0=";
}

4
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -6,7 +6,7 @@
mkDerivation rec {
pname = "qgroundcontrol";
version = "4.2.3";
version = "4.2.4";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -69,7 +69,7 @@ mkDerivation rec {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xa4c0ggQKqt4OfwVehjkhXYXY1TYVEoubuRH3Zsv0Ac=";
sha256 = "sha256-pPxqYxBlw9re1rlUU2qz0gFRmT+PmslrcBv97VEG84k=";
fetchSubmodules = true;
};

4
pkgs/development/compilers/jsonnet/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.18.0";
version = "0.19.0";
outputs = ["out" "doc"];
src = fetchFromGitHub {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
sha256 = "sha256-RmuvpKv9Dg3JcxsdZDBMehJjG5SvrV0spHgxApFeuJo=";
sha256 = "sha256-tCK6iEj6GNL46zGMzOnVv40/P0T6EpttoK0NokJ6qyM=";
};
nativeBuildInputs = [ jekyll ];

17
pkgs/development/libraries/faad2/default.nix
View File

@ -1,5 +1,14 @@
{lib, stdenv, fetchFromGitHub, autoreconfHook
{lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, drmSupport ? false # Digital Radio Mondiale
# for passthru.tests
, gst_all_1
, mpd
, ocamlPackages
, vlc
}:
with lib;
@ -19,6 +28,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
passthru.tests = {
inherit mpd vlc;
inherit (gst_all_1) gst-plugins-bad;
ocaml-faad = ocamlPackages.faad;
};
meta = {
description = "An open source MPEG-4 and MPEG-2 AAC decoder";
homepage = "https://sourceforge.net/projects/faac/";

4
pkgs/development/libraries/libbpkg/default.nix
View File

@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "libbpkg";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
sha256 = "sha256-K5KkhJa4qsh3AMDtCV4eA7bh3oU5DYEYMAacLmDoulU=";
sha256 = "sha256-KfvkG6bHSU8wTZDKGeEfI1AV9T8uSYZHePMlmjpBXHc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libbutl/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libbutl";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
sha256 = "sha256-zKufrUsLZmjw6pNbOAv+dPyolWpgXgygEnW0Lka6zw8=";
sha256 = "sha256-yzs6DFt6peJPPaMQ3rtx+kiYu7H+bUuShcdnEN90WWI=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libodb-sqlite/default.nix
View File

@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb-sqlite";
version = "2.5.0-b.21";
version = "2.5.0-b.23";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
sha256 = "sha256-dxU8HyzowFGNYCrZIKrZEZDGi9zo3G0x3/L7nfQKo0Y=";
sha256 = "sha256-HjEFfNDXduHOexNm82S+vqKRQM3SwgEYiDBZcPXsr/w=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libodb/default.nix
View File

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb";
version = "2.5.0-b.21";
version = "2.5.0-b.23";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
sha256 = "sha256-Q4HZ8zU5osZ9Phz59ZAjXh0dbB8ELBY5gMRbDnawCWs=";
sha256 = "sha256-j+lW9WFdjwIlP24/GUZsezyMf7/31XTfkuY2WGLdaeA=";
};
nativeBuildInputs = [ build2 ];

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.138";
version = "0.6.139";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hGFY+8OgHEQW0uVqobSv27HEA9noVVzOKJs0LHNZ+rM=";
sha256 = "sha256-yqyqlH2aYtVBFa5sFUTh6Ra0l5bOYpHjx/c7wlyxQfg=";
};
vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";

9
pkgs/development/ocaml-modules/faraday/async.nix
View File

@ -1,17 +1,12 @@
{ buildDunePackage, lib, fetchpatch, faraday, core, async }:
{ buildDunePackage, lib, faraday, core_unix, async }:
buildDunePackage rec {
pname = "faraday-async";
inherit (faraday) version src;
patches = lib.optional (lib.versionAtLeast async.version "0.15") (fetchpatch {
url = "https://github.com/inhabitedtype/faraday/commit/31c3fc7f91ecca0f1deea10b40fd5e33bcd35f75.patch";
sha256 = "05z5gk7hxq7qvwg6f73hdhfcnx19p1dq6wqh8prx667y8zsaq2zj";
});
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ faraday core async ];
propagatedBuildInputs = [ faraday core_unix async ];
meta = faraday.meta // {
description = "Async support for Faraday";

10
pkgs/development/ocaml-modules/faraday/default.nix
View File

@ -2,22 +2,20 @@
buildDunePackage rec {
pname = "faraday";
version = "0.8.1";
version = "0.8.2";
useDune2 = true;
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "sha256-eeR+nst/r2iFxCDmRS+LGr3yl/o27DcsS30YAu1GJmc=";
sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI=";
};
checkInputs = [ alcotest ];
propagatedBuildInputs = [ bigstringaf ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
meta = {
description = "Serialization library built for speed and memory efficiency";

2
pkgs/development/ocaml-modules/faraday/lwt-unix.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "faraday-lwt-unix";
inherit (faraday) version src useDune2 minimumOCamlVersion;
inherit (faraday) version src;
propagatedBuildInputs = [ lwt faraday-lwt ];

2
pkgs/development/ocaml-modules/faraday/lwt.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "faraday-lwt";
inherit (faraday) version src useDune2 minimumOCamlVersion;
inherit (faraday) version src;
propagatedBuildInputs = [ faraday lwt ];

4
pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "faraday-agent-parameters-types";
version = "1.0.4";
version = "1.1.0";
src = fetchPypi {
pname = "faraday_agent_parameters_types";
inherit version;
sha256 = "sha256-ldGCn0VzoMRFekCPMprNLpaL5Jts5MRv5Ym1qoJwjXA=";
sha256 = "sha256-7CA5YvqoNHuz9Tq9jjt40lyjrg+CJpnzI1nVnBr9Cyg=";
};
propagatedBuildInputs = [

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

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.7.0";
version = "1.8.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/v${version}";
rev = "refs/tags/${version}";
hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A=";
};

4
pkgs/development/tools/build-managers/build2/bdep.nix
View File

@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "bdep";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
sha256 = "sha256-sizrGmSixkkJL9nocA4B1I5n9OySxyuZ2bNc1Z4zmPg=";
sha256 = "sha256-dZldNVeQJWim3INBtOaPYP8yQMH3sjBzCLEHemvdxnU=";
};
strictDeps = true;

4
pkgs/development/tools/build-managers/build2/bootstrap.nix
View File

@ -5,10 +5,10 @@
}:
stdenv.mkDerivation rec {
pname = "build2-bootstrap";
version = "0.14.0";
version = "0.15.0";
src = fetchurl {
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
sha256 = "sha256-GO/GstQUmPdRbnqKXJECP2GCyGfUI3kjmDkN0MAEz90=";
sha256 = "1i1p52fr5sjs5yz6hqhljwhc148mvs4fyq0cf7wjg5pbv9wzclji";
};
patches = [
# Pick up sysdirs from NIX_LDFLAGS

9
pkgs/development/tools/build-managers/build2/bpkg.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bpkg";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
sha256 = "sha256-4WTFm0NYZOujxQ3PR9MyjXEJ4ql4qZ9OM5BePuHIK1M=";
sha256 = "sha256-3F4Pv8YX++cNa6aKhPM67mrt/5oE1IeoZUSmljHqBfI=";
};
strictDeps = true;
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
build2
];
buildInputs = [
build2
libbpkg
libbutl
libodb
@ -48,6 +49,10 @@ stdenv.mkDerivation rec {
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
];
postInstall = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath '${lib.getLib build2}/lib' "''${!outputBin}/bin/bpkg"
'';
meta = with lib; {
description = "build2 package dependency manager";
# https://build2.org/bpkg/doc/bpkg.xhtml

5
pkgs/development/tools/build-managers/build2/default.nix
View File

@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation rec {
pname = "build2";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" "man" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
sha256 = "sha256-/pWj68JmBthOJ2CTQHo9Ww3MCv4xBOw0SusJpMfX5Y8=";
sha256 = "07369gw6zlad6nk29564kj17yp145l3dzbgrx04pyiyl1s84aa1r";
};
patches = [
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
build2ConfigureFlags = [
"config.bin.lib=${configSharedStatic enableShared enableStatic}"
"config.cc.poptions+=-I${lib.getDev libpkgconf}/include/pkgconf"
"config.build2.libpkgconf=true"
];
postInstall = lib.optionalString stdenv.isDarwin ''

20
pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch
View File

@ -1,14 +1,16 @@
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -73,7 +73,11 @@ config/cxx{host-config}: config/in{host-config}
@@ -83,9 +83,13 @@ config/cxx{host-config}: config/in{host-config}
# want it).
#
build2_config = $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^ *(#|(config\.(dist\.|install\.chroot|config\.hermetic))).*$', \
[null], \
+ return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
+ [null], \
build2_config = $regex.replace_lines( \
+ $regex.replace_lines( \
$config.save(), \
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
[null], \
+ return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
+ [null], \
return_lines)
# Also preserve config.version.

22
pkgs/development/tools/build-managers/build2/remove-const-void-param.patch
View File

@ -1,11 +1,11 @@
--- build2-0.14.0_/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:18:24.864604892 -0400
+++ build2-0.14.0/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:20:58.153254961 -0400
@@ -186,7 +186,7 @@
;
static bool
- pkgconf_error_handler (const char* msg, const pkgconf_client_t*, const void*)
+ pkgconf_error_handler (const char* msg, const pkgconf_client_t*, void*)
{
error << runtime_error (msg); // Sanitize the message.
return true;
--- a/libbuild2/cc/pkgconfig-libpkgconf.cxx
+++ b/libbuild2/cc/pkgconfig-libpkgconf.cxx
@@ -84,7 +84,7 @@ namespace build2
static bool
pkgconf_error_handler (const char* msg,
const pkgconf_client_t*,
- const void*)
+ void*)
{
error << runtime_error (msg); // Sanitize the message (trailing dot).
return true;

4
pkgs/development/tools/misc/ccache/default.nix
View File

@ -15,13 +15,13 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.7";
version = "4.7.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Aqk8ukynXHXHieaI/5K5Wfh5ghpe1yfNtZHeXs7kn1I=";
sha256 = "sha256-k19Rbc7IPZemT6k5uTRXpoIV1n57aRSXQC276Xdc2EM=";
};
outputs = [ "out" "man" ];

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "12.7.1";
version = "12.8.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vTOxH4nRneyed4vuEq1b6ACSnl3neLvQdLlIH9Stu7k=";
sha256 = "sha256-TgfKsgRiSlPF3c2tdgr/1RTMZmN+9ME0BBdDrs0mPzo=";
};
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

6
pkgs/development/tools/taplo/default.nix
View File

@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "taplo";
version = "0.7.0";
version = "0.7.2";
src = fetchCrate {
inherit version;
pname = "taplo-cli";
sha256 = "sha256-lJdDr6pXOxndv3mBAbqkDnVXOFklSMcnzTed0U1Nm9U=";
sha256 = "sha256-AiX6ruiyyWt33G49dD9ozFXq+3efEMzJoeWVfP5UGGo=";
};
cargoSha256 = "sha256-1wN43HOyrSFTs9nKxUi3kcnGvtONW8SgKwIEK1ckCgk=";
cargoSha256 = "sha256-Uvc/1CE8eaYfelJ3U8zxF2HVx9P7G1ZVQB5tCvQDTac=";
buildInputs = lib.optional stdenv.isDarwin Security;

29
pkgs/os-specific/darwin/shortcat/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchurl, unzip, ... }:
stdenv.mkDerivation rec {
pname = "shortcat";
version = "0.11.0";
src = fetchurl {
url = "https://files.shortcat.app/releases/v${version}/Shortcat.zip";
sha256 = "sha256-P8NQy9odWOD8wRHBTmaNH7OCXXvgQsMiI169KfsAABU=";
};
sourceRoot = "Shortcat.app";
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/Applications/Shortcat.app
cp -R . $out/Applications/Shortcat.app
'';
meta = with lib; {
description = "Manipulate macOS masterfully, minus the mouse";
homepage = "https://shortcat.app/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.darwin;
maintainers = with maintainers; [ Enzime ];
license = licenses.unfreeRedistributable;
};
}

4
pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-utils";
version = "1.2.7";
version = "1.2.8";
src = fetchurl {
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
sha256 = "sha256-6Qa/JAT/BMRI6qPSJtKDpiuaKD8S5P2EV/skusJ05ng=";
sha256 = "sha256-4UD6YEw1Hza9chZ8iGDGnYG5ZK5qtTmS1kNN3jjpMzw=";
};
nativeBuildInputs = [ gettext makeWrapper ];

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dex";
version = "2.35.1";
version = "2.35.3";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TiFjJCf9FBvVK6I7/zMOGCwOeVDbAwHWaizcbGSeTwA=";
sha256 = "sha256-sYEdlEEpO0JDPHuGC457IPUcpp5PO2BLX/Gvd/vJvWQ=";
};
vendorSha256 = "sha256-ZJ7SO0lCJcDDWdf9/ecltNhs+zbqMXHqthQszJBTt5s=";
vendorSha256 = "sha256-2rg99+Zv+Lj6udhld0BwFrpVsyGC0IfX5Xqc7dRN13o=";
subPackages = [
"cmd/dex"

70
pkgs/servers/search/manticoresearch/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib, stdenv, fetchFromGitHub, fetchurl
, bison, cmake, flex, pkg-config
, boost, icu, libstemmer, mariadb-connector-c, re2
}:
let
columnar = stdenv.mkDerivation rec {
pname = "columnar";
version = "c16-s5"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake
src = fetchFromGitHub {
owner = "manticoresoftware";
repo = "columnar";
rev = version;
sha256 = "sha256-iHB82FeA0rq9eRuDzY+AT/MiaRIGETsnkNPCqKRXgq8=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DAPI_ONLY=ON" ];
meta = {
description = "A column-oriented storage and secondary indexing library";
homepage = "https://github.com/manticoresoftware/columnar/";
license = lib.licenses.asl20;
platforms = lib.platforms.all;
};
};
in
stdenv.mkDerivation rec {
pname = "manticoresearch";
version = "5.0.3";
src = fetchFromGitHub {
owner = "manticoresoftware";
repo = "manticoresearch";
rev = version;
sha256 = "sha256-samZYwDYgI9jQ7jcoMlpxulSFwmqyt5bkxG+WZ9eXuk=";
};
nativeBuildInputs = [
bison
cmake
flex
pkg-config
];
buildInputs = [
boost
columnar
icu.dev
libstemmer
mariadb-connector-c
re2
];
postPatch = ''
sed -i 's/set ( Boost_USE_STATIC_LIBS ON )/set ( Boost_USE_STATIC_LIBS OFF )/' src/CMakeLists.txt
# supply our own packages rather than letting manticore download dependencies during build
sed -i 's/^with_get/with_menu/' CMakeLists.txt
'';
cmakeFlags = [
"-DWITH_GALERA=0"
];
meta = with lib; {
description = "Easy to use open source fast database for search";
homepage = "https://manticoresearch.com";
license = licenses.gpl2;
maintainers = with maintainers; [ jdelStrother ];
platforms = platforms.all;
};
}

26
pkgs/tools/audio/loudgain/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128
, libresample, taglib, zlib }:
stdenv.mkDerivation rec {
pname = "loudgain";
version = "0.6.8";
src = fetchFromGitHub {
owner = "Moonbase59";
repo = pname;
rev = "v${version}";
hash = "sha256-XLj+n0GlY/GAkJlW2JVMd0jxMzgdv/YeSTuF6QUIGwU=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg libebur128 libresample taglib zlib ];
postInstall = ''
sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"
'';
meta = src.meta // {
license = lib.licenses.free;
maintainers = with lib.maintainers; [ ehmry ];
};
}

6
pkgs/tools/audio/vgmtools/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "vgmtools";
version = "unstable-2022-05-23";
version = "unstable-2022-08-03";
src = fetchFromGitHub {
owner = "vgmrips";
repo = "vgmtools";
rev = "e0df1511ddf7b1207b448487616ff18a9049c278";
sha256 = "2nM3E/XeZ1OeOj3fPqvuJgQcPOtBerduGpVfpGLVhHQ=";
rev = "a33c7b9d7c7608a3cfebbee4467c6909b42077d6";
sha256 = "oVasSToGp2APfaD/xCt/3SwvGq7JtpP8VVDRPznYDH4=";
};
nativeBuildInputs = [

106
pkgs/tools/misc/fx_cast/node-env.nix
View File

@ -165,7 +165,11 @@ let
if(process.argv[2] == "development") {
replaceDependencies(packageObj.devDependencies);
}
else {
packageObj.devDependencies = {};
}
replaceDependencies(packageObj.optionalDependencies);
replaceDependencies(packageObj.peerDependencies);
/* Write the fixed package.json file */
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@ -270,7 +274,7 @@ let
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
reconstructPackageLock = writeTextFile {
name = "addintegrityfields.js";
name = "reconstructpackagelock.js";
text = ''
var fs = require('fs');
var path = require('path');
@ -280,25 +284,43 @@ let
var lockObj = {
name: packageObj.name,
version: packageObj.version,
lockfileVersion: 1,
lockfileVersion: 2,
requires: true,
packages: {
"": {
name: packageObj.name,
version: packageObj.version,
license: packageObj.license,
bin: packageObj.bin,
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
}
},
dependencies: {}
};
function augmentPackageJSON(filePath, dependencies) {
function augmentPackageJSON(filePath, packages, dependencies) {
var packageJSON = path.join(filePath, "package.json");
if(fs.existsSync(packageJSON)) {
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
packages[filePath] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
};
dependencies[packageObj.name] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: {}
};
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
}
}
function processDependencies(dir, dependencies) {
function processDependencies(dir, packages, dependencies) {
if(fs.existsSync(dir)) {
var files = fs.readdirSync(dir);
@ -314,23 +336,84 @@ let
pkgFiles.forEach(function(entry) {
if(stats.isDirectory()) {
var pkgFilePath = path.join(filePath, entry);
augmentPackageJSON(pkgFilePath, dependencies);
augmentPackageJSON(pkgFilePath, packages, dependencies);
}
});
} else {
augmentPackageJSON(filePath, dependencies);
augmentPackageJSON(filePath, packages, dependencies);
}
}
});
}
}
processDependencies("node_modules", lockObj.dependencies);
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
'';
};
# Script that links bins defined in package.json to the node_modules bin directory
# NPM does not do this for top-level packages itself anymore as of v7
linkBinsScript = writeTextFile {
name = "linkbins.js";
text = ''
var fs = require('fs');
var path = require('path');
var packageObj = JSON.parse(fs.readFileSync("package.json"));
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
if(packageObj.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
if(typeof packageObj.bin == "object") {
Object.keys(packageObj.bin).forEach(function(exe) {
if(fs.existsSync(packageObj.bin[exe])) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin[exe]),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
else {
if(fs.existsSync(packageObj.bin)) {
console.log("linking bin '" + packageObj.bin + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin),
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
);
}
else {
console.log("skipping non-existent bin '" + packageObj.bin + "'");
}
}
}
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.directories.bin, exe),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
'';
};
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@ -377,13 +460,18 @@ let
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
runHook postRebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
fi
# Link executables defined in package.json
node ${linkBinsScript}
'';
# Builds and composes an NPM package including all its dependencies

60
pkgs/tools/misc/fx_cast/node-packages.nix generated
View File

@ -211,6 +211,24 @@ let
sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==";
};
};
"@types/yargs-17.0.11" = {
name = "_at_types_slash_yargs";
packageName = "@types/yargs";
version = "17.0.11";
src = fetchurl {
url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz";
sha512 = "aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==";
};
};
"@types/yargs-parser-21.0.0" = {
name = "_at_types_slash_yargs-parser";
packageName = "@types/yargs-parser";
version = "21.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz";
sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==";
};
};
"agent-base-6.0.2" = {
name = "agent-base";
packageName = "agent-base";
@ -1273,15 +1291,6 @@ let
sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==";
};
};
"rage-edit-1.2.0" = {
name = "rage-edit";
packageName = "rage-edit";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/rage-edit/-/rage-edit-1.2.0.tgz";
sha512 = "0RspBRc2s6We4g7hRCvT5mu7YPEnfjvQK8Tt354a2uUNJCMC7MKLvo/1mLvHUCQ/zbP6siQyp5VRZN7UCpMFZg==";
};
};
"rc-1.2.8" = {
name = "rc";
packageName = "rc";
@ -1732,6 +1741,15 @@ let
sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==";
};
};
"yargs-17.5.1" = {
name = "yargs";
packageName = "yargs";
version = "17.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz";
sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==";
};
};
"yargs-parser-20.2.9" = {
name = "yargs-parser";
packageName = "yargs-parser";
@ -1741,11 +1759,20 @@ let
sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==";
};
};
"yargs-parser-21.1.1" = {
name = "yargs-parser";
packageName = "yargs-parser";
version = "21.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz";
sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
};
};
};
args = {
name = "fx_cast_bridge";
packageName = "fx_cast_bridge";
version = "0.2.0";
version = "0.3.1";
src = ./.;
dependencies = [
sources."@babel/helper-validator-identifier-7.16.7"
@ -1771,6 +1798,8 @@ let
sources."@types/node-17.0.26"
sources."@types/node-fetch-2.6.1"
sources."@types/ws-8.5.3"
sources."@types/yargs-17.0.11"
sources."@types/yargs-parser-21.0.0"
sources."agent-base-6.0.2"
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.3.0"
@ -1902,8 +1931,14 @@ let
})
(sources."pkg-fetch-3.3.0" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."fs-extra-9.1.0"
sources."is-fullwidth-code-point-3.0.0"
sources."node-fetch-2.6.7"
sources."string-width-4.2.3"
sources."strip-ansi-6.0.1"
sources."yargs-16.2.0"
sources."yargs-parser-20.2.9"
];
})
sources."prebuild-install-6.1.4"
@ -1913,7 +1948,6 @@ let
sources."protobufjs-6.11.2"
sources."pump-3.0.0"
sources."queue-microtask-1.2.3"
sources."rage-edit-1.2.0"
sources."rc-1.2.8"
sources."readable-stream-2.3.7"
sources."require-directory-2.1.1"
@ -1970,7 +2004,7 @@ let
sources."ws-8.5.0"
sources."y18n-5.0.8"
sources."yallist-4.0.0"
(sources."yargs-16.2.0" // {
(sources."yargs-17.5.1" // {
dependencies = [
sources."ansi-regex-5.0.1"
sources."is-fullwidth-code-point-3.0.0"
@ -1978,7 +2012,7 @@ let
sources."strip-ansi-6.0.1"
];
})
sources."yargs-parser-20.2.9"
sources."yargs-parser-21.1.1"
];
buildInputs = globalBuildInputs;
meta = {

294
pkgs/tools/misc/fx_cast/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "fx_cast_bridge",
"version": "0.2.0",
"version": "0.3.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
@ -12,10 +12,10 @@
"fast-srp-hap": "^2.0.4",
"mdns": "^2.7.2",
"mime-types": "^2.1.35",
"minimist": "^1.2.6",
"node-fetch": "^3.2.3",
"tweetnacl": "^1.0.3",
"ws": "^8.5.0"
"ws": "^8.5.0",
"yargs": "^17.5.1"
},
"devDependencies": {
"@types/mdns": "^0.0.34",
@ -24,14 +24,12 @@
"@types/node": "^17.0.26",
"@types/node-fetch": "^2.6.1",
"@types/ws": "^8.5.3",
"@types/yargs": "^17.0.11",
"fs-extra": "^10.1.0",
"mustache": "^4.2.0",
"pkg": "^5.6.0",
"tiny-typed-emitter": "^2.1.0",
"typescript": "^4.6.3"
},
"optionalDependencies": {
"rage-edit": "^1.2.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
@ -207,6 +205,21 @@
"@types/node": "*"
}
},
"node_modules/@types/yargs": {
"version": "17.0.11",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
"integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
"dev": true,
"dependencies": {
"@types/yargs-parser": "*"
}
},
"node_modules/@types/yargs-parser": {
"version": "21.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
"dev": true
},
"node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@ -232,7 +245,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@ -431,7 +443,6 @@
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"dependencies": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
@ -442,7 +453,6 @@
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -451,7 +461,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -460,7 +469,6 @@
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -474,7 +482,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"dependencies": {
"ansi-regex": "^5.0.1"
},
@ -495,7 +502,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@ -506,8 +512,7 @@
"node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/combined-stream": {
"version": "1.0.8",
@ -626,8 +631,7 @@
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"node_modules/end-of-stream": {
"version": "1.4.4",
@ -642,7 +646,6 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
"dev": true,
"engines": {
"node": ">=6"
}
@ -863,7 +866,6 @@
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true,
"engines": {
"node": "6.* || 8.* || >= 10.*"
}
@ -1177,7 +1179,8 @@
"node_modules/minimist": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
"dev": true
},
"node_modules/mkdirp-classic": {
"version": "0.5.3",
@ -1446,6 +1449,15 @@
"pkg-fetch": "lib-es5/bin.js"
}
},
"node_modules/pkg-fetch/node_modules/ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/pkg-fetch/node_modules/fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@ -1461,6 +1473,15 @@
"node": ">=10"
}
},
"node_modules/pkg-fetch/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/pkg-fetch/node_modules/node-fetch": {
"version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@ -1481,6 +1502,59 @@
}
}
},
"node_modules/pkg-fetch/node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/pkg-fetch/node_modules/strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"dependencies": {
"ansi-regex": "^5.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/pkg-fetch/node_modules/yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"dependencies": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
},
"engines": {
"node": ">=10"
}
},
"node_modules/pkg-fetch/node_modules/yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true,
"engines": {
"node": ">=10"
}
},
"node_modules/pkg/node_modules/fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@ -1602,12 +1676,6 @@
}
]
},
"node_modules/rage-edit": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/rage-edit/-/rage-edit-1.2.0.tgz",
"integrity": "sha512-0RspBRc2s6We4g7hRCvT5mu7YPEnfjvQK8Tt354a2uUNJCMC7MKLvo/1mLvHUCQ/zbP6siQyp5VRZN7UCpMFZg==",
"optional": true
},
"node_modules/rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@ -1642,7 +1710,6 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
@ -2049,7 +2116,6 @@
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
@ -2066,7 +2132,6 @@
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -2075,7 +2140,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -2084,7 +2148,6 @@
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -2098,7 +2161,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"dependencies": {
"ansi-regex": "^5.0.1"
},
@ -2136,7 +2198,6 @@
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true,
"engines": {
"node": ">=10"
}
@ -2148,37 +2209,34 @@
"dev": true
},
"node_modules/yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"dependencies": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
"yargs-parser": "^21.0.0"
},
"engines": {
"node": ">=10"
"node": ">=12"
}
},
"node_modules/yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true,
"version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
"engines": {
"node": ">=10"
"node": ">=12"
}
},
"node_modules/yargs/node_modules/ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -2187,7 +2245,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -2196,7 +2253,6 @@
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -2210,7 +2266,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"dependencies": {
"ansi-regex": "^5.0.1"
},
@ -2372,6 +2427,21 @@
"@types/node": "*"
}
},
"@types/yargs": {
"version": "17.0.11",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
"integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
"dev": true,
"requires": {
"@types/yargs-parser": "*"
}
},
"@types/yargs-parser": {
"version": "21.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
"dev": true
},
"agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@ -2391,7 +2461,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
"color-convert": "^2.0.1"
}
@ -2534,7 +2603,6 @@
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
@ -2544,20 +2612,17 @@
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -2568,7 +2633,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.1"
}
@ -2585,7 +2649,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
}
@ -2593,8 +2656,7 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"combined-stream": {
"version": "1.0.8",
@ -2681,8 +2743,7 @@
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"end-of-stream": {
"version": "1.4.4",
@ -2696,8 +2757,7 @@
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
"dev": true
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
},
"escodegen": {
"version": "2.0.0",
@ -2858,8 +2918,7 @@
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
"github-from-package": {
"version": "0.0.0",
@ -3087,7 +3146,8 @@
"minimist": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
"dev": true
},
"mkdirp-classic": {
"version": "0.5.3",
@ -3296,6 +3356,12 @@
"yargs": "^16.2.0"
},
"dependencies": {
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@ -3308,6 +3374,12 @@
"universalify": "^2.0.0"
}
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
"node-fetch": {
"version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@ -3316,6 +3388,47 @@
"requires": {
"whatwg-url": "^5.0.0"
}
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
}
},
"strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.1"
}
},
"yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"requires": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
}
},
"yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true
}
}
},
@ -3394,12 +3507,6 @@
"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
"dev": true
},
"rage-edit": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/rage-edit/-/rage-edit-1.2.0.tgz",
"integrity": "sha512-0RspBRc2s6We4g7hRCvT5mu7YPEnfjvQK8Tt354a2uUNJCMC7MKLvo/1mLvHUCQ/zbP6siQyp5VRZN7UCpMFZg==",
"optional": true
},
"rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@ -3430,8 +3537,7 @@
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
"dev": true
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
},
"resolve": {
"version": "1.22.0",
@ -3732,7 +3838,6 @@
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"requires": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
@ -3742,20 +3847,17 @@
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -3766,7 +3868,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.1"
}
@ -3788,8 +3889,7 @@
"y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
},
"yallist": {
"version": "4.0.0",
@ -3798,37 +3898,33 @@
"dev": true
},
"yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"requires": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
"yargs-parser": "^21.0.0"
},
"dependencies": {
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -3839,7 +3935,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.1"
}
@ -3847,10 +3942,9 @@
}
},
"yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true
"version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
}
}
}

15
pkgs/tools/misc/fx_cast/package.json
View File

@ -1,10 +1,7 @@
{
"name": "fx_cast_bridge",
"version": "0.2.0",
"__applicationName": "fx_cast_bridge",
"__applicationVersion": "0.2.0",
"__applicationDirectoryName": "fx_cast",
"__applicationExecutableName": "fx_cast_bridge",
"version": "0.3.1",
"type": "module",
"scripts": {
"build": "node bin/build.js",
"package": "node bin/build.js --package",
@ -18,10 +15,10 @@
"fast-srp-hap": "^2.0.4",
"mdns": "^2.7.2",
"mime-types": "^2.1.35",
"minimist": "^1.2.6",
"node-fetch": "^3.2.3",
"tweetnacl": "^1.0.3",
"ws": "^8.5.0"
"ws": "^8.5.0",
"yargs": "^17.5.1"
},
"devDependencies": {
"@types/mdns": "^0.0.34",
@ -30,13 +27,11 @@
"@types/node": "^17.0.26",
"@types/node-fetch": "^2.6.1",
"@types/ws": "^8.5.3",
"@types/yargs": "^17.0.11",
"fs-extra": "^10.1.0",
"mustache": "^4.2.0",
"pkg": "^5.6.0",
"tiny-typed-emitter": "^2.1.0",
"typescript": "^4.6.3"
},
"optionalDependencies": {
"rage-edit": "^1.2.0"
}
}

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

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "pferd";
version = "3.4.1";
version = "3.4.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "Garmelon";
repo = "PFERD";
rev = "v${version}";
sha256 = "05f9b7wzld0jcalc7n5h2a6nqjr1w0fxwkd4cih6gkjc9117skii";
rev = "refs/tags/v${version}";
sha256 = "sha256-gT7i+7MiqgDSlvo9VqygRZjhB3gS6aoXKSef6BVABaA=";
};
nativeBuildInputs = with python3Packages; [

6
pkgs/tools/misc/pipe-rename/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "pipe-rename";
version = "1.5.0";
version = "1.6.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-NTAZy2ERxznRVld1WzYBchJakOIfs5uJr3yRNt81rMg=";
sha256 = "sha256-fAjJDHc6p/+a1RLricpNkww4JLJBAXNMfw1T2HmlxPg=";
};
cargoSha256 = "sha256-6Rv3rVQEvxdrEp5plhf9NAxpXOD4szwFGU5M6tvakzk=";
cargoSha256 = "sha256-UvYRegfc/+cFx7kLuhQIYZGla5YCrWXKOsTMlV9c874=";
checkInputs = [ python3 ];

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "rauc";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Cst+hSMyuJw6b+ZA6XNVh0kVp7WUTiiXpO1TPeHA+sM=";
sha256 = "sha256-lSTC/WDwa6WVPd+Tj6XdKpwwENfAweUnE6lCyXQvAXU=";
};
passthru = {

5
pkgs/tools/networking/axel/default.nix
View File

@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
installFlags = [ "ETCDIR=${placeholder "out"}/etc" ];
postInstall = ''
mkdir -p $out/share/doc
cp doc/axelrc.example $out/share/doc/axelrc.example
'';
meta = with lib; {
description = "Console downloading program with some features for parallel connections for faster downloading";
homepage = "https://github.com/axel-download-accelerator/axel";

4
pkgs/tools/networking/pritunl-client/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pritunl-client";
version = "1.3.3300.95";
version = "1.3.3329.81";
src = fetchFromGitHub {
owner = "pritunl";
repo = "pritunl-client-electron";
rev = version;
sha256 = "sha256-kPZFfKdiIq45/uyfsllUJrCphfUV5VX5QwaEg8351GI=";
sha256 = "sha256-1V3mWnA418duWDBYqr8QqigWVvx1oNw0NAn+gFaxpsE=";
};
modRoot = "cli";

11
pkgs/tools/networking/termscp/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, dbus
, fetchFromGitHub
, libssh
, openssl
, pkg-config
, rustPlatform
@ -14,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "termscp";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "veeso";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iazp3Qx2AivuL+S1Ma/64BLJtE46tc33dq5qsgw+a6Q=";
hash = "sha256-AyDENQj73HzNh1moO/KJl7OG80w65XiYmIl8d9/iAtE=";
};
cargoSha256 = "sha256-FBW3Hl67Efnc/sNGM1LQw6msWHCYRj3KwfmSD2lpbUc=";
cargoHash = "sha256-NgBQvWtwkAvp0V7zWGw+lNAcVqqDMAeNC0KNIBrwjEE=";
nativeBuildInputs = [
pkg-config
@ -31,7 +30,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
dbus
libssh
openssl
] ++ lib.optionals stdenv.isDarwin [
AppKit
@ -40,6 +38,9 @@ rustPlatform.buildRustPackage rec {
Security
];
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-framework" "AppKit"
];

6
pkgs/tools/security/naabu/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "naabu";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "v${version}";
sha256 = "sha256-Gx2bYJXSApYhci7yQW45lLZjyfHVV8orPUIumC3+Yxg=";
sha256 = "sha256-XX9c5Qix79eRZkmZxDjFiiTnh66bBLhSunUrIS2FdCA=";
};
vendorSha256 = "sha256-wXXtebZUL4Nm7M7Eu0Ucks9forCC+6Yb8eyKPb43rxA=";
vendorSha256 = "sha256-w3prgkemFPLZ/OC0TPQL7kzKPcBLhYTw/IHP1vQlC2s=";
buildInputs = [
libpcap

6
pkgs/tools/security/scorecard/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "scorecard";
version = "4.6.0";
version = "4.8.0";
src = fetchFromGitHub {
owner = "ossf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mEUJ42Da9br5BuZgtJBMeJGSESALoqaOwO/4Bvqj0IA=";
sha256 = "sha256-LGxSiubZECNwoFkkJOySI4LOmwk7DXVtY74XBCsr+uk=";
# populate values otherwise taken care of by goreleaser,
# unfortunately these require us to use git. By doing
# this in postFetch we can delete .git afterwards and
@ -22,7 +22,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-HvYUfr3ojmhO6AY6SypFOMP/vjlyLKunv1LvfLgBSjU=";
vendorSha256 = "sha256-j8/sVdqxLmrvQwHn+uj8+q+ne98xcIeQKS1VQJcrkh0=";
nativeBuildInputs = [ installShellFiles ];

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

@ -8463,6 +8463,8 @@ with pkgs;
lottieconverter = callPackage ../tools/misc/lottieconverter { };
loudgain = callPackage ../tools/audio/loudgain/default.nix { };
lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { };
lsd = callPackage ../tools/misc/lsd { };
@ -21057,6 +21059,7 @@ with pkgs;
boost = boost175;
};
manticoresearch = callPackage ../servers/search/manticoresearch { };
marisa = callPackage ../development/libraries/marisa {};
@ -24334,10 +24337,7 @@ with pkgs;
spring-boot-cli = callPackage ../development/tools/spring-boot-cli { };
squid = callPackage ../servers/squid {
# https://bugs.squid-cache.org/show_bug.cgi?id=5133
openssl = openssl_1_1;
};
squid = callPackage ../servers/squid { };
duckling-proxy = callPackage ../servers/duckling-proxy { };
@ -25578,6 +25578,8 @@ with pkgs;
shadow = callPackage ../os-specific/linux/shadow { };
shortcat = callPackage ../os-specific/darwin/shortcat { };
sinit = callPackage ../os-specific/linux/sinit {
rcinit = "/etc/rc.d/rc.init";
rcshutdown = "/etc/rc.d/rc.shutdown";

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

@ -8210,10 +8210,10 @@ self: super: with self; {
pyowm = callPackage ../development/python-modules/pyowm { };
pypamtest = pkgs.libpam-wrapper.override {
pypamtest = toPythonModule (pkgs.libpam-wrapper.override {
enablePython = true;
inherit python;
};
});
pypandoc = callPackage ../development/python-modules/pypandoc { };