b12f/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] 2023-06-19 06:01:47 +00:00 committed by GitHub
parent 856c1243c8 26a382929f
commit a452e85f10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 5331 additions and 1528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/licenses.nix
View file

@ -98,6 +98,11 @@ in mkLicense lset) ({
fullName = "Artistic License 1.0";
};
artistic1-cl8 = {
spdxId = "Artistic-1.0-cl8";
fullName = "Artistic License 1.0 w/clause 8";
};
artistic2 = {
spdxId = "Artistic-2.0";
fullName = "Artistic License 2.0";
@ -295,11 +300,26 @@ in mkLicense lset) ({
free = false;
};
cc-by-sa-10 = {
spdxId = "CC-BY-SA-1.0";
fullName = "Creative Commons Attribution Share Alike 1.0";
};
cc-by-sa-20 = {
spdxId = "CC-BY-SA-2.0";
fullName = "Creative Commons Attribution Share Alike 2.0";
};
cc-by-sa-25 = {
spdxId = "CC-BY-SA-2.5";
fullName = "Creative Commons Attribution Share Alike 2.5";
};
cc-by-10 = {
spdxId = "CC-BY-1.0";
fullName = "Creative Commons Attribution 1.0";
};
cc-by-30 = {
spdxId = "CC-BY-3.0";
fullName = "Creative Commons Attribution 3.0";
@ -486,6 +506,16 @@ in mkLicense lset) ({
url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources
};
gfl = {
fullName = "GUST Font License";
url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt";
};
gfsl = {
fullName = "GUST Font Source License";
url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt";
};
gpl1Only = {
spdxId = "GPL-1.0-only";
fullName = "GNU General Public License v1.0 only";
@ -626,6 +656,11 @@ in mkLicense lset) ({
free = false;
};
knuth = {
fullName = "Knuth CTAN License";
spdxId = "Knuth-CTAN";
};
lal12 = {
spdxId = "LAL-1.2";
fullName = "Licence Art Libre 1.2";
@ -702,11 +737,21 @@ in mkLicense lset) ({
url = "https://opensource.franz.com/preamble.html";
};
lppl1 = {
spdxId = "LPPL-1.0";
fullName = "LaTeX Project Public License v1.0";
};
lppl12 = {
spdxId = "LPPL-1.2";
fullName = "LaTeX Project Public License v1.2";
};
lppl13a = {
spdxId = "LPPL-1.3a";
fullName = "LaTeX Project Public License v1.3a";
};
lppl13c = {
spdxId = "LPPL-1.3c";
fullName = "LaTeX Project Public License v1.3c";

3
lib/systems/default.nix
View file

@ -226,8 +226,7 @@ rec {
};
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
in
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
pkgs.stdenv.hostPlatform.canExecute final
if pkgs.stdenv.hostPlatform.canExecute final
then "${pkgs.runtimeShell} -c '\"$@\"' --"
else if final.isWindows
then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"

753
nixos/modules/services/monitoring/grafana.nix
View file

File diff suppressed because it is too large Load diff

2
nixos/tests/snapper.nix
View file

@ -15,7 +15,7 @@ import ./make-test-python.nix ({ ... }:
fsType = "btrfs";
};
};
services.snapper.configs.home.subvolume = "/home";
services.snapper.configs.home.SUBVOLUME = "/home";
services.snapper.filters = "/nix";
};

4
pkgs/applications/audio/eartag/default.nix
View file

@ -18,7 +18,7 @@
python3Packages.buildPythonApplication rec {
pname = "eartag";
version = "0.4.0";
version = "0.4.1";
format = "other";
src = fetchFromGitLab {
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
owner = "knuxify";
repo = pname;
rev = version;
sha256 = "sha256-4Kk/+iQNRqba5W/AdPlZ17Siwyy+WQuRYCb7M68S71I=";
sha256 = "sha256-awH+SA0xef1dMDqfLOg5htYH5ywWzK2xbWWSaan0aRg=";
};
postPatch = ''

16
pkgs/applications/editors/marker/default.nix
View file

@ -9,20 +9,20 @@
, gtk3
, gtksourceview
, gtkspell3
, webkitgtk
, webkitgtk_4_1
, pandoc
}:
stdenv.mkDerivation rec {
pname = "marker";
version = "2020.04.04.2";
version = "2023.05.02";
src = fetchFromGitHub {
owner = "fabiocolacio";
repo = "Marker";
rev = version;
fetchSubmodules = true;
sha256 = "sha256-wLR1FQqlLA02ed/JoAcxRHhIVua1FibAee1PC2zOPOM=";
sha256 = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
};
nativeBuildInputs = [
@ -37,14 +37,18 @@ stdenv.mkDerivation rec {
gtk3
gtksourceview
gtkspell3
webkitgtk
webkitgtk_4_1
pandoc
];
postPatch = ''
meson rewrite kwargs set project / version '${version}'
'';
meta = with lib; {
homepage = "https://fabiocolacio.github.io/Marker/";
description = "Markdown editor for the Linux desktop";
maintainers = with maintainers; [ trepetti ];
description = "Markdown editor for the Linux desktop made with GTK3";
maintainers = with maintainers; [ trepetti aleksana ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}";

142
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -369,8 +369,8 @@ final: prev:
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "9111a210a3dfb011af44a2dcc10010718ebde346";
sha256 = "0qigjnp4zlpwsk7jprdmji0s5pk034l6swmcvhnh5s5aabk0ng5s";
rev = "9c69328d61cc8bc14b122247ff702d9e4dfccea4";
sha256 = "0f2bp503gg1c4x0r961i52zw6xhkw7hpn4298s33kcbfcr8dixhb";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -1135,12 +1135,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2023-06-02";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "02d795081e6a24ec1fd506c513491543793d0780";
sha256 = "1zq4vnqq5sq679nw8zvwvkkrw0gnpina2nf4iq66s8qgqiqsm43d";
rev = "60734264a8655a7db3595159fb50076dc24c2f2c";
sha256 = "1vlm4azvfxlmcym5p6hq344wjdlmfx90d9pdpxafpvb323ss86rm";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -2263,24 +2263,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2023-06-11";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "963512076adfac6f3010ec33e1ed6be6dbadccce";
sha256 = "1g5fymcrnqj32j4z1l85lkpjq9njlqqbir09rpvkdx4x8yfjg0ik";
rev = "af56cc3daf29d1da7f331f679ff45164fa189c67";
sha256 = "14y08bv45mq8nhqj087429wpahncf9f0lg65ivr1hvxfq89lilnp";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2023-06-11";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "53f3fdee2140c349e036fd5447e9462cf5c42d80";
sha256 = "1qj74m853ivjpb5ighy18b53r6vah6vgh4c91vq9wcfgk86xjvfw";
rev = "0ccf22d8e64d5c2d939f08ceec2587c9b9ad9844";
sha256 = "1hvaf4cyi3kw9k07hxh4g3fcl0d31qfbgxawby6vjkj9y4iaivyf";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2299,12 +2299,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-06-11";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "4ab181e67533705b7cbb8b0b109308fce0d954f8";
sha256 = "06y4ysmvbyy287wcrmyd97snrmaxaz5zbpmka9dq3x4bc7qd9w47";
rev = "3d76374ab24a6730973ed6a93f9f7b3b6640cc50";
sha256 = "1gkg2iiswnviq07dzpij62lzjsrlapg7c9v4psl25l727l1ddi8y";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -3288,12 +3288,12 @@ final: prev:
flutter-tools-nvim = buildVimPluginFrom2Nix {
pname = "flutter-tools.nvim";
version = "2023-05-14";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "akinsho";
repo = "flutter-tools.nvim";
rev = "2b72017f369c5d80bb56bcf4379b3eccd69e2371";
sha256 = "14incakb1ykyq8lr506wlzybpc2pyn345aajq7v83pwsc7lg5a9b";
rev = "5de1b5fca5e07849b2626c8aeda81d2ba6362af1";
sha256 = "06f48a45wdd67y7rzfrnq3ccyfnmhpzkl0gin1yfi5g7gcgbsh8v";
};
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
@ -3432,12 +3432,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2023-06-15";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "3c260cce2499abe161e222fa1d69f3a7602a243e";
sha256 = "0qzzhq2vf4jyv8kry35m3q3pan39vmqms4ahhi9vx2v0sqy1q6gd";
rev = "2eb30b7d2779203378b67b516879961d94a7ec51";
sha256 = "1v1hl4fxdk1iydy849mcwwik5x2kfha3nbm4dpld5iiycmgvsi84";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@ -4499,12 +4499,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
version = "2023-05-01";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
rev = "ea68b6abc252e65f88a08305a3d6e1578a27b720";
sha256 = "14ng8f8w1z2szfk10rkc28mglfkar5aliclwkfbmih1g05vcyx78";
rev = "b3b21d9ec32680b430714c2515d220c348120579";
sha256 = "1lprvqxkblix071hfvxjk45wxgpkfj1vjps4cbyq98lkxs253rx4";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@ -4535,12 +4535,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-06-02";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "14b5a65190fe69388a8f59c695ed3394a10d6af8";
sha256 = "1p3bz2zs4s2kg1q1gyaf2pffp1fwd0hmh5cds8s8a1r3cab9mnap";
rev = "96f0f60baf037a3f91c8c725a0aad56094a73808";
sha256 = "0qgqiiw2cmm60cxnil2cvkh5h6p8kx3zvcyw60ia7n4s93yqzbkx";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@ -5123,12 +5123,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-06-13";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "4be1226f48bc2011024110f37b17f5ee468df58f";
sha256 = "1wkqzjjfgr10g2s4jm48kcfvfv8pz576zl7dgbpcsjhgz7mz9xkm";
rev = "ed989357ec71ed8d91deda7122a93f7570e19041";
sha256 = "165xlaifvyp8maqdycf2pgnhn6b4asvcsrin4fhwhxj3crjv6bpm";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -6623,12 +6623,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2023-06-12";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "47f1bf937aa2d90b6fd1e1e67e3c6b2a073f4bd9";
sha256 = "1vmhb57n0z2pzd42pn795mxk0bzg9xgnwrmd1lgp9df26xzk26ga";
rev = "da2f0934f08f01d9c0d348814860cb3413d4ab23";
sha256 = "057wn6drnynrkbddgm9p8rnmzh3mqrlgy739wx3mvfax26fmg6xd";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -7043,36 +7043,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2023-06-12";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "f873625d0636889af4cd47a01e486beb865db205";
sha256 = "1744rhzjwwhqvn6wwsm498v4i69wq7hsgqfcym6fq5nga7x3cc0i";
rev = "d4f6d33496ef09018ab96e48e4f4a852d3334caf";
sha256 = "0kl6sirsv1g7lqs2b43byga8dxzl4blp73sryjasxzjan099biaq";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-16";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "1b9f704eb8664508749a1164d4086e47f9afa77f";
sha256 = "1njqygdlvi930qpn0igf8y8bz15ci5kyncmnnir2235xp8bcn8i3";
rev = "840e5d71787b02789f909315f646a6dd66a0de2c";
sha256 = "0zqp1bckgijic464868dqs4gxfmvjkmkrj9hkrjwm4vp5qfcqwk6";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
version = "2023-06-14";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
rev = "efe87061af560847679fca93697991e474f049e2";
sha256 = "1dzrrmrikzlyq5sgwjg3l593pb12mkp5k11lzfacd1i249ksryka";
rev = "05aa871a41078ae82158a37940972f6fea057c01";
sha256 = "1smay2sb81gbj9wvwvc93czvpqma6wrgrmw3a4yxn61m5rjhc2qy";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@ -7163,11 +7163,11 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
version = "2023-06-14";
version = "2023-06-18";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
rev = "9e228dc94d083cb2dfddac64d524483f452dab40";
sha256 = "13q9kpiwmydf39dfk47inaas2r49scsvrqb1v7rnimjmjxp2654d";
rev = "3c5f7f5a6f3cc10ec3b098442872f042a2885317";
sha256 = "1jzygfpg3nk5flx49fxvk3m0px7ijca9w2mlb3lq1gr9gl95c0h9";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
@ -7186,12 +7186,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2023-05-27";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
rev = "2a125024a137677930efcfdf720f205504c97268";
sha256 = "0hjfi7zrxn7hci0gagnx50p20afdg5c63skjbh89rvsh0v2qgg3f";
rev = "14b3a5ba63b82b60cde98d0a40319d80f25e8301";
sha256 = "0hn54zz5a3zhg796jfryg1vsikv96vpvcgg71mz95wshnqjlr3jr";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@ -7355,12 +7355,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2023-06-12";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "9ae2c7f67aad788bb8217ce1cf978affe0d3d4ef";
sha256 = "1d6vqw07gsc3x3xsq6h7m1bwm9ad37bxfp7drjhsrmqz1b8rpc66";
rev = "220405af9c1ebe466045106fbec8ea5fbb9d46ab";
sha256 = "074z5h835raczrd1s78j3c8rdk9daxqr95s6d8q2h0kzkhcaxy32";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -7427,12 +7427,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2023-06-14";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "d9e48c40108e5e116494fce298a4df71f212bf5e";
sha256 = "1rwcxhbbxkyb9y732ypc6h4sj4vqvpmysr1fkh69rlmrdmcj7h5y";
rev = "4a7b92671094de130897519ca3e060b640a34006";
sha256 = "03qrphzrbvg10d2028rz7cp7pw3gqg24qhr31sz74694wyd6bam1";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@ -8099,6 +8099,18 @@ final: prev:
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
};
scnvim = buildVimPluginFrom2Nix {
pname = "scnvim";
version = "2023-04-29";
src = fetchFromGitHub {
owner = "davidgranstrom";
repo = "scnvim";
rev = "5cd5a28b972eced0d03f2d3cf887a8f5bdbfecfd";
sha256 = "0ns0wh79bgwxbsvq26cx0xzdw71zp761isif6p3144gh7ndqxmpd";
};
meta.homepage = "https://github.com/davidgranstrom/scnvim/";
};
scope-nvim = buildVimPluginFrom2Nix {
pname = "scope.nvim";
version = "2023-05-09";
@ -11480,12 +11492,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
version = "2023-06-07";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
rev = "67d28c1031e4970b07627fe30262f1862755b915";
sha256 = "0rdsvnpj4n4ji0k5pb7sjrcqanxahqdn6bvil8zl6ss15f1b3phx";
rev = "a2db9d47de12a1bffb92a27d41a9118b70521248";
sha256 = "09jpna2zzhn8va834psfs78z5pcz5dp957sqsg5vjvzj6h3fxf9f";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@ -12383,12 +12395,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2023-06-02";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "3625e099b09bff2db5f04082cb09ba679525980c";
sha256 = "0nb7xnypv046lh73wfqhch54jx5h3xaxjin0qv9b3g0k5zd0mdi6";
rev = "3a17944bfa3942da805a381750a1be4b314c64d2";
sha256 = "00kc4zkr1hd8qcls3midmdb2lr205lw0r6r6gb7xc8yqvv1bcv9h";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -13679,12 +13691,12 @@ final: prev:
vim-solarized8 = buildVimPluginFrom2Nix {
pname = "vim-solarized8";
version = "2023-06-06";
version = "2023-06-17";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-solarized8";
rev = "77a6bd78a6f1f8b6f841fc7e1ea427b2348ac1b7";
sha256 = "072y01039s2gimnsvibwfb499r0wqbwqk7n8ykqilf6y298r1m2g";
rev = "53ab8f3132394e4315a29aea15bfdb83e39ed3b7";
sha256 = "17gcvzvngx2p03rg72j376yfs5z32c0rm6rdplr6sn97hxvd6rha";
};
meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
};
@ -15134,12 +15146,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-06-11";
version = "2023-06-18";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "a184a9cc6de11167c64f449b386dfe0b77a31a91";
sha256 = "0862drqfv2qwi2di2kry1fc8xc9zcddyiw0r1lgjy7skjvjlyhid";
rev = "260312b5c60f5fc3299da4357690ba6bf4485387";
sha256 = "0zcrq7hlmsjhcj0y5wjipafsxll5q8vj86cf1hcknvnq341sccxk";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

54
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -27,12 +27,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=833b53d";
version = "0.0.0+rev=0804efc";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "833b53df97143bc46e014608dee9f64f78d7473c";
hash = "sha256-M3mAZ5CORunUEIxy4+yQ8qTSbpmEgEmHgTB98niTbXo=";
rev = "0804efc41c42cf5b0a6ea8d500ea6f4e49a15ef6";
hash = "sha256-oTraIxeZLLbnxatXEfxjK6pw17aplxhyUJpzld5m3cs=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@ -137,12 +137,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "0.0.0+rev=95b2253";
version = "0.0.0+rev=03b9b62";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "95b22531b496eec47fbb4c25375b507c909982ca";
hash = "sha256-tdH86xBD+RX9D02L/sb+TfDgtaQjIL517UmvsI43hcM=";
rev = "03b9b6272ef3df674f9c54507cc042412f257eed";
hash = "sha256-LS+NJ+oQDQ78lu7ozCh/E5dQuDprtb3e73MrJutX8P0=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@ -181,34 +181,34 @@
};
cmake = buildGrammar {
language = "cmake";
version = "0.0.0+rev=399605a";
version = "0.0.0+rev=24ed4fd";
src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-cmake";
rev = "399605a02bcd5daa309ce63a6459c600dce3473f";
hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM=";
rev = "24ed4fd565cd95fcba4f42e995cf186cab180ccb";
hash = "sha256-0ixZL+Tpr8YLUvdGGBveI127DIOwkfqsq2D3xKLExck=";
};
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
};
comment = buildGrammar {
language = "comment";
version = "0.0.0+rev=94c99a6";
version = "0.0.0+rev=fd1e102";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
rev = "94c99a66bb5051d8321b5900aee92b76450c50ce";
hash = "sha256-ma1LIiNuccXNftijehRzABVv7R3Jw9Wcjz0X2vGqaIc=";
rev = "fd1e1026d1a33b996db91a01dafeeff0a41d536c";
hash = "sha256-IsGvDejgdkgt4zu8VSy6i/tZNN9eyye3ewe901CvKw8=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
};
commonlisp = buildGrammar {
language = "commonlisp";
version = "0.0.0+rev=7a61fd7";
version = "0.0.0+rev=338db38";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-commonlisp";
rev = "7a61fd78c1673da5c38b7bef56794f0ac6250e91";
hash = "sha256-Rqv2ZcxtOBvoii+wO7LfwOztHmE8S/+Ia5SaKb8um7g=";
rev = "338db38330f0d25cba8e2c6428240ebc5e020264";
hash = "sha256-mTBxnj/kqrHx8q7cAKTjfD0FOyVKjDub01Y50DXXjg0=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp";
};
@ -225,12 +225,12 @@
};
corn = buildGrammar {
language = "corn";
version = "0.0.0+rev=6a6b0f4";
version = "0.0.0+rev=604d73c";
src = fetchFromGitHub {
owner = "jakestanger";
repo = "tree-sitter-corn";
rev = "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede";
hash = "sha256-7sBdw8AsRvWo8iSALt9slO0HLVoLTPrU7Tt46mMPLoc=";
rev = "604d73c38d4c28ca68e9e441ffd405d68cb63051";
hash = "sha256-ewpLp+se6XTY8aRoz247YlouS1p/kaS7CqVFu412C+Q=";
};
meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
};
@ -447,12 +447,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "0.0.0+rev=c431b0b";
version = "0.0.0+rev=5dba13d";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "c431b0b2d9228ed0869f7a6bb88fc9d2796d44b1";
hash = "sha256-dawA0Iem7naBhEvrrvQwk+wNBDPflC1UmLVqewTiLlA=";
rev = "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe";
hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@ -733,12 +733,12 @@
};
haskell = buildGrammar {
language = "haskell";
version = "0.0.0+rev=d2345d1";
version = "0.0.0+rev=a75238f";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "d2345d17ccf06253d63aa9a2e09ac9d7b4ca3c8d";
hash = "sha256-/COD0kx3/bKVatme7iOgCwaHB5KKios8YCBTzcARn34=";
rev = "a75238fdefc2281cdba7dc4dca13f1d68a91f177";
hash = "sha256-KCP6nP2AI6ZwuADSlWTP21I+U4aUr40/sYTn1FVqVMA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
};
@ -1966,12 +1966,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=234c102";
version = "0.0.0+rev=519e0f6";
src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "234c1028883187c6b48e030780b7332229faefa3";
hash = "sha256-4DqMn9rPTxOtQOfy8fy6R7z/+z50XnCLV0J/4QFrRz4=";
rev = "519e0f64007a40852e59bb72ff1b6e2375068664";
hash = "sha256-ps5VmLSDoc5PF/rGhNAmKkOBsuVxgjn+ZQTit8MGyvk=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";

12
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -946,24 +946,18 @@ self: super: {
sniprun =
let
version = "1.3.3";
version = "1.3.4";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
hash = "sha256-my06P2fqWjZAnxVjVzIV8q+FQOlxRLVZs3OZ0XBR6N0=";
hash = "sha256-H1PmjiNyUp+fTDqnfppFii+aDh8gPD/ALHFNWVXch3w=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
cargoLock = {
lockFile = ./sniprun/Cargo.lock;
};
postPatch = ''
ln -s ${./sniprun/Cargo.lock} Cargo.lock
'';
cargoHash = "sha256-WXhH0zqGj/D83AoEfs0kPqW7UXIAkURTJ+/BKbuUvss=";
nativeBuildInputs = [ makeWrapper ];

807
pkgs/applications/editors/vim/plugins/sniprun/Cargo.lock generated
View file

@ -1,807 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "addr2line"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
"gimli",
]
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
"addr2line",
"cc",
"cfg-if 1.0.0",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "byteorder"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "cc"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "close_fds"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bc416f33de9d59e79e57560f450d21ff8393adcf1cdfc3e6d8fb93d5f88a2ed"
dependencies = [
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "dashmap"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
dependencies = [
"cfg-if 1.0.0",
"hashbrown",
"lock_api",
"once_cell",
"parking_lot_core",
]
[[package]]
name = "dirs"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.48.0",
]
[[package]]
name = "futures"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-channel"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
]
[[package]]
name = "futures-core"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-io"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-sink"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
"futures-sink",
"futures-task",
"memchr",
"pin-project-lite",
"pin-utils",
"slab",
]
[[package]]
name = "getrandom"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if 1.0.0",
"libc",
"wasi",
]
[[package]]
name = "gimli"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "lock_api"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "log-panics"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f"
dependencies = [
"backtrace",
"log",
]
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "miniz_oxide"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
dependencies = [
"adler",
]
[[package]]
name = "neovim-lib"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6a8f5a1e1be160ce2b669c2c495a34ade6f3a525d4afafd7370c1792070f587"
dependencies = [
"log",
"rmp",
"rmpv",
"unix_socket",
]
[[package]]
name = "num-traits"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
]
[[package]]
name = "object"
version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "option-ext"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall 0.2.16",
"smallvec",
"windows-sys 0.45.0",
]
[[package]]
name = "paste"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "pin-project-lite"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
[[package]]
name = "pin-utils"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "proc-macro2"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
"redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
[[package]]
name = "rmp"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
dependencies = [
"byteorder",
"num-traits",
"paste",
]
[[package]]
name = "rmpv"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c760afe11955e16121e36485b6b828326c3f0eaff1c31758d96dbeb5cf09fd5"
dependencies = [
"num-traits",
"rmp",
"serde",
"serde_bytes",
]
[[package]]
name = "rustc-demangle"
version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
[[package]]
name = "serde_bytes"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
dependencies = [
"serde",
]
[[package]]
name = "serial_test"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
dependencies = [
"dashmap",
"futures",
"lazy_static",
"log",
"parking_lot",
"serial_test_derive",
]
[[package]]
name = "serial_test_derive"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "simple-logging"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542"
dependencies = [
"lazy_static",
"log",
"thread-id",
]
[[package]]
name = "slab"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
[[package]]
name = "smallvec"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "sniprun"
version = "1.3.3"
dependencies = [
"close_fds",
"dirs",
"libc",
"log",
"log-panics",
"neovim-lib",
"regex",
"serial_test",
"simple-logging",
"strip-ansi-escapes",
"thiserror",
"unindent",
]
[[package]]
name = "strip-ansi-escapes"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8"
dependencies = [
"vte",
]
[[package]]
name = "syn"
version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thiserror"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "thread-id"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
dependencies = [
"libc",
"redox_syscall 0.1.57",
"winapi",
]
[[package]]
name = "unicode-ident"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unindent"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f"
[[package]]
name = "unix_socket"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564"
dependencies = [
"cfg-if 0.1.10",
"libc",
]
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "vte"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
dependencies = [
"arrayvec",
"utf8parse",
"vte_generate_state_changes",
]
[[package]]
name = "vte_generate_state_changes"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
dependencies = [
"proc-macro2",
"quote",
]
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

8
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -651,15 +651,15 @@ let
mktplcRef = {
name = "ruff";
publisher = "charliermarsh";
version = "2023.22.0";
sha256 = "sha256-RhEDf/EbUD5YdHDyoZwr68OfOgKfkSXJFsKcLHC5bcc=";
version = "2023.24.0";
sha256 = "sha256-wwunbseX/VxoU8mRDankDim6PQy8uwEhLXR4RUVo7Xw=";
};
meta = {
license = lib.licenses.mit;
changelog = "https://github.com/charliermarsh/ruff-vscode/releases";
changelog = "https://github.com/astral-sh/ruff-vscode/releases";
description = "Ruff extension for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff";
homepage = "https://github.com/charliermarsh/ruff-vscode/";
homepage = "https://github.com/astral-sh/ruff-vscode/";
maintainers = [ lib.maintainers.azd325 ];
};
};

315
pkgs/applications/graphics/oculante/Cargo.lock generated
View file

@ -37,9 +37,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
@ -58,9 +58,9 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "aom-decode"
version = "0.2.5"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9dc16c84c3c946412a813b77c39e920e75aed10f9ca652a32dd59ca300e6adb"
checksum = "184809f34419fcedd7f24533c534aea6f68b9bd8ac9984faa4abd0d1d6745ac6"
dependencies = [
"avif-parse",
"imgref",
@ -129,9 +129,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrayvec"
version = "0.7.2"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
dependencies = [
"serde",
]
@ -207,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f6ca6f0c18c02c2fbfc119df551b8aeb8a385f6d5980f1475ba0255f1e97f1e"
dependencies = [
"anyhow",
"arrayvec 0.7.2",
"arrayvec 0.7.4",
"itertools",
"log",
"nom",
@ -390,10 +390,11 @@ dependencies = [
[[package]]
name = "calloop"
version = "0.10.5"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192"
checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
dependencies = [
"bitflags",
"log",
"nix 0.25.1",
"slotmap",
@ -430,9 +431,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
[[package]]
name = "cfg-expr"
version = "0.15.1"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a"
dependencies = [
"smallvec",
"target-lexicon",
@ -704,22 +705,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.14"
version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"crossbeam-utils",
"memoffset 0.8.0",
"memoffset 0.9.0",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.15"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if 1.0.0",
]
@ -871,11 +872,11 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
name = "dlib"
version = "0.5.0"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
"libloading",
"libloading 0.8.0",
]
[[package]]
@ -1041,15 +1042,15 @@ dependencies = [
[[package]]
name = "exr"
version = "1.6.3"
version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4"
checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56"
dependencies = [
"bit_field",
"flume",
"half",
"lebe",
"miniz_oxide 0.6.2",
"miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
@ -1074,9 +1075,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
[[package]]
name = "fallible_collections"
version = "0.4.7"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d"
checksum = "618bf220e692a59c50e7b281149f53c3fe93e0cf0b40c050fc2af8c9ecb28505"
dependencies = [
"hashbrown 0.13.2",
]
@ -1133,7 +1134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"miniz_oxide 0.7.1",
"miniz_oxide",
]
[[package]]
@ -1247,9 +1248,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "form_urlencoded"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
@ -1444,9 +1445,9 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@ -1571,9 +1572,9 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.30.8"
version = "0.30.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62f9b771a65f0a1e3ddb6aa16f867d87dc73c922411c255e6c4ab7f6d45c7327"
checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f"
dependencies = [
"bitflags",
"cfg_aliases",
@ -1583,7 +1584,7 @@ dependencies = [
"glutin_egl_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
"libloading",
"libloading 0.7.4",
"objc2",
"once_cell",
"raw-window-handle 0.5.2",
@ -1867,9 +1868,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@ -1918,13 +1919,14 @@ dependencies = [
[[package]]
name = "indicatif"
version = "0.17.3"
version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
dependencies = [
"console",
"instant",
"number_prefix",
"portable-atomic 0.3.20",
"portable-atomic",
"unicode-width",
]
@ -2037,36 +2039,36 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.63"
version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "jxl-bitstream"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1c6b3f6f293055624e91577ecbfc816f7135dc16c868bab405e32fa4e05d86"
checksum = "76c3205d18cf6229b3f694de66e592886ff7afb0740bc0e85594e3b28d6f6622"
dependencies = [
"tracing",
]
[[package]]
name = "jxl-coding"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58c072032b4dec60c537d7b615868eee248af8ec7bd5436ac8b59a60d8d14a54"
checksum = "7075600c762c1ce9e2dd1fbc3fa8ded2af1401fe2221449eca943977742dd0b4"
dependencies = [
"jxl-bitstream",
]
[[package]]
name = "jxl-color"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50275156f286c2b87146768fd2fe4868aabc91ada09827f09a1f776ef0fa85fa"
checksum = "9084bc33b6d01e26b1db6c187514a51a57f4e3780335f3120ab55ee0b08f6e73"
dependencies = [
"jxl-bitstream",
"jxl-coding",
@ -2075,9 +2077,9 @@ dependencies = [
[[package]]
name = "jxl-frame"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9034f97e7b712d5d419a32d7241585fa340f1d98054e977578eb426ac9549a"
checksum = "e2c4e276ea56d8bc4961f13501d565cc6b665f0da76e0e5f90aa44a1475eb409"
dependencies = [
"jxl-bitstream",
"jxl-coding",
@ -2096,9 +2098,9 @@ checksum = "48800b21ed6bb3bbc2f818ae9cd40530bdfb1a211f57d5a7a49b8b10f62145e8"
[[package]]
name = "jxl-image"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7352bbc72930805d280cc3ce79c4f85a9d4eb83058391a6fbf4b5667ca4991e3"
checksum = "28d10c717baa0dd19c25b37b6baebb5f07d7efdaa6225a65aa98dcaf1d40a3e5"
dependencies = [
"jxl-bitstream",
"jxl-color",
@ -2108,9 +2110,9 @@ dependencies = [
[[package]]
name = "jxl-modular"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6107154c3322b465ee2b089a569fd97cd6b70dd6fe188737ec51eb2e2be5650"
checksum = "a4fea731da48d358a60d6185c58ac897f22895ea0e3380df04c106c87e192a7d"
dependencies = [
"jxl-bitstream",
"jxl-coding",
@ -2120,9 +2122,9 @@ dependencies = [
[[package]]
name = "jxl-oxide"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2105ac815e8059eaeb20a64db3f88a6dd2b977b31494684b03628688bdbe18ad"
checksum = "7d90d7ccb9a843e69563abdab2cd362702668f23e39e7fa3dcdf2594b1d29042"
dependencies = [
"jxl-bitstream",
"jxl-color",
@ -2135,9 +2137,9 @@ dependencies = [
[[package]]
name = "jxl-render"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a842ba0143d6a36576c72c1f3a84fc965b6f9a3ef35f86c191added3cb96f43"
checksum = "774684715db3b6e60a13059ad746829c9f9b39b7865ba0dc7ea9fd93469d9297"
dependencies = [
"jxl-bitstream",
"jxl-coding",
@ -2152,9 +2154,9 @@ dependencies = [
[[package]]
name = "jxl-vardct"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "135a1794b3832480fbb55def768e0c5eacb7597dec42148564baafcf4fc6d31b"
checksum = "1abaffccbc217e48cb45b9aca639c18a873b66200fc5a3695fb98333e0b1fead"
dependencies = [
"jxl-bitstream",
"jxl-coding",
@ -2184,7 +2186,7 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
dependencies = [
"arrayvec 0.7.2",
"arrayvec 0.7.4",
]
[[package]]
@ -2210,9 +2212,9 @@ dependencies = [
[[package]]
name = "libaom-sys"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1849531b9a2ea1c6bbfbb9ee7819619a905f9171ad8750e1ef80449cc4ae8e0b"
checksum = "610241493fe5178968c3d3b27b6c397dd873244ca17539bb488ade05690fcd71"
dependencies = [
"cmake",
]
@ -2250,9 +2252,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.144"
version = "0.2.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
[[package]]
name = "libdav1d-sys"
@ -2280,6 +2282,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "libloading"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
dependencies = [
"cfg-if 1.0.0",
"windows-sys 0.48.0",
]
[[package]]
name = "libm"
version = "0.2.7"
@ -2310,9 +2322,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "lock_api"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
@ -2333,12 +2345,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.17"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if 1.0.0",
]
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "lyon"
@ -2366,7 +2375,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad"
dependencies = [
"arrayvec 0.7.2",
"arrayvec 0.7.4",
"euclid",
"num-traits 0.2.15",
]
@ -2455,9 +2464,9 @@ dependencies = [
[[package]]
name = "memoffset"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
@ -2484,15 +2493,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
dependencies = [
"adler",
]
[[package]]
name = "miniz_oxide"
version = "0.7.1"
@ -2505,14 +2505,14 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.6"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -3118,7 +3118,7 @@ dependencies = [
[[package]]
name = "oculante"
version = "0.6.64"
version = "0.6.65"
dependencies = [
"anyhow",
"arboard",
@ -3168,9 +3168,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.17.1"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "option-ext"
@ -3199,9 +3199,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
version = "6.5.0"
version = "6.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
[[package]]
name = "owned_ttf_parser"
@ -3274,15 +3274,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.7"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall 0.2.16",
"redox_syscall 0.3.5",
"smallvec",
"windows-sys 0.45.0",
"windows-targets 0.48.0",
]
[[package]]
@ -3293,9 +3293,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "percent-encoding"
version = "2.2.0"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "phf"
@ -3441,15 +3441,15 @@ dependencies = [
[[package]]
name = "png"
version = "0.17.8"
version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
dependencies = [
"bitflags",
"crc32fast",
"fdeflate",
"flate2",
"miniz_oxide 0.7.1",
"miniz_oxide",
]
[[package]]
@ -3470,18 +3470,9 @@ dependencies = [
[[package]]
name = "portable-atomic"
version = "0.3.20"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e"
dependencies = [
"portable-atomic 1.3.2",
]
[[package]]
name = "portable-atomic"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5"
checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
[[package]]
name = "ppv-lite86"
@ -3531,9 +3522,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.59"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
dependencies = [
"unicode-ident",
]
@ -3640,7 +3631,7 @@ checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1"
dependencies = [
"arbitrary",
"arg_enum_proc_macro",
"arrayvec 0.7.2",
"arrayvec 0.7.4",
"av1-grain",
"bitstream-io",
"built",
@ -3750,9 +3741,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.8.3"
version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
dependencies = [
"aho-corasick",
"memchr",
@ -3932,9 +3923,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.37.19"
version = "0.37.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
dependencies = [
"bitflags",
"errno",
@ -3946,9 +3937,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.21.1"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e"
checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
dependencies = [
"log",
"ring",
@ -4014,9 +4005,9 @@ dependencies = [
[[package]]
name = "safe_arch"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f"
dependencies = [
"bytemuck",
]
@ -4072,9 +4063,9 @@ dependencies = [
[[package]]
name = "self_update"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca4e4e6f29fddb78b3e7a6e5a395e8274d4aca2d36b2278a297fa49673a5b7c7"
checksum = "a667e18055120bcc9a658d55d36f2f6bfc82e07968cc479ee7774e3bfb501e14"
dependencies = [
"hyper",
"indicatif",
@ -4099,18 +4090,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.163"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.163"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2",
"quote",
@ -4119,9 +4110,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.96"
version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
dependencies = [
"itoa",
"ryu",
@ -4422,15 +4413,16 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
[[package]]
name = "tempfile"
version = "3.5.0"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"fastrand",
"redox_syscall 0.3.5",
"rustix",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -4523,7 +4515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
"arrayvec 0.7.4",
"bytemuck",
"cfg-if 1.0.0",
"log",
@ -4569,9 +4561,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.28.1"
version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
@ -4585,9 +4577,9 @@ dependencies = [
[[package]]
name = "tokio-rustls"
version = "0.24.0"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls",
"tokio",
@ -4809,9 +4801,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
version = "2.3.1"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
"idna",
@ -4934,11 +4926,10 @@ dependencies = [
[[package]]
name = "want"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
dependencies = [
"log",
"try-lock",
]
@ -4956,9 +4947,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@ -4966,9 +4957,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
@ -4981,9 +4972,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.36"
version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@ -4993,9 +4984,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -5003,9 +4994,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
@ -5016,9 +5007,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wayland-client"
@ -5107,9 +5098,9 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.63"
version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -5159,12 +5150,12 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
[[package]]
name = "wide"
version = "0.7.9"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cd0496a71f3cc6bc4bf0ed91346426a5099e93d89807e663162dc5a1069ff65"
checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728"
dependencies = [
"bytemuck",
"safe_arch 0.6.0",
"safe_arch 0.7.0",
]
[[package]]
@ -5436,9 +5427,9 @@ dependencies = [
[[package]]
name = "winnow"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
dependencies = [
"memchr",
]
@ -5530,9 +5521,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
[[package]]
name = "xml-rs"
version = "0.8.13"
version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d8f380ae16a37b30e6a2cf67040608071384b1450c189e61bea3ff57cde922d"
checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
[[package]]
name = "xmlparser"

8
pkgs/applications/graphics/oculante/default.nix
View file

@ -21,13 +21,13 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.6.64";
version = "0.6.65";
src = fetchFromGitHub {
owner = "woelper";
repo = pname;
rev = version;
sha256 = "sha256-7Xe01Z4ea+EHaMHwb81cjJkCW/HDobmFZ29YxKcaYJg=";
hash = "sha256-99wA8BELw/FsiwGtWmbZedANjHamK1IHnl4wHwPAGIE=";
};
cargoLock = {
@ -60,6 +60,10 @@ rustPlatform.buildRustPackage rec {
darwin.libobjc
];
checkFlags = [
"--skip=bench"
];
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libxkbcommon libX11 ]}
'';

6
pkgs/applications/networking/cluster/glooctl/default.nix
View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "glooctl";
version = "1.14.7";
version = "1.14.8";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-nd7/B3GQzcnOn8rWQi8ZzxYa0CBFfacBFtctgpJYKLs=";
hash = "sha256-OnoOZw85RffGiAPiAM8WLg2TjW1REgirvfAjFYt8/yY=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
vendorHash = "sha256-hzfnxtOzSJ1K5UYFPbPJCwrw819KsXK5vTfOS2wdpxg=";
vendorHash = "sha256-2DKRF68dNkFgSeGqI68j2knnGVfVxo0UvGD7YvPwx4M=";
nativeBuildInputs = [ installShellFiles ];

5
pkgs/applications/networking/ids/suricata/default.nix
View file

@ -34,11 +34,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "6.0.12";
version = "6.0.13";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
sha256 = "sha256-BLIxYJNbAxl7CFwszJ2Ah1oz8RVYMFTRRgqw+2bYNLM=";
hash = "sha256-4J8vgA0ODNL5fyHFBZUMzD27nOXP6AjflWe22EmjEFU=";
};
nativeBuildInputs = [
@ -127,6 +127,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "stackprotector" ];
installFlags = [
"e_datadir=\${TMPDIR}"
"e_localstatedir=\${TMPDIR}"
"e_logdir=\${TMPDIR}"
"e_logcertsdir=\${TMPDIR}"

16
pkgs/applications/office/espanso/default.nix
View file

@ -105,10 +105,24 @@ rustPlatform.buildRustPackage rec {
xdotool
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace scripts/create_bundle.sh --replace target/mac/ $out/Applications/
patchShebangs scripts/create_bundle.sh
substituteInPlace espanso/src/res/macos/Info.plist \
--replace "<string>espanso</string>" "<string>${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso</string>"
substituteInPlace espanso/src/res/macos/com.federicoterzi.espanso.plist \
--replace "<string>/Applications/Espanso.app/Contents/MacOS/espanso</string>" "<string>${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso</string>" \
--replace "<string>/usr/bin" "<string>${placeholder "out"}/bin:/usr/bin"
substituteInPlace espanso/src/path/macos.rs espanso/src/path/linux.rs \
--replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"'
'';
# Some tests require networking
doCheck = false;
postInstall = ''
postInstall = if stdenv.isDarwin then ''
EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh
'' else ''
wrapProgram $out/bin/espanso \
--prefix PATH : ${lib.makeBinPath (
lib.optionals stdenv.isLinux [

4
pkgs/data/fonts/sarasa-gothic/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.41.0";
version = "0.41.2";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-3WcBuBTm3ASuCvLh+2R/idLKBjCTnk4qIRaOo590ugU=";
hash = "sha256-AkfjtXeZkwzXLu81hS43vYPEMKl3TV1TnQ4ryUSnblc=";
};
sourceRoot = ".";

61
pkgs/data/themes/catppuccin-kde/color.sh Executable file
View file

@ -0,0 +1,61 @@
echo $FLAVOUR $ACCENT $WINDECSTYLE
FLAVOURNAME=${FLAVOUR^}
ACCENTNAME=${ACCENT^}
WINDECSTYLENAME=${WINDECSTYLE^}
if [[ $FLAVOURNAME == "Mocha" ]]; then
FLAVOUR="1";
elif [[ $FLAVOURNAME == "Macchiato" ]]; then
FLAVOUR="2";
elif [[ $FLAVOURNAME == "Frappe" ]]; then
FLAVOUR="3";
elif [[ $FLAVOURNAME == "Latte" ]]; then
FLAVOUR="4";
fi
if [[ $FLAVOURNAME == "Mocha" ]]; then
FLAVOUR="1";
elif [[ $FLAVOURNAME == "Macchiato" ]]; then
FLAVOUR="2";
elif [[ $FLAVOURNAME == "Frappe" ]]; then
FLAVOUR="3";
elif [[ $FLAVOURNAME == "Latte" ]]; then
FLAVOUR="4";
fi
if [[ $ACCENTNAME == "Rosewater" ]]; then
ACCENT="1"
elif [[ $ACCENTNAME == "Flamingo" ]]; then
ACCENT="2"
elif [[ $ACCENTNAME == "Pink" ]]; then
ACCENT="3"
elif [[ $ACCENTNAME == "Mauve" ]]; then
ACCENT="4"
elif [[ $ACCENTNAME == "Red" ]]; then
ACCENT="5"
elif [[ $ACCENTNAME == "Maroon" ]]; then
ACCENT="6"
elif [[ $ACCENTNAME == "Peach" ]]; then
ACCENT="7"
elif [[ $ACCENTNAME == "Yellow" ]]; then
ACCENT="8"
elif [[ $ACCENTNAME == "Green" ]]; then
ACCENT="9"
elif [[ $ACCENTNAME == "Teal" ]]; then
ACCENT="10"
elif [[ $ACCENTNAME == "Sky" ]]; then
ACCENT="11"
elif [[ $ACCENTNAME == "Sapphire" ]]; then
ACCENT="12"
elif [[ $ACCENTNAME == "Blue" ]]; then
ACCENT="13"
elif [[ $ACCENTNAME == "Lavender" ]]; then
ACCENT="14"
fi
if [[ $WINDECSTYLENAME == "Modern" ]]; then
WINDECSTYLE=1
elif [[ $WINDECSTYLENAME == "Classic" ]]; then
WINDECSTYLE=2
fi

15
pkgs/data/themes/catppuccin-kde/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, fetchpatch
, flavour ? [ "frappe" ]
, accents ? [ "blue" ]
, winDecStyles ? [ "modern" ]
@ -11,7 +12,7 @@ let
validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ];
validWinDecStyles = [ "modern" "classic" ];
installScript = ./install.sh;
colorScript = ./color.sh;
in
lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}" validAccents accents
@ -29,14 +30,22 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-w77lzeSisx/PPxctMJKIdRJenq0s8HwR8gLmgNh4SH8=";
};
patches = [
(fetchpatch {
url = "https://github.com/michaelBelsanti/catppuccin-kde/commit/81a8edb3c24bd6af896c92b5051e09af97d69c51.patch";
hash = "sha256-cb4/dQ52T+H8UqXEgExblmnMfxwO0Y1BrjMCay/EAkI=";
})
];
installPhase = ''
runHook preInstall
patchShebangs .
for WINDECSTYLE in ${toString winDecStyles}; do
for FLAVOUR in ${toString flavour}; do
for ACCENT in ${toString accents}; do
FLAVOUR=$FLAVOUR ACCENT=$ACCENT WINDECSTYLE=$WINDECSTYLE bash ${installScript}
source ${colorScript}
./install.sh $FLAVOUR $ACCENT $WINDECSTYLE
done;
done;
done;

263
pkgs/data/themes/catppuccin-kde/install.sh
View file

@ -1,263 +0,0 @@
COLORDIR=$out/share/color-schemes
AURORAEDIR=$out/share/aurorae/themes
LOOKANDFEELDIR=$out/share/plasma/look-and-feel
DESKTOPTHEMEDIR=$out/share/plasma/desktoptheme
FLAVOUR=${FLAVOUR^}
ACCENT=${ACCENT^}
WINDECSTYLE=${WINDECSTYLE^}
echo "Creating theme directories.."
mkdir -p $COLORDIR
mkdir -p $AURORAEDIR
mkdir -p $LOOKANDFEELDIR
mkdir -p $DESKTOPTHEMEDIR
mkdir ./dist
# Sets accent based on the pallet selected (Best to fold this in your respective editor)
if [[ $ACCENT == "Rosewater" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#f5e0dc
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#f4dbd6
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#f2d5cf
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#dc8a78
fi
echo "Accent Rosewater(1) was selected!"
elif [[ $ACCENT == "Flamingo" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#f2cdcd
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#f0c6c6
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#eebebe
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#dd7878
fi
echo "Accent Flamingo(2) was selected!"
ACCENT="2"
elif [[ $ACCENT == "Pink" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#f5c2e7
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#f5bde6
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#f4b8e4
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#ea76cb
fi
echo "Accent Pink(3) was selected!"
elif [[ $ACCENT == "Mauve" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#cba6f7
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#c6a0f6
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#ca9ee6
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#8839ef
fi
echo "Accent Mauve(4) was selected!"
elif [[ $ACCENT == "Red" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#f38ba8
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#ed8796
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#e78284
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#d20f39
fi
echo "Accent Red(5) was selected!"
elif [[ $ACCENT == "Maroon" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#eba0ac
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#ee99a0
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#ea999c
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#e64553
fi
echo "Accent Maroon(6) was selected!"
elif [[ $ACCENT == "Peach" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#fab387
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#f5a97f
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#ef9f76
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#fe640b
fi
echo "Accent Peach(7) was selected!"
elif [[ $ACCENT == "Yellow" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#f9e2af
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#eed49f
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#e5c890
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#df8e1d
fi
echo "Accent Yellow(8) was selected!"
elif [[ $ACCENT == "Green" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#a6e3a1
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#a6da95
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#a6d189
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#40a02b
fi
echo "Accent Green(9) was selected!"
elif [[ $ACCENT == "Teal" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#94e2d5
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#8bd5ca
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#81c8be
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#179299
fi
echo "Accent Teal(10) was selected!"
elif [[ $ACCENT == "Sky" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#89dceb
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#91d7e3
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#99d1db
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#04a5e5
fi
echo "Accent Sky(11) was selected!"
elif [[ $ACCENT == "Sapphire" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#74c7ec
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#7dc4e4
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#85c1dc
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#209fb5
fi
echo "Accent Sapphire(12) was selected!"
elif [[ $ACCENT == "Blue" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#89b4fa
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#8aadf4
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#8caaee
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#1e66f5
fi
echo "Accent Blue(13) was selected!"
elif [[ $ACCENT == "Lavender" ]]; then
if [[ $FLAVOUR == "Mocha" ]]; then
ACCENTCOLOR=#b4befe
elif [[ $FLAVOUR == "Macchiato" ]]; then
ACCENTCOLOR=#b7bdf8
elif [[ $FLAVOUR == "Frappe" ]]; then
ACCENTCOLOR=#babbf1
elif [[ $FLAVOUR == "Latte" ]]; then
ACCENTCOLOR=#7287fd
fi
echo "Accent Lavender(14) was selected!"
else echo "Not a valid accent" && exit
fi
if [[ $WINDECSTYLE == "Modern" ]]; then
WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Modern
elif [[ $WINDECSTYLE == "Classic" ]]; then
WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Classic
fi
function ModifyLightlyPlasma {
rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/icons/*
rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/translucent
rm $DESKTOPTHEMEDIR/lightly-plasma-git/widgets/tabbar.svgz
rm $DESKTOPTHEMEDIR/lightly-plasma-git/dialogs/background.svgz
# Copy Patches
cp $DESKTOPTHEMEDIR/lightly-plasma-git/solid/* $DESKTOPTHEMEDIR/lightly-plasma-git -Rf
cp ./Patches/glowbar.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf
cp ./Patches/background.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf
cp ./Patches/panel-background.svgz $DESKTOPTHEMEDIR/lightly-plasma-git/widgets
# Modify description to state that it has been modified by the KDE Catppuccin Installer
sed -e s/A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./*MODIFIED\ BY\ CATPPUCCIN\ KDE\ INSTALLER*\ A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./g $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop >> $DESKTOPTHEMEDIR/lightly-plasma-git/newMetadata.desktop
cp -f $DESKTOPTHEMEDIR/metadata.desktop $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop && rm $DESKTOPTHEMEDIR/metadata.desktop
}
function AuroraeInstall {
if [[ $WINDECSTYLE == "Modern" ]]; then
cp ./Resources/aurorae/Catppuccin$FLAVOUR-Modern $AURORAEDIR -r;
elif [[ $WINDECSTYLE == "Classic" ]]; then
cp ./Resources/aurorae/Catppuccin$FLAVOUR-Classic $AURORAEDIR -r;
fi
}
function BuildColorscheme {
# Add Metadata & Replace Accent in colors file
sed -e s/--accentColor/$ACCENTCOLOR/g -e s/--flavour/$FLAVOUR/g -e s/--accentName/$ACCENT/g ./Resources/base.colors > ./dist/base.colors
# Hydrate Metadata with Pallet + Accent Info
sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g ./Resources/metadata.desktop > ./dist/Catppuccin-$FLAVOUR-$ACCENT/metadata.desktop
# Modify 'defaults' to set the correct Aurorae Theme
sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g -e s/--aurorae/$WINDECSTYLECODE/g ./Resources/defaults > ./dist/Catppuccin-$FLAVOUR-$ACCENT/contents/defaults
# Hydrate Dummy colors according to Pallet
FLAVOURNAME=$FLAVOUR ACCENTNAME=$ACCENT ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOUR$ACCENT.colors -s ./dist/base.colors
}
function BuildSplashScreen {
# Hydrate Dummy colors according to Pallet
FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/images/busywidget.svg -o ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
# Replace Accent in colors file
sed ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/$ACCENTCOLOR/g > ./dist/$GLOBALTHEMENAME/contents/splash/images/busywidget.svg
# Cleanup temporary file
rm ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
# Hydrate Dummy colors according to Pallet (QML file)
FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/Splash.qml -o ./dist/$GLOBALTHEMENAME/contents/splash/Splash.qml
# Add CTP Logo
# TODO: Switch between latte & mocha logo based on Pallet
cp ./Resources/splash/images/Logo.png ./dist/$GLOBALTHEMENAME/contents/splash/images
}
# Prepare Global Theme Folder
GLOBALTHEMENAME="Catppuccin-$FLAVOUR-$ACCENT"
cp -r ./Resources/Catppuccin-$FLAVOUR-Global ./dist/$GLOBALTHEMENAME
mkdir -p ./dist/$GLOBALTHEMENAME/contents/splash/images
# Build SplashScreen
echo "Building SplashScreen.."
BuildSplashScreen
# Build Colorscheme
echo "Building Colorscheme.."
# Generate Color scheme
BuildColorscheme
# Install Colorscheme
echo "Installing Colorscheme.."
mv ./dist/Catppuccin$FLAVOUR$ACCENT.colors $COLORDIR
# Install Global Theme.
echo "Installing Global Theme.."
cp -r ./dist/$GLOBALTHEMENAME $LOOKANDFEELDIR
# echo "Modifying lightly plasma theme.."
# ModifyLightlyPlasma
echo "Installing aurorae theme.."
AuroraeInstall
# Cleanup
echo "Cleaning up.."
rm -rf ./dist

9
pkgs/development/libraries/urdfdom/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig
, tinyxml, boost, urdfdom-headers, console-bridge }:
, urdfdom-headers, console-bridge, tinyxml }:
stdenv.mkDerivation rec {
pname = "urdfdom";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "ros";
repo = pname;
rev = version;
hash = "sha256-9MJnify4zcDBSZVJZCN/XupN5xax+U4PLee54gVVw3Q=";
hash = "sha256-UdkGJAXK3Q8QJaqMZBA5/FKUgWq9EVeqkqwVewTlTD8=";
};
patches = [
@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkg-config validatePkgConfig ];
buildInputs = [ tinyxml boost ];
propagatedBuildInputs = [ urdfdom-headers console-bridge ];
propagatedBuildInputs = [ urdfdom-headers console-bridge tinyxml ];
meta = with lib; {
description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file";

4
pkgs/development/python-modules/annoy/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "annoy";
version = "1.17.2";
version = "1.17.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5nv7uDfRMG2kVVyIOGDHshXLMqhk5AAiKS1YR60foLs=";
hash = "sha256-nL/r7+Cl+EPropxr5MhNYB9PQa1N7QSG8biMOwdznBU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/cssutils/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cssutils";
version = "2.7.0";
version = "2.7.1";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-s2GDbkw5z5TwUjUVIecGAWzJ04ACapUTp0AA263LOAQ=";
hash = "sha256-NA7P2YNdId+PmFAPDfzqCu5By04Z7Lws+U8KbTbXy2w=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/django-cleanup/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "django-cleanup";
version = "7.0.0";
version = "8.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-KKlp+InGYeug2UOJeGk5gPCUgsl5g70I7lKVXa6NceQ=";
hash = "sha256-xzmgVUTh5I3ISIcchw2/FZX4Uz0kUjvGc2DkNWLtrw0=";
};
nativeCheckInputs = [

10
pkgs/development/python-modules/nvchecker/default.nix
View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "nvchecker";
version = "2.11";
version = "2.12";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
hash = "sha256-b/EGn26gTpnYuy2h6shnJI1dRwhl41eKJHzDJoFG1YI=";
hash = "sha256-6mhVDC2jpIIOZeoKz4AxxU7jj8dqPVBKRWupbuY/T7E=";
};
nativeBuildInputs = [
@ -44,8 +44,9 @@ buildPythonPackage rec {
pycurl
setuptools
structlog
tomli
tornado
] ++ lib.optionals (pythonOlder "3.11") [
tomli
];
nativeCheckInputs = [
@ -73,8 +74,9 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "https://github.com/lilydjwg/nvchecker";
description = "New version checker for software";
homepage = "https://github.com/lilydjwg/nvchecker";
changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};

9
pkgs/development/python-modules/pypoolstation/default.nix
View file

@ -3,21 +3,21 @@
, backoff
, buildPythonPackage
, fetchPypi
, importlib-metadata
, poetry-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pypoolstation";
version = "0.4.9";
version = "0.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "PyPoolstation";
inherit version;
hash = "sha256-2smgsR5f2fzmutr4EjhyrFWrO9odTba0ux+0B6k3+9Y=";
inherit pname version;
hash = "sha256-ID3K6dzD8HSi8UYosK+CiOtdyHUyeHQXbmlL9cnrmn8=";
};
nativeBuildInputs = [
@ -27,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
backoff
importlib-metadata
];
# Project has no tests

4
pkgs/development/python-modules/ev3dev2/default.nix → pkgs/development/python-modules/python-ev3dev2/default.nix
View file

@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
pname = "ev3dev2";
pname = "python-ev3dev2";
version = "2.1.0";
src = fetchFromGitHub {
@ -18,7 +18,7 @@ buildPythonPackage rec {
};
postPatch = ''
echo "${version}\n" > RELEASE-VERSION
echo "${version}" > RELEASE-VERSION
'';
propagatedBuildInputs = [ pillow ];

11
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.25.2";
version = "0.26.0";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = version;
sha256 = "sha256-EJb9IVQClZwJrIorJ6FM6gDV5oSeXiwbwG9l6+4fMQ8=";
sha256 = "sha256-xFoqg8Ci60ZW0cUtSJSIIpO9HK+89nSHQhw1YvKy6MI=";
};
nativeBuildInputs = [
@ -17,14 +17,15 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl Security ];
cargoHash = "sha256-WnvMLi0GeeLsmHDxH0tGAQfX//x9GD2cd/m7Tp/GLGA=";
#checkFlags = [ "--test-threads" "1" ];
cargoHash = "sha256-YLROFEkTEhl6v6AidoEAyTtzDnJEBP6V30gVbxVjKvY=";
doCheck = false;
meta = with lib; {
description = "A code coverage tool for Rust projects";
homepage = "https://github.com/xd009642/tarpaulin";
changelog = "https://github.com/xd009642/tarpaulin/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ hugoreeves ];
maintainers = with maintainers; [ figsoda hugoreeves ];
};
}

6
pkgs/development/tools/conftest/default.nix
View file

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.42.1";
version = "0.43.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "refs/tags/v${version}";
hash = "sha256-G17ehJlWLiFgH7g4KBzr/MJfP27/F2ESPOEMsHdVh7s=";
hash = "sha256-5eMl6dvEW5CCSIgz/o3T7iwk1EuKMuGMifX8ECHf9Oc=";
};
vendorHash = "sha256-v+OElsOgA5yzs9zOEntpCHIzekmANWTyYjIbsfjzkwo=";
vendorHash = "sha256-pP9Rv23ra3Cv5ZzL8E4/B/T2FQd2vRqIjKmWrINwUjc=";
ldflags = [
"-s"

6
pkgs/development/tools/konstraint/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "konstraint";
version = "0.29.0";
version = "0.29.1";
src = fetchFromGitHub {
owner = "plexsystems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j1pvTA3XrmQTgnyyrTAOmcgIJPBcj54YGCPqBjzNIog=";
sha256 = "sha256-2MPCbR834wIZhIMbizuB5Twt5364BwkBjSnLEylmcA0=";
};
vendorHash = "sha256-75XFFJtVhVLpZaPDQghlqols54ZuXzpzUx1dw4vSlRg=";
vendorHash = "sha256-DlB4PsWTjOuiJ7ZJB2LC8O9RkjqIcppTg/enD5degxw=";
# Exclude go within .github folder
excludedPackages = ".github";

6
pkgs/development/tools/misc/typical/default.nix
View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "typical";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = "typical";
rev = "v${version}";
hash = "sha256-4OByyczbHucav9v9pXqWYyreG+F36G0IodcDTedJxic=";
hash = "sha256-pXLOtCzdI6KspNzg1R7Zc97Dd7dX7ZzxvlvKprkLF2I=";
};
cargoHash = "sha256-BtnPCMBPVUGL+6ufhE2TF+dnHCeC/12DMHBaTPlYqBg=";
cargoHash = "sha256-ckW2Hc5BRqtvzZRUAlf7Vy06cgSTY6nv2ompSDNzpi4=";
nativeBuildInputs = [
installShellFiles

6
pkgs/development/tools/rust/cargo-public-api/default.nix
View file

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.31.1";
version = "0.31.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-w8K1dmTjnHm5bh1Ztn5DnBm2PEddxYLewWPiEnqbjCo=";
hash = "sha256-LSCFJrZuQoUk8DqfQayfwPVTIU00SxHrelx7NItqqWM=";
};
cargoHash = "sha256-1SlGKnpwc8rN9w/d07nHVT3L4erA6/TWaza5qy57hlE=";
cargoHash = "sha256-aFY5FSXquN1h28CBluuP/tNDmjFfi2dNjAdoXR3CH4Y=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/rust/rust-script/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-script";
version = "0.28.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "fornwall";
repo = pname;
rev = version;
sha256 = "sha256-BQ/jgS7tq4upVe78N3rxNIQPq/4RHtt66wBnltcU/iY=";
sha256 = "sha256-c55MiXpMnOsMUI5Bg6k8Ta9iT3G+ixzfMbj9T17OKAY=";
};
cargoSha256 = "sha256-bU/LKvixAu6GQ93FT8csQFFnfHDhFltWHXfG/Pmchfw=";
cargoSha256 = "sha256-yuwerF4gICPSpwopB4iMheXC7SMtX7IgSEgRwJ/gJdg=";
# tests require network access
doCheck = false;

4
pkgs/misc/scrcpy/default.nix
View file

@ -10,7 +10,7 @@
, runtimeShell
, installShellFiles
, platform-tools
, android-tools
, ffmpeg
, libusb1
, SDL2
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
# runtime dep on `adb` to push the server
wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin"
wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace $out/share/applications/scrcpy-console.desktop \
--replace "/bin/bash" "${runtimeShell}"

4
pkgs/os-specific/linux/android-udev-rules/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "android-udev-rules";
version = "20230303";
version = "20230614";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
sha256 = "sha256-ddalOVt0gLuTcwk322fNNn6WNZx1Ubsa4MgaG0Lmn2k=";
sha256 = "sha256-TLQHZYcnO7VzIHH+aCj78plTwK5RrcsU/OfNXApAvdM=";
};
installPhase = ''

8
pkgs/servers/monitoring/phlare/default.nix
View file

@ -2,23 +2,23 @@
buildGoModule rec {
pname = "phlare";
version = "0.5.1";
version = "0.6.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "phlare";
sha256 = "sha256-q7y3sZMI1Kk7Ar0ER8RoU1Y7xAhFh89y/mzESjLrxcM=";
sha256 = "sha256-iaNwOV8XP6H8DDs2HcOIIl8sNM6Xi5VsRxSb80mvvLo=";
};
proxyVendor = true;
vendorHash = "sha256-Oz1qV+3sB0pOWGEMtp7mgMR9Ljd0rd9oa6NJO2azTJg=";
vendorHash = "sha256-y8IWS5OQkDYRTt5xOzzbjb1ya6AiFtvAc0YNH99KZBA=";
ldflags = let
prefix = "github.com/grafana/phlare/pkg/util/build";
in [
"-s" "-w"
# https://github.com/grafana/phlare/blob/v0.5.1/Makefile#L32
# https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
"-X ${prefix}.Version=${version}"
"-X ${prefix}.Branch=v${version}"
"-X ${prefix}.Revision=v${version}"

8
pkgs/tools/audio/vgmtools/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "vgmtools";
version = "unstable-2023-04-17";
version = "unstable-2023-05-04";
src = fetchFromGitHub {
owner = "vgmrips";
repo = "vgmtools";
rev = "894fb43d584e31efe0c7070ba9b6b85938012745";
sha256 = "BGL7Lm6U1QdYZgEnn9tGgY+z8Fhjj+Sd2Cesn1sxWhY=";
rev = "0a7814304b9664ff1cf167e209ff354d222773a4";
hash = "sha256-YEOuT5RN0zFT7rU4KfxYS0Ec+rUL3Flsgx9IrELnhGg=";
};
nativeBuildInputs = [
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
# Some targets are not enabled by default
makeFlags = [
"all" "opt_oki" "optdac" "optvgm32"
"all" "optdac" "optvgm32"
];
passthru.updateScript = unstableGitUpdater {

4
pkgs/tools/misc/snapper/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "snapper";
version = "0.10.4";
version = "0.10.5";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
sha256 = "sha256-Eq9b49zEIb3wMHUw9/jpfYDaMXBY5JHZ2u5RTTtD5I8=";
sha256 = "sha256-PJ1KfZZdo+wyeK1NyEg6SSqs/dxqNdiZ4z/BKuVFwSc=";
};
nativeBuildInputs = [

4
pkgs/tools/networking/i2p/default.nix
View file

@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "i2p";
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
urls = map (mirror: "${mirror}/${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://files.i2p-projekt.de"
"https://download.i2p2.no/releases"
];
sha256 = "sha256-5LoGpuKTWheZDwV6crjXnkUqJVamzv5QEtXdY0Zv7r8=";
sha256 = "sha256-9T80++I6h2LjeGVydRswG++ygojvtrEELU/GTGYQeE8=";
};
buildInputs = [ jdk ant gettext which ];

4
pkgs/tools/package-management/microdnf/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microdnf";
version = "3.9.1";
version = "3.10.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "sha256-/6yMHjB9HNEEQuAc8zEvmjjl6wur0jByS1hLz39+rHI=";
sha256 = "sha256-R7jOeH6pw/THLXxLezp2AmE8lUBagKMRJ0XfXgdLi2E=";
};
nativeBuildInputs = [ pkg-config cmake gettext help2man ];

4
pkgs/tools/text/gtree/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gtree";
version = "1.7.48";
version = "1.7.50";
src = fetchFromGitHub {
owner = "ddddddO";
repo = "gtree";
rev = "v${version}";
hash = "sha256-vC7Mcq0EFsYqjKM95XfzS2lSFyr9zhAgmxMPGR/7DFM=";
hash = "sha256-o71LuV94o0ZmxPILH9ZcZQ5ZLxrzZwWjz3YYRap2lnM=";
};
vendorHash = "sha256-YrqJljKoYpsgVW4PPNYGMUB5uDQF0YTt9s7KxjQHkTw=";

7
pkgs/tools/typesetting/tex/texlive/combine.nix
View file

@ -17,6 +17,12 @@ let
pkgList = rec {
combined = combinePkgs (lib.attrValues pkgSet);
all = lib.filter pkgFilter combined;
licenses = let
concatLicenses = lib.foldl (acc: el: if builtins.elem el acc then acc else acc ++ [ el ]);
in lib.foldl
(acc: pkg:
concatLicenses acc (lib.toList (pkg.meta.license or [])))
[] all;
splitBin = builtins.partition (p: p.tlType == "bin") all;
bin = splitBin.right
++ lib.optional
@ -84,6 +90,7 @@ let
in (buildEnv {
inherit name;
meta.license = pkgList.licenses;
ignoreCollisions = false;

8
pkgs/tools/typesetting/tex/texlive/default.nix
View file

@ -44,6 +44,11 @@ let
deps = (orig.xdvi.deps or []) ++ [ "metafont" ];
};
arabi-add = orig.arabi-add // {
# tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README
license = [ "lppl13c" ];
};
# remove dependency-heavy packages from the basic collections
collection-basic = orig.collection-basic // {
deps = lib.filter (n: n != "metafont" && n != "xdvi") orig.collection-basic.deps;
@ -179,6 +184,9 @@ let
in runCommand "texlive-${tlName}"
( {
src = fetchurl { inherit urls sha512; };
meta = {
license = map (x: lib.licenses.${x}) (args.license or []);
};
inherit stripPrefix tlType;
# metadata for texlive.combine
passthru = {

27
pkgs/tools/typesetting/tex/texlive/tl2nix.sed
View file

@ -36,6 +36,33 @@ $a}
/^catalogue-version/s/[\#,:\(\)]//g
s/^catalogue-version_(.*)/ version = "\1";/p
/^catalogue-license/{
# wrap licenses in quotes
s/ ([^ ]+)/ "\1"/g
# adjust naming as in nixpkgs, the full texts of the licenses are available at https://www.ctan.org/license/${licenseName}
s/"(cc-by(-sa)?-[1-4])"/"\10"/g
s/"apache2"/"asl20"/g
s/"artistic"/"artistic1-cl8"/g
s/"bsd"/"bsd3"/g # license text does not match exactly, but is pretty close
s/"bsd4"/"bsdOriginal"/g
s/"collection"/"free"/g # used for collections of individual packages with distinct licenses. As TeXlive only contains free software, we can use "free" as a catchall
s/"fdl"/"fdl13Only"/g
s/"gpl1?"/"gpl1Only"/g
s/"gpl2\+"/"gpl2Plus"/g
s/"gpl3\+"/"gpl3Plus"/g
s/"lgpl"/"lgpl2"/g
s/"lgpl2\.1"/"lgpl21"/g
s/"lppl"/"lppl13c"/g # not used consistently, sometimes "lppl" refers to an older version of the license
s/"lppl1\.2"/"lppl12"/g
s/"lppl1\.3"/"lppl13c"/g # If a work refers to LPPL 1.3 as its license, this is interpreted as the latest version of the 1.3 license (https://www.latex-project.org/lppl/)
s/"lppl1\.3a"/"lppl13a"/g
s/"lppl1\.3c"/"lppl13c"/g
s/"other-free"/"free"/g
s/"pd"/"publicDomain"/g
s/^catalogue-license (.*)/ license = [ \1 ];/p
}
# extract deps
/^depend ([^.]+|texlive\.infra)$/{
# open a list

4144
pkgs/tools/typesetting/tex/texlive/tlpdb.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/top-level/all-packages.nix
View file

@ -12296,9 +12296,7 @@ with pkgs;
inherit (darwin.apple_sdk.libs) utmp;
};
scrcpy = callPackage ../misc/scrcpy {
inherit (androidenv.androidPkgs_9_0) platform-tools;
};
scrcpy = callPackage ../misc/scrcpy { };
screen-message = callPackage ../tools/X11/screen-message { };

1
pkgs/top-level/python-aliases.nix
View file

@ -100,6 +100,7 @@ mapAliases ({
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
EasyProcess = easyprocess; # added 2023-02-19
email_validator = email-validator; # added 2022-06-22
ev3dev2 = python-ev3dev2; # added 2023-06-19
Fabric = fabric; # addedd 2023-02-19
face_recognition = face-recognition; # added 2022-10-15
face_recognition_models = face-recognition-models; # added 2022-10-15

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

@ -3354,8 +3354,6 @@ self: super: with self; {
evaluate = callPackage ../development/python-modules/evaluate { };
ev3dev2 = callPackage ../development/python-modules/ev3dev2 { };
evdev = callPackage ../development/python-modules/evdev { };
eve = callPackage ../development/python-modules/eve { };
@ -9856,6 +9854,8 @@ self: super: with self; {
python-ethtool = callPackage ../development/python-modules/python-ethtool { };
python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { };
python_fedora = callPackage ../development/python-modules/python_fedora { };
python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };