gador/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]
2024-03-02 18:01:30 +00:00
committed by GitHub
parent df3358c5d2 81198fd201
commit b77ab6c0c7
59 changed files with 1765 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
-6
View File
@@ -6413,12 +6413,6 @@
githubId = 1952914;
name = "Maxence Maireaux";
};
flexagoon = {
email = "flexagoon@pm.me";
github = "flexagoon";
githubId = 66178592;
name = "Pavel Zolotarevskiy";
};
flexiondotorg = {
name = "Martin Wimpress";
email = "martin@wimpress.org";
nixos/modules/i18n/input-method/fcitx5.nix
+2 -1
View File
@@ -32,7 +32,8 @@ in
};
plasma6Support = mkOption {
type = types.bool;
default = false;
default = config.services.xserver.desktopManager.plasma6.enable;
defaultText = literalExpression "config.services.xserver.desktopManager.plasma6.enable";
description = lib.mdDoc ''
Use qt6 versions of fcitx5 packages.
Required for configuring fcitx5 in KDE System Settings.
nixos/modules/programs/kdeconnect.nix
+4 -1
View File
@@ -20,7 +20,10 @@ with lib;
cfg = config.programs.kdeconnect;
in
mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [
cfg.package
pkgs.sshfs
];
networking.firewall = rec {
allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
allowedUDPPortRanges = allowedTCPPortRanges;
nixos/modules/services/x11/desktop-managers/plasma6.nix
+14
View File
@@ -10,6 +10,11 @@
inherit (pkgs) kdePackages;
inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types;
activationScript = ''
# will be rebuilt automatically
rm -fv $HOME/.cache/ksycoca*
'';
in {
options = {
services.xserver.desktopManager.plasma6 = {
@@ -273,5 +278,14 @@ in {
};
programs.kdeconnect.package = kdePackages.kdeconnect-kde;
# FIXME: ugly hack. See #292632 for details.
system.userActivationScripts.rebuildSycoca = activationScript;
systemd.user.services.nixos-rebuild-sycoca = {
description = "Rebuild KDE system configuration cache";
wantedBy = [ "graphical-session-pre.target" ];
serviceConfig.Type = "oneshot";
script = activationScript;
};
};
}
nixos/modules/tasks/filesystems.nix
+1 -1
View File
@@ -105,7 +105,7 @@ let
type = types.bool;
description = lib.mdDoc ''
If the device does not currently contain a filesystem (as
determined by {command}`blkid`, then automatically
determined by {command}`blkid`), then automatically
format it with the filesystem type specified in
{option}`fsType`. Use with caution.
'';
nixos/modules/virtualisation/incus.nix
+7
View File
@@ -107,6 +107,13 @@ in
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = !(config.networking.firewall.enable && !config.networking.nftables.enable && config.virtualisation.incus.enable);
message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`";
}
];
# https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md
boot.kernel.sysctl = {
"fs.aio-max-nr" = lib.mkDefault 524288;
pkgs/applications/editors/vim/plugins/generated.nix
+317 -316
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+134 -123
View File
@@ -27,12 +27,12 @@
};
angular = buildGrammar {
language = "angular";
version = "0.0.0+rev=3946b10";
version = "0.0.0+rev=6d02054";
src = fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "3946b1040b98a12458beef2763ce4780a523e3c6";
hash = "sha256-z49hTi6fG/00nb23rScIQScGTFm+NS+CL5+9d8mOCFI=";
rev = "6d02054ae9aa1fedf5097fe6d93dd78f751dff21";
hash = "sha256-Bm3I9a14WMNqL+nt5qr8Bd0Z4BOTCCF25wFrJ07FCSw=";
};
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
};
@@ -50,12 +50,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=a282270";
version = "0.0.0+rev=7722d43";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "a282270857b7be447b8be91411468349a31d73b7";
hash = "sha256-NAE/E3glGz509nOKO5xsJIwe1Q2OSh6Aj5krUOVhqvw=";
rev = "7722d4398d87ea22c4877264f88b45bd7ce0cba5";
hash = "sha256-pNiJY+KJ8QrL7xXOX/NRIFxIbXmf9DkVC9FUvXlk5qQ=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@@ -72,12 +72,12 @@
};
astro = buildGrammar {
language = "astro";
version = "0.0.0+rev=e924787";
version = "0.0.0+rev=dfa0893";
src = fetchFromGitHub {
owner = "virchau13";
repo = "tree-sitter-astro";
rev = "e924787e12e8a03194f36a113290ac11d6dc10f3";
hash = "sha256-FNnkti4Ypw4RGIrIL9GtgjlYFMmOWZ2f8uQg/h3xesA=";
rev = "dfa0893bdc4bdfada102043404758c66e3580568";
hash = "sha256-gToRdyLvvDaeE1b9fYRVPFt1mtdR9kSYzqFBDUYpv3k=";
};
meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
};
@@ -127,12 +127,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=dd6f4ec";
version = "0.0.0+rev=1f19abf";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "dd6f4ec9b01dd18cc4aa8c8517738414fb98cd63";
hash = "sha256-HG2L0PeYJm+U0ZUra5iRH9gm41sn44tiaS91vURHe2o=";
rev = "1f19abf1e162e1828013cb5434c6cf30f4054e80";
hash = "sha256-yb6z5iLMoK1wWCS9laA1muRVLssFwnyAg4SKWVsti0s=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@@ -226,12 +226,12 @@
};
chatito = buildGrammar {
language = "chatito";
version = "0.0.0+rev=7162ec1";
version = "0.0.0+rev=fe7a2a7";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "7162ec1e8e9154fb334e84aa7637a4af051dfe42";
hash = "sha256-phvENW6wEqhKQakeXxsTclhSmFWFgfK9ztCszOGuaYY=";
rev = "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370";
hash = "sha256-4ianrWSctAIufc/8I1pxWvoij1nG7mcRemQs0fj1Qt8=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
@@ -281,12 +281,12 @@
};
cooklang = buildGrammar {
language = "cooklang";
version = "0.0.0+rev=5e11341";
version = "0.0.0+rev=81c2a86";
src = fetchFromGitHub {
owner = "addcninblue";
repo = "tree-sitter-cooklang";
rev = "5e113412aadb78955c27010daa4dbe1d202013cf";
hash = "sha256-Ny55gdN+3o7bFJEnXvctstl6gjqkwrp1uE33OobyH7U=";
rev = "81c2a8667846b1e60db68b5601d864fe00fd1d3a";
hash = "sha256-zlffOW/ZJxpn3T2CMkrznkLLtuqxp7gIxVHEItvMepY=";
};
meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
};
@@ -469,12 +469,12 @@
};
dtd = buildGrammar {
language = "dtd";
version = "0.0.0+rev=52b3783";
version = "0.0.0+rev=c23bd31";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a";
hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g=";
rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709";
hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4=";
};
location = "dtd";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -614,12 +614,12 @@
};
fidl = buildGrammar {
language = "fidl";
version = "0.0.0+rev=bdbb635";
version = "0.0.0+rev=0a8910f";
src = fetchFromGitHub {
owner = "google";
repo = "tree-sitter-fidl";
rev = "bdbb635a7f5035e424f6173f2f11b9cd79703f8d";
hash = "sha256-+s9AC7kAfPumREnc7xCSsYiaDwLp3uirLntwd2wK6Wo=";
rev = "0a8910f293268e27ff554357c229ba172b0eaed2";
hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY=";
};
meta.homepage = "https://github.com/google/tree-sitter-fidl";
};
@@ -722,6 +722,17 @@
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
gdshader = buildGrammar {
language = "gdshader";
version = "0.0.0+rev=ffd9f95";
src = fetchFromGitHub {
owner = "GodOfAvacyn";
repo = "tree-sitter-gdshader";
rev = "ffd9f958df13cae04593781d7d2562295a872455";
hash = "sha256-JWlDs0w10TqsPYgZvvaJwAueOciCYaws1Nr8rb0UKy4=";
};
meta.homepage = "https://github.com/GodOfAvacyn/tree-sitter-gdshader";
};
git_config = buildGrammar {
language = "git_config";
version = "0.0.0+rev=9c2a1b7";
@@ -746,23 +757,23 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
version = "0.0.0+rev=0750b59";
version = "0.0.0+rev=41940e1";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "0750b5904f37d6b2f47f6e4655001c2c35a172ec";
hash = "sha256-BXsF++uut1WWxe67E+CUh3e6VWrezNJaPfYJhXB0VlY=";
rev = "41940e199ba5763abea1d21b4f717014b45f01ea";
hash = "sha256-h9RPFI40C4LxjjKZEKkVCnUjNkh6Tgl74msSTpju7ZY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "0.0.0+rev=7c01af8";
version = "0.0.0+rev=6bd8196";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "7c01af8d227b5344f62aade2ff00f19bd0c458ca";
hash = "sha256-2/SttSCDdTwXbhfYsiNOlVbf1V4nxd+3dxaaaTH0VQU=";
rev = "6bd81962d1abe309bf5dffde3315e4a5988f35fd";
hash = "sha256-aSgnTbhpekeDDUzz9hecebW5ejCnmLiE5d1fTTxP19g=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@@ -889,12 +900,12 @@
};
gpg = buildGrammar {
language = "gpg";
version = "0.0.0+rev=e8a95ae";
version = "0.0.0+rev=d4c9cc0";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gpg-config";
rev = "e8a95ae3deed7d7637c33f635fc5b9fc9dbb3216";
hash = "sha256-9spuIVyffwp2R0iFdC0VQ4EYmHQF7/Qvt+RzldonlK8=";
rev = "d4c9cc0060cd4d1b8ca6d7add9f34352ad310a09";
hash = "sha256-kV9GN0qdVNA7LFYoCM/ISEW4Mpd5v9+oHV83XgEJTRs=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config";
};
@@ -911,12 +922,12 @@
};
groovy = buildGrammar {
language = "groovy";
version = "0.0.0+rev=235009a";
version = "0.0.0+rev=3c25d1c";
src = fetchFromGitHub {
owner = "murtaza64";
repo = "tree-sitter-groovy";
rev = "235009aad0f580211fc12014bb0846c3910130c1";
hash = "sha256-Grp1ziaPyMNxoPbsJSiDCiKPXCtWJ/EC/d0OX/jqHF0=";
rev = "3c25d1ce6c1eb9da34215060372792dc9f439b0c";
hash = "sha256-VWIURpQoofmva6GWnOzq8niYklp5yOHH5ZuE8oDpzfs=";
};
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
};
@@ -955,12 +966,12 @@
};
haskell = buildGrammar {
language = "haskell";
version = "0.0.0+rev=8a99848";
version = "0.0.0+rev=6b5ec20";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "8a99848fc734f9c4ea523b3f2a07df133cbbcec2";
hash = "sha256-QIGLxc2BPGqglvpInjmmP/9gUoPEX21WrxsoGOKP03o=";
rev = "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a";
hash = "sha256-TFI524Pb5RhoPLHJ0ucSKJcWJDmIX6PJELSHRd2ic7Q=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
};
@@ -1010,12 +1021,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=f820ee8";
version = "0.0.0+rev=ee24be1";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "f820ee8417451f69020791cf691904ec1b63f20d";
hash = "sha256-d80vNrZGaPWlST5tgvf25CliuzS+zSZ60f49cRuucZ4=";
rev = "ee24be127560f0de0c4741e382416f45ab47eb76";
hash = "sha256-FMmJpyburjO/NKq14bQ9LbvxuiYdjBt5/Gfm/jeye0U=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@@ -1098,12 +1109,12 @@
};
hyprlang = buildGrammar {
language = "hyprlang";
version = "0.0.0+rev=8602513";
version = "0.0.0+rev=fc1d331";
src = fetchFromGitHub {
owner = "luckasRanarison";
repo = "tree-sitter-hyprlang";
rev = "86025136c12cd1058985479a6b1935829077f1af";
hash = "sha256-1HGA4VUWM/iR1XBNmrsdj1PRGo7qPYMw5vmcVQO1BH0=";
rev = "fc1d331586e4da2b5f5bcfa89d630ebafe66458b";
hash = "sha256-powQTRaYmGGEdkmt59kLfdbLZRkRFbGra6PRnno0AUo=";
};
meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang";
};
@@ -1153,12 +1164,12 @@
};
javascript = buildGrammar {
language = "javascript";
version = "0.0.0+rev=9802cc5";
version = "0.0.0+rev=51aed72";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "9802cc5812a19cd28168076af36e88b463dd3a18";
hash = "sha256-vCvpHDbO9/J/qyoSZmpmGQDVf9LweNsf3mKm6eEwdKc=";
rev = "51aed7263d33bee46b0a8a5e165ffcb690d5aca8";
hash = "sha256-FDnVwYpPgenOTgWaX/VdmtUmmIbCm/TtkiQ3TFoQjYY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@@ -1474,12 +1485,12 @@
};
mermaid = buildGrammar {
language = "mermaid";
version = "0.0.0+rev=e26a5f8";
version = "0.0.0+rev=e8dac87";
src = fetchFromGitHub {
owner = "monaqa";
repo = "tree-sitter-mermaid";
rev = "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3";
hash = "sha256-qDJy2kPpx3wPl8IuhPM5ynhI2DjgutSFWAg5EQY5F+8=";
rev = "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98";
hash = "sha256-1FCc8goKhFtgxSPeAzFkQhpbpruhZ+GD8VaLRJpnyS4=";
};
meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid";
};
@@ -1530,23 +1541,23 @@
};
nickel = buildGrammar {
language = "nickel";
version = "0.0.0+rev=19fb551";
version = "0.0.0+rev=33a64ec";
src = fetchFromGitHub {
owner = "nickel-lang";
repo = "tree-sitter-nickel";
rev = "19fb551196d18b75160631f5e3a8a006b3875276";
hash = "sha256-NXyagRPUT3h8G6R+eE4YrTnWtfB3AT/piXeun5ETU6s=";
rev = "33a64ec9a27058c52e4195f1030235dcdfc04747";
hash = "sha256-gTOePRg5ZEXfBL35biG6abpxW2eycgbHIzaL6w4g8rc=";
};
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
};
nim = buildGrammar {
language = "nim";
version = "0.0.0+rev=c5f0ce3";
version = "0.0.0+rev=f5cec6a";
src = fetchFromGitHub {
owner = "alaviss";
repo = "tree-sitter-nim";
rev = "c5f0ce3b65222f5dbb1a12f9fe894524881ad590";
hash = "sha256-KzAZf5vgrdp33esrgle71i0m52MvRJ3z/sMwzb+CueU=";
rev = "f5cec6a841b585e4e7388a120ded07e60ae19c43";
hash = "sha256-CL041Tjw7CH9EnpjAVl4f66zyOADfG9qwkFxeUjXH0w=";
};
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
};
@@ -1709,46 +1720,46 @@
};
pem = buildGrammar {
language = "pem";
version = "0.0.0+rev=db307bb";
version = "0.0.0+rev=217ff2a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-pem";
rev = "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0";
hash = "sha256-uBZo16QtZtbYc4jHdFt1w/zMx9F+WKBB+ANre8IURHA=";
rev = "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a";
hash = "sha256-KGJ9ulGi3gKUJxNXil5Zai4v5/5ImUSMVP3/19ra3A0=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem";
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=fd8b951";
version = "0.0.0+rev=6526e5d";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "fd8b951cf6f72d48dfd07679de8cf0260836b231";
hash = "sha256-ejbpska3Ar0cjqDGZXXjRkpDLNsnDUJD0TBsb2cZfY4=";
rev = "6526e5d5bf31501de0dc51c42ac3583078a8fdab";
hash = "sha256-jqLYYHpcwt2ctcz6zbgyhG6p3yRLHvr9TlUMky2cfaM=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=710754c";
version = "0.0.0+rev=78a78df";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "710754c879435178b7643e525c84cd53f32c510c";
hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ=";
rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240";
hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw=";
};
location = "php";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
php_only = buildGrammar {
language = "php_only";
version = "0.0.0+rev=710754c";
version = "0.0.0+rev=78a78df";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "710754c879435178b7643e525c84cd53f32c510c";
hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ=";
rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240";
hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw=";
};
location = "php_only";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@@ -1799,12 +1810,12 @@
};
poe_filter = buildGrammar {
language = "poe_filter";
version = "0.0.0+rev=bf912df";
version = "0.0.0+rev=592476d";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-poe-filter";
rev = "bf912df70f60b356c70631d9cbb317b41c1ea319";
hash = "sha256-EHftq35YJzElvYiJxiu7iIcugoXME7CXuQSo1ktG584=";
rev = "592476d81f95d2451f2ca107dc872224c76fecdf";
hash = "sha256-dmo/t8gCT7UTlhBvxH4xmliR3Evazv3qsz9EWz7h/gU=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
};
@@ -1854,12 +1865,12 @@
};
properties = buildGrammar {
language = "properties";
version = "0.0.0+rev=189b3cc";
version = "0.0.0+rev=9d09f5f";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-properties";
rev = "189b3cc18d36871c27ebb0adcf0cddd123b0cbba";
hash = "sha256-5cA2DDMiP8axu8Jl1M+CoxHoB+Jc/VMy3vXME+yxH9o=";
rev = "9d09f5f200c356c50c4103d36441309fd61b48d1";
hash = "sha256-KrQlLqCH4P5pwm8ql+iVR09khzQuJu2UHXdMT9MZYe8=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
};
@@ -1921,34 +1932,34 @@
};
purescript = buildGrammar {
language = "purescript";
version = "0.0.0+rev=2517b1e";
version = "0.0.0+rev=daf9b3e";
src = fetchFromGitHub {
owner = "postsolar";
repo = "tree-sitter-purescript";
rev = "2517b1ee2236353af761edbd22570f740f1603f1";
hash = "sha256-iE8v4kwUlq+Xlv26C8IPrZZp1/c9x+X0RHM2HhGfcXM=";
rev = "daf9b3e2be18b0b2996a1281f7783e0d041d8b80";
hash = "sha256-eY2WF2n0fZUl1zxZZHJVYR8b1FwaAjkCeSeOdSf67m4=";
};
meta.homepage = "https://github.com/postsolar/tree-sitter-purescript";
};
pymanifest = buildGrammar {
language = "pymanifest";
version = "0.0.0+rev=41a15c4";
version = "0.0.0+rev=e3b82b7";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-pymanifest";
rev = "41a15c43252baa083729c25646cde83ee5c88277";
hash = "sha256-sOh3j3wy519U1XCBEZhJ4WxIiGZ+/WX5xgj+wy7N9c0=";
rev = "e3b82b78721aee07f676dac8473ae69db51debcf";
hash = "sha256-pZCqeSdiYctbFthdb8Olw35CAXQmT7jG2LOO/3NN/8s=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest";
};
python = buildGrammar {
language = "python";
version = "0.0.0+rev=deba2ba";
version = "0.0.0+rev=22d3f87";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "deba2badc88afd18e6cbd4341ee3c18c3a9bb4ed";
hash = "sha256-K3zamqQPM1UHk375TrMvT9mXw8f7tUse5bFctI+V1EA=";
rev = "22d3f87bdafac2782e907330babe4af574f5d0b4";
hash = "sha256-tyEawslx00ZwohMZo4HBa/INfbS7q6Ob2LO7pvowobk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
};
@@ -2086,12 +2097,12 @@
};
requirements = buildGrammar {
language = "requirements";
version = "0.0.0+rev=0008446";
version = "0.0.0+rev=8666a4d";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-requirements";
rev = "00084464ccad32dd71da60771c25554eeedb213c";
hash = "sha256-84xUmRPhZvBxW+p9RWavOaK3OHJSuhjfbGr/eY4yOto=";
rev = "8666a4dfeb3107144398158bc3dd7a3f59d89ccb";
hash = "sha256-M+/I0pn79Juk8LRB6LLRAyA3R5zcm6rIoR4viT9SW0c=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
};
@@ -2152,12 +2163,12 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=85a21c9";
version = "0.0.0+rev=2d7bac5";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "85a21c96d31b2a5c4369e5836a7f4ab059268fea";
hash = "sha256-uxOjdB65+HjNuOybbYb2N9R0I+bt909bIBOzmh9vfVc=";
rev = "2d7bac5164c344c95530c16dd5c8fa1319e34308";
hash = "sha256-k5/tfG8ONOK8ARgHwpxqB27sJWHioTd5WfCpmMZ1vJY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@@ -2263,12 +2274,12 @@
};
solidity = buildGrammar {
language = "solidity";
version = "0.0.0+rev=1680203";
version = "0.0.0+rev=5cb506a";
src = fetchFromGitHub {
owner = "JoranHonig";
repo = "tree-sitter-solidity";
rev = "168020304759ad5d8b4a88a541a699134e3730c5";
hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560=";
rev = "5cb506ae419c4ad620c77210fd47500d3d169dbc";
hash = "sha256-3BQuEGrmQD9Va7JpTuKJaZ6VaJ//tfPtjoEDRj/utcU=";
};
meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
};
@@ -2342,12 +2353,12 @@
};
ssh_config = buildGrammar {
language = "ssh_config";
version = "0.0.0+rev=b859582";
version = "0.0.0+rev=4fab1c9";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-ssh-config";
rev = "b8595820fa331977a5a44f5f9e0a445c456b5cbf";
hash = "sha256-0aJ+borC8Ous0hTm000DQGaDxbYvvYjocMG4M0bUBqY=";
rev = "4fab1c9116cb7890885508e4630cc8e6a8373a41";
hash = "sha256-cZoRQN3vrOC7xaKeURGeKfQ0xAyRMapbgNQrBTCFoHI=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
};
@@ -2419,12 +2430,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=e1ac0c3";
version = "0.0.0+rev=fc00cbb";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd";
hash = "sha256-7MXH3ZDMH3Im/t5FPMGw6MGKMS+hKaHKUvTXXCrvgtI=";
rev = "fc00cbb460b40228b30f322b5a34ea0e8f35a9f8";
hash = "sha256-FEac9qZuNAJYn/7mIpRSOy72F3qsiyPHZTn1DUzM2xk=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2475,12 +2486,12 @@
};
tcl = buildGrammar {
language = "tcl";
version = "0.0.0+rev=78c7120";
version = "0.0.0+rev=56ad1fa";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-tcl";
rev = "78c71201c1b0939239e779a837dd35370c308948";
hash = "sha256-+dCG0V+eKmLJqvtxCLNpupb8W7a4n3hAsHfURAgnTmk=";
rev = "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8";
hash = "sha256-GhK92+nbJ+M5/1ZnPbIJ3EuNub332YK+hyWiwyBqUmk=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl";
};
@@ -2667,23 +2678,23 @@
};
typst = buildGrammar {
language = "typst";
version = "0.0.0+rev=c757be0";
version = "0.0.0+rev=3c3e5f8";
src = fetchFromGitHub {
owner = "uben0";
repo = "tree-sitter-typst";
rev = "c757be0898e2a58f4e9761aa164dc413bf5beaf8";
hash = "sha256-z0x47Qrr8mYroDtXapRmzOMHOxlYmQmonN0P7VSCBu0=";
rev = "3c3e5f8e0caeba6157e26a1bedf8321e1da62799";
hash = "sha256-9XbFIvZvmeeR38Kejt8Yyxidy/XiAtZ5aQMt/rfg4JE=";
};
meta.homepage = "https://github.com/uben0/tree-sitter-typst";
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=15d89be";
version = "0.0.0+rev=8f58696";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-udev";
rev = "15d89be59a3802dcbe2e97e0f9d32b52f3aeda3f";
hash = "sha256-cgy50jUlqf9/B9H3n24gD9e4mn2qNsa9QxmE8GdhnaA=";
rev = "8f58696e79092b4ad6bf197415bbd0970acf15cd";
hash = "sha256-4vkEHlK8r69cvSu7CAXOmyiSSuIRlZcnQAGHtWqx41w=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev";
};
@@ -2734,12 +2745,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=56d7905";
version = "0.0.0+rev=be121f7";
src = fetchFromGitHub {
owner = "vlang";
repo = "v-analyzer";
rev = "56d7905f423b82dff4b23c86e2869ddc06f6e419";
hash = "sha256-p6QPrmgmrMZai8zvVfNDkXo6SLDpQ537bitHeNC39ik=";
rev = "be121f724e4f3e2159dfa193c876be605c1de7fa";
hash = "sha256-nOWhtoPoVjfPitOMxTiU8Y3dBKT3GwGswRFmVYkcZ2E=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -2790,12 +2801,12 @@
};
vimdoc = buildGrammar {
language = "vimdoc";
version = "0.0.0+rev=40fcd50";
version = "0.0.0+rev=b63be26";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "40fcd50a2c7b5a3ef98294795116773b24fb61ab";
hash = "sha256-i/O8vIjiyOoFECS1nmKfL/8hofzSvwg5cJo7JooJGOY=";
rev = "b63be26fa571259b512e1939f01755d9d6e78fbd";
hash = "sha256-gsjepcw8Y8Vm6GhJRKUJKLsCb+Rd0lNyYfnmWijuiLo=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
@@ -2834,12 +2845,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=52ef462";
version = "0.0.0+rev=13b79ea";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "52ef462f76e199845a5df4834b838339e0a6efdb";
hash = "sha256-eZEyk285EyfduzrVH3Ojbwu8mbRFfZY6lrQQQT1kWM8=";
rev = "13b79ea3f343b15f233c6e7ac930797748191615";
hash = "sha256-2BOPevKjrNoTRNaadwr7erWDBxIDUvU4zLOQgXOB4rE=";
};
location = "libs/tree-sitter-wing";
generate = true;
@@ -2847,23 +2858,23 @@
};
xcompose = buildGrammar {
language = "xcompose";
version = "0.0.0+rev=7fd1494";
version = "0.0.0+rev=2383cc6";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-xcompose";
rev = "7fd14940e0478fce79ea195067ed14a2c42c654a";
hash = "sha256-elnm1HjE4hLFMR/XhCPhOcGjqS9FbCULPRb/IntpQ3U=";
rev = "2383cc69a2c42cfade41c7cb971fb3862bec6df1";
hash = "sha256-N8pJhB35IApb41TKn6NuVMEgmQGC+1Nyu5eQck1K5g8=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose";
};
xml = buildGrammar {
language = "xml";
version = "0.0.0+rev=52b3783";
version = "0.0.0+rev=c23bd31";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a";
hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g=";
rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709";
hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4=";
};
location = "xml";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1 -1
View File
@@ -1290,6 +1290,7 @@ https://github.com/svermeulen/vim-subversive/,,
https://github.com/tpope/vim-surround/,,
https://github.com/evanleck/vim-svelte/,,
https://github.com/machakann/vim-swap/,,
https://github.com/TabbyML/vim-tabby/,HEAD,
https://github.com/dhruvasagar/vim-table-mode/,,
https://github.com/kana/vim-tabpagecd/,,
https://github.com/tpope/vim-tbone/,,
@@ -1401,4 +1402,3 @@ https://github.com/ziglang/zig.vim/,,
https://github.com/mickael-menu/zk-nvim/,HEAD,
https://github.com/troydm/zoomwintab.vim/,,
https://github.com/nanotee/zoxide.vim/,,
https://github.com/TabbyML/vim-tabby/,HEAD,
pkgs/applications/graphics/rnote/Cargo.lock
Generated
+838 -772
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/graphics/rnote/default.nix
+5 -3
View File
@@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, alsa-lib
, appstream
, appstream-glib
, cargo
, cmake
@@ -26,20 +27,20 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.9.4";
version = "0.10.0";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
hash = "sha256-twysPSuCu++dVqoRKTNSvxwrO1ljUu4k2vPZEBkaj10=";
hash = "sha256-PMg83eWcC21yNiRYdTS6/j9gerTctnDPHXIM4PWktrU=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M=";
"piet-0.6.2" = "sha256-WrQok0T7uVQEp8SvNWlgqwQHfS7q0510bnP1ecr+s1Q=";
"piet-0.6.2" = "sha256-3juXzuKwoLuxia6MoVwbcBJ3jXBQ9QRNVoxo3yFp2Iw=";
};
};
@@ -67,6 +68,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
appstream
glib
gstreamer
gtk4
pkgs/applications/misc/raider/default.nix
+20 -13
View File
@@ -1,11 +1,10 @@
{ appstream-glib
{ appstream
, blueprint-compiler
, desktop-file-utils
, fetchFromGitHub
, gettext
, glib
, gtk4
, itstool
, lib
, libadwaita
, meson
@@ -15,22 +14,22 @@
, stdenv
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "raider";
version = "1.3.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "ADBeveridge";
repo = "raider";
rev = "v${version}";
hash = "sha256-fyE0CsQp2UVh+7bAQo+GHEF0k8Gwl9j4qclh04AQiVI=";
hash = "sha256-ZR40sbEKvZxGxRaV5H9D6kBP9ZgUdc425XgIhqidWLI=";
};
nativeBuildInputs = [
appstream-glib
appstream
blueprint-compiler
desktop-file-utils
itstool
meson
ninja
pkg-config
@@ -44,15 +43,23 @@ stdenv.mkDerivation rec {
libadwaita
];
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';
meta = with lib; {
description = "Securely delete your files";
homepage = "https://apps.gnome.org/app/com.github.ADBeveridge.Raider";
description = "Permanently delete your files (also named File Shredder)";
longDescription = ''
Raider is a shredding program built for the GNOME
desktop. It is meant to remove files from your
computer permanently. Within a certain limit, it is
effective. However, the way data is written physically
to SSDs at the hardware level ensures that shredding
is never perfect, and no software can fix that.
However, top-level agencies are usually the only ones
who can recover such data, due to the time, effort,
money and patience required to extract it effectively.
'';
homepage = "https://apps.gnome.org/Raider";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ benediktbroich ];
mainProgram = "raider";
maintainers = with maintainers; [ benediktbroich aleksana ];
platforms = platforms.unix;
};
}
pkgs/applications/networking/browsers/chromium/common.nix
+1 -8
View File
@@ -25,7 +25,7 @@
, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libcap
, xdg-utils, minizip, libwebp
, minizip, libwebp
, libusb1, re2
, ffmpeg, libxslt, libxml2
, nasm
@@ -184,9 +184,6 @@ let
bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy
libcap
] ++ lib.optionals (!xdg-utils.meta.broken) [
xdg-utils
] ++ [
minizip libwebp
libusb1 re2
ffmpeg libxslt libxml2
@@ -295,10 +292,6 @@ let
'/usr/share/locale/' \
'${glibc}/share/locale/'
'' + lib.optionalString (!xdg-utils.meta.broken) ''
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
'' + lib.optionalString systemdSupport ''
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
pkgs/applications/networking/ssb-patchwork/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ let
desktopItem = makeDesktopItem {
name = "ssb-patchwork";
exec = "${binary}/bin/ssb-patchwork";
icon = "ssb-patchwork.png";
icon = "ssb-patchwork";
comment = "Client for the decentralized social network Secure Scuttlebutt";
desktopName = "Patchwork";
genericName = "Patchwork";
pkgs/applications/office/qownnotes/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.2.5";
version = "24.2.6";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-xLrt9ng2Le3eEPHyXuoqTUwSH5h6J+93bKFxIAaEduA=";
hash = "sha256-F0AUY82zPDRpV/mBb6kpAdMIImJ2ICwwfIluxh8Z7As=";
};
nativeBuildInputs = [
pkgs/applications/science/math/wxmaxima/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs:{
pname = "wxmaxima";
version = "24.02.1";
version = "24.02.2";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${finalAttrs.version}";
hash = "sha256-ORrIZlLqZsxMpqtw5Z7GMI9dDod50hj94ro6urjBD/A=";
hash = "sha256-ewyg+ZhbRbPjJkYTZFuhbOWMDNZGW7ejmSv38zxcTsw=";
};
buildInputs = [
pkgs/build-support/rust/rustc-wrapper/default.nix
+6 -4
View File
@@ -6,7 +6,6 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" {
inherit (rustc-unwrapped) outputs;
env = {
prog = "${rustc-unwrapped}/bin/rustc";
sysroot = lib.optionalString (sysroot != null) "--sysroot ${sysroot}";
# Upstream rustc still assumes that musl = static[1]. The fix for
@@ -42,9 +41,12 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" {
} ''
mkdir -p $out/bin
ln -s ${rustc-unwrapped}/bin/* $out/bin
rm $out/bin/rustc
substituteAll ${./rustc-wrapper.sh} $out/bin/rustc
chmod +x $out/bin/rustc
rm $out/bin/{rustc,rustdoc}
prog=${rustc-unwrapped}/bin/rustc extraFlagsVar=NIX_RUSTFLAGS \
substituteAll ${./rustc-wrapper.sh} $out/bin/rustc
prog=${rustc-unwrapped}/bin/rustdoc extraFlagsVar=NIX_RUSTDOCFLAGS \
substituteAll ${./rustc-wrapper.sh} $out/bin/rustdoc
chmod +x $out/bin/{rustc,rustdoc}
${lib.concatMapStrings (output: "ln -s ${rustc-unwrapped.${output}} \$${output}\n")
(lib.remove "out" rustc-unwrapped.outputs)}
''
pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
+1 -1
View File
@@ -14,7 +14,7 @@ for arg; do
done
extraBefore=(@defaultArgs@ "${defaultSysroot[@]}")
extraAfter=($NIX_RUSTFLAGS)
extraAfter=($@extraFlagsVar@)
# Optionally print debug info.
if (( "${NIX_DEBUG:-0}" >= 1 )); then
pkgs/by-name/bn/bngblaster/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.8.35";
version = "0.8.39";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-zljpApecUKtdU1HqLmeREeL+rmDUMhBWnycgmENlt1o=";
hash = "sha256-w8E/GcwLCH6OYwabRWH+CNQ2p7scMK8ogReRxNFqI4k=";
};
nativeBuildInputs = [
pkgs/by-name/bp/bpftop/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "bpftop";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "Netflix";
repo = "bpftop";
rev = "v${version}";
hash = "sha256-1Wgfe+M1s3hxcN9g1KiBeZycdgpMiHy5FWlE0jlNq/U=";
hash = "sha256-mtif1VRlDL1LsJQ3NQmBEaHTxrt2qMbZAFCEhtm/CtI=";
};
cargoHash = "sha256-CrAH3B3dCg3GsxvRrVp/jx3YSpmEg4/jyNuXUO/zeq0=";
cargoHash = "sha256-N3pmet7OkIaI3EnzHfqe5P24RHabNUArEB1cKUYM5rA=";
buildInputs = [
elfutils
pkgs/by-name/br/bruteforce-wallet/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "bruteforce-wallet";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "glv2";
repo = "bruteforce-wallet";
rev = version;
hash = "sha256-1sMoVlQK3ceFOHyGeXKXUD35HmMxVX8w7qefZrzAj5k=";
hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0=";
};
nativeBuildInputs = [
pkgs/by-name/ch/chromatic/package.nix
+69
View File
@@ -0,0 +1,69 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, meson
, ninja
, pkg-config
, rustc
, cargo
, wrapGAppsHook4
, desktop-file-utils
, libxml2
, libadwaita
, portaudio
, libpulseaudio
}:
stdenv.mkDerivation rec {
pname = "chromatic";
version = "0-unstable-2023-08-05";
src = fetchFromGitHub {
owner = "nate-xyz";
repo = "chromatic";
rev = "ffaeb50dcce74bf3ba1b05f98423cf48f205f55e";
hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-M3UMeGkLf57/I/9BIkyiMpOvjbKQJrOk+axf05vRoW0=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
cargo
wrapGAppsHook4
desktop-file-utils
libxml2.bin # xmllint
];
buildInputs = [
libadwaita
portaudio
libpulseaudio
];
meta = with lib; {
description = "Fine-tune your instruments";
longDescription = ''
Fine-tune your instruments with Chromatic. Chromatic
detects the frequency of audio input, converts it to
a musical note with the correct semitone and octave,
and displays the cents error. Cents are displayed on
an analog gauge to make tuning more visually intuitive.
Requires PulseAudio or PipeWire.
'';
homepage = "https://github.com/nate-xyz/chromatic";
license = licenses.gpl3Plus;
mainProgram = "chromatic";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
};
}
pkgs/by-name/mo/mousam/package.nix
+58
View File
@@ -0,0 +1,58 @@
{ lib
, python3Packages
, fetchFromGitHub
, meson
, ninja
, pkg-config
, gobject-introspection
, wrapGAppsHook4
, desktop-file-utils
, libadwaita
}:
python3Packages.buildPythonApplication rec {
pname = "mousam";
version = "1.1.0";
# built with meson, not a python format
format = "other";
src = fetchFromGitHub {
owner = "amit9838";
repo = "mousam";
rev = "v${version}";
hash = "sha256-4NJLJ9aPCufvqZGzqQEjSxryofcg4mwk0UohlgUYcqk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
];
propagatedBuildInputs = with python3Packages; [
pygobject3
requests
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
description = "Beautiful and lightweight weather app based on Python and GTK4";
homepage = "https://amit9838.github.io/mousam";
license = with licenses; [ gpl3Plus ];
mainProgram = "mousam";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.unix;
};
}
pkgs/by-name/xi/xiu/package.nix
+4 -4
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "xiu";
version = "0.10.0";
version = "0.12.4";
src = fetchFromGitHub {
owner = "harlanc";
repo = "xiu";
rev = "v${version}";
hash = "sha256-wJXVxkW+jbqc2zFOn8RGUVI9G0+oow+eFGtF4Nsj5pA=";
hash = "sha256-tXZCWbqwt3v20rvfre/gAUzs8i78FpbNd5qAGNOX5VE=";
};
cargoHash = "sha256-gpPEHe/RDmEapkioXq7TicrFRrJlcRqiilY+munQKws=";
cargoHash = "sha256-6nWnw31A27VWJe8JGM+S05sqcZwQRrb1aanamv6ITZ4=";
nativeBuildInputs = [
cmake
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
] ++ lib.optionals stdenv.isLinux [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
OPENSSL_NO_VENDOR = 1;
pkgs/data/misc/dbip-country-lite/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-country-lite";
version = "2024-02";
version = "2024-03";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-YeZaFscmH4yVNwwXCHzxf/BlM1zT0gbdZ6Ysdh4gqN4=";
hash = "sha256-pWlNmM7CCiIS1GRRX5GRWNOF5tOwPPTytgc7V2+l3LE=";
};
dontUnpack = true;
pkgs/data/themes/gtk-theme-framework/default.nix
+1 -1
View File
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/jaxwilko/gtk-theme-framework";
license = licenses.gpl3Only;
maintainers = with maintainers; [ flexagoon ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "kde-rounded-corners";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "matinlotfali";
repo = "KDE-Rounded-Corners";
rev = "v${version}";
hash = "sha256-DE3XTu3CQY9mGuOpehWno/4yFyLjHuh4RxdUh+aTU7M=";
hash = "sha256-8QkuIuHC0/fMxh8K3/I8GNhNPX+tw7kUMiU2oK12c0U=";
};
postConfigure = ''
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
description = "Rounds the corners of your windows";
homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners";
license = licenses.gpl3Only;
maintainers = with maintainers; [ flexagoon ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
+1 -1
View File
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/kupiqu/SierraBreezeEnhanced";
changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ flexagoon ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/compilers/rust/rustc.nix
+1 -2
View File
@@ -175,8 +175,7 @@ in stdenv.mkDerivation (finalAttrs: {
python ./x.py --keep-stage=0 --stage=1 install library/std
mkdir -v $out/bin $doc $man
ln -s ${rustc.unwrapped}/bin/rustc $out/bin
makeWrapper ${rustc.unwrapped}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out"
ln -s ${rustc.unwrapped}/bin/{rustc,rustdoc} $out/bin
ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/
echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components
lndir ${rustc.doc} $doc
pkgs/development/compilers/scryer-prolog/default.nix
+3 -17
View File
@@ -1,7 +1,6 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, pkg-config
, openssl
, gmp
@@ -12,29 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "scryer-prolog";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "mthom";
repo = "scryer-prolog";
rev = "v${version}";
hash = "sha256-0J69Zl+ONvR6T+xf2YeShwn3/JWOHyFHLpNFwmEaIOI=";
hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
};
patches = [
(fetchpatch {
name = "cargo-lock-version-bump.patch";
url = "https://github.com/mthom/scryer-prolog/commit/d6fe5b5aaddb9886a8a34841a65cb28c317c2913.patch";
hash = "sha256-xkGsjVV/FcyZXGkI84FlqcRIuDM7isCCWZ1sbKql7es=";
})
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"modular-bitfield-0.11.2" = "sha256-vcx+xt5owZVWOlKwudAr0EB1zlLLL5pVfWokw034BQI=";
};
};
cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl gmp libmpc mpfr ];
pkgs/development/libraries/faudio/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "24.02";
version = "24.03";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-xEieWgPNSpRJNYh65F2+NLXVZIlKA5ZE+959+s9zQ/I=";
sha256 = "sha256-O2hnv74Uj3PJCmca9Ynz+jjeJXBw2zbGEWlqax3WfjA=";
};
nativeBuildInputs = [cmake];
pkgs/development/libraries/libbacktrace/default.nix
+4
View File
@@ -41,6 +41,10 @@ stdenv.mkDerivation {
(lib.enableFeature enableShared "shared")
];
# Workaround upstream testsuite failure in multithreaded setup:
# https://github.com/ianlancetaylor/libbacktrace/issues/118#issuecomment-1974850483
env.XZ_OPT = "--threads=1";
doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl;
passthru = {
pkgs/development/python-modules/aioswitcher/default.nix
+5
View File
@@ -8,6 +8,7 @@
, pytest-resource-path
, pytest-sugar
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, time-machine
}:
@@ -52,6 +53,10 @@ buildPythonPackage rec {
"test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
"test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
"test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
] ++ lib.optionals (pythonAtLeast "3.12") [
# ssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not.
"test_minutes_to_hexadecimal_seconds_with_a_negative_value_should_throw_an_error"
"test_current_timestamp_to_hexadecimal_with_errornous_value_should_throw_an_error"
];
pythonImportsCheck = [
pkgs/development/python-modules/chameleon/default.nix
+21 -7
View File
@@ -1,25 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "Chameleon";
version = "3.8.1";
pname = "chameleon";
version = "4.5.2";
pyproject = true;
# tests not included in pypi tarball
src = fetchFromGitHub {
owner = "malthe";
repo = "chameleon";
rev = version;
sha256 = "0nf8x4w2vh1a31wdb86nnvlic9xmr23j3in1f6fq4z6mv2jkwa87";
rev = "refs/tags/${version}";
hash = "sha256-SVLKT6JeFUpF7gYkq3B7Lm9b9SG2qa6Ekp8i8xM0Xh0=";
};
pythonImportsCheck = [ "chameleon" ];
build-system = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"chameleon"
];
meta = with lib; {
homepage = "https://chameleon.readthedocs.io/";
changelog = "https://github.com/malthe/chameleon/blob/${version}/CHANGES.rst";
description = "Fast HTML/XML Template Compiler";
downloadPage = "https://github.com/malthe/chameleon";
homepage = "https://chameleon.readthedocs.io";
license = licenses.bsd0;
maintainers = with maintainers; [ domenkozar ];
};
pkgs/development/python-modules/dsmr-parser/default.nix
+5
View File
@@ -5,6 +5,7 @@
, pyserial
, pyserial-asyncio
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, pytz
, tailer
@@ -36,6 +37,10 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optionals (pythonAtLeast "3.12") [
"test_receive_packet"
];
pythonImportsCheck = [
"dsmr_parser"
];
pkgs/development/python-modules/edk2-pytool-library/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.21.3";
version = "0.21.4";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "refs/tags/v${version}";
hash = "sha256-tyDRHw3c5Kn9IXm5K7Qpn1xfmu5c3pb9D1mpeqo6SHg=";
hash = "sha256-LzIK4GGVWAp4JXlKE7Mo0cPIH2srnJIlu36bzovNkwE=";
};
nativeBuildInputs = [
pkgs/development/python-modules/hahomematic/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2024.2.4";
version = "2024.3.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = "hahomematic";
rev = "refs/tags/${version}";
hash = "sha256-p1LUF57wH8zWCwPo4pYeOGRBEYCNUv8CnYBGNYzKCgE=";
hash = "sha256-zSGzdj51StlLMmFZzprQUn6Ry9ahJPUq/Z9hVlKn8oA=";
};
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/interegular/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "interegular";
version = "0.3.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-2baXshs0iEcROZug8DdpFLgYmc5nADJIbQ0Eg0SnZgA=";
};
pythonImportsCheck = [
"interegular"
];
meta = with lib; {
description = "A library to check a subset of python regexes for intersections";
homepage = "https://github.com/MegaIng/interegular";
license = licenses.mit;
maintainers = with maintainers; [ lach ];
};
}
pkgs/development/python-modules/outlines/default.nix
+62
View File
@@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, setuptools-scm
, interegular
, cloudpickle
, diskcache
, joblib
, jsonschema
, pydantic
, lark
, nest-asyncio
, numba
, scipy
, torch
, transformers
}:
buildPythonPackage rec {
pname = "outlines";
version = "0.0.34";
pyproject = true;
src = fetchFromGitHub {
owner = "outlines-dev";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-iIlthrhmCm3n0PwUSa1n7CL04sDc1Cs+rVboPY4nH78=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
interegular
cloudpickle
diskcache
joblib
jsonschema
pydantic
lark
nest-asyncio
numba
scipy
torch
transformers
];
pythonImportsCheck = [
"outlines"
];
meta = with lib; {
description = "Structured text generation";
homepage = "https://github.com/outlines-dev/outlines";
license = licenses.asl20;
maintainers = with maintainers; [ lach ];
};
}
pkgs/development/python-modules/pyfume/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyfume";
version = "0.2.25";
version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyFUME";
inherit version;
hash = "sha256-uD1IHFyNd9yv3eyHPZ4pg6X2+rLTY5sYsQysuIXbvfA=";
hash = "sha256-dZKp+BGwOSRlPcaDmY8LRJZEdJA3WaIGcBBOek5ZMf4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pymatgen/default.nix
+33 -4
View File
@@ -1,8 +1,11 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, ase
, cython
, glibcLocales
, joblib
, matplotlib
, monty
, networkx
@@ -12,10 +15,13 @@
, plotly
, pybtex
, pydispatcher
, pytestCheckHook
, pytest-xdist
, pythonOlder
, requests
, ruamel-yaml
, scipy
, seekpath
, spglib
, sympy
, tabulate
@@ -24,7 +30,7 @@
buildPythonPackage rec {
pname = "pymatgen";
version = "2022.3.29";
version = "2024.2.23";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -33,7 +39,7 @@ buildPythonPackage rec {
owner = "materialsproject";
repo = "pymatgen";
rev= "v${version}";
hash = "sha256-B2piRWx9TfKlGTPOAAGsq2GxyfHIRBVFpk6dxES0WF0=";
hash = "sha256-eswoup9ACj/PHVW3obcnZjD4tWemsmROZFtwGGigEYE=";
};
nativeBuildInputs = [
@@ -60,14 +66,37 @@ buildPythonPackage rec {
uncertainties
];
# Tests are not detected by pytest
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
pytest-xdist
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
preCheck = ''
# hide from tests
mv pymatgen _pymatgen
# ensure tests can find these
export PMG_TEST_FILES_DIR="$(realpath ./tests/files)"
# some tests cover the command-line scripts
export PATH=$out/bin:$PATH
'';
disabledTests = [
# presumably won't work with our dir layouts
"test_egg_sources_txt_is_complete"
# borderline precision failure
"test_thermal_conductivity"
];
passthru.optional-dependencies = {
ase = [ ase ];
joblib = [ joblib ];
seekpath = [ seekpath ];
};
pythonImportsCheck = [
"pymatgen"
];
meta = with lib; {
broken = stdenv.isDarwin; # tests segfault. that's bad.
description = "A robust materials analysis code that defines core object representations for structures and molecules";
homepage = "https://pymatgen.org/";
license = licenses.mit;
pkgs/development/python-modules/python-lsp-ruff/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "python-lsp-ruff";
version = "2.1.0";
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit version;
pname = "python-lsp-ruff";
hash = "sha256-uvTSmoY9rVGEruxY20wOPVgR2JTBDzbn5S7ccDz3zBU=";
hash = "sha256-Z8FAZ/drw9Fr1Uc6V04NezvUItcjti0rKoM1borwUds=";
};
postPatch = ''
pkgs/development/python-modules/python-matter-server/default.nix
+2 -2
View File
@@ -55,7 +55,7 @@ in
buildPythonPackage rec {
pname = "python-matter-server";
version = "5.7.0b2";
version = "5.8.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-fMtvVizHeAzLdou0U1tqbmQATIBLK4w9I7EwMlzB8QA=";
hash = "sha256-bpXRay4JUujqdnscGldW732e8FTkcmfShbtwp2YJC60=";
};
patches = [
pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch
+25 -106
View File
@@ -1,126 +1,45 @@
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
index b6cd839..f9f798f 100644
index 2a6140b..275353a 100644
--- a/matter_server/server/const.py
+++ b/matter_server/server/const.py
@@ -5,14 +5,4 @@ from typing import Final
# The minimum schema version (of a client) the server can support
MIN_SCHEMA_VERSION = 5
-# the paa-root-certs path is hardcoded in the sdk at this time
-# and always uses the development subfolder
-# regardless of anything you pass into instantiating the controller
-# revisit this once matter 1.1 is released
@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
# and always uses the development subfolder
# regardless of anything you pass into instantiating the controller
# revisit this once matter 1.1 is released
-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
- pathlib.Path(__file__)
- .parent.resolve()
- .parent.resolve()
- .parent.resolve()
- .joinpath("credentials/development/paa-root-certs")
-)
+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@")
+(
pathlib.Path(__file__)
.parent.resolve()
.parent.resolve()
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
index 9ac5a10..25230c1 100644
index d186be1..d2cef54 100644
--- a/matter_server/server/helpers/paa_certificates.py
+++ b/matter_server/server/helpers/paa_certificates.py
@@ -58,84 +58,14 @@ async def fetch_dcl_certificates(
@@ -62,6 +62,8 @@ async def fetch_dcl_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch DCL PAA Certificates."""
- LOGGER.info("Fetching the latest PAA root certificates from DCL.")
- if not PAA_ROOT_CERTS_DIR.is_dir():
- loop = asyncio.get_running_loop()
- await loop.run_in_executor(None, makedirs, PAA_ROOT_CERTS_DIR)
- fetch_count: int = 0
- base_urls = set()
- # determine which url's need to be queried.
- # if we're going to fetch both prod and test, do test first
- # so any duplicates will be overwritten/preferred by the production version
- # NOTE: While Matter is in BETA we fetch the test certificates by default
- if fetch_test_certificates:
- base_urls.add(TEST_URL)
- if fetch_production_certificates:
- base_urls.add(PRODUCTION_URL)
- try:
- async with ClientSession(raise_for_status=True) as http_session:
- for url_base in base_urls:
- # fetch the paa certificates list
- async with http_session.get(
- f"{url_base}/dcl/pki/root-certificates"
- ) as response:
- result = await response.json()
- paa_list = result["approvedRootCertificates"]["certs"]
- # grab each certificate
- for paa in paa_list:
- # do not fetch a certificate if we already fetched it
- if paa["subjectKeyId"] in LAST_CERT_IDS:
- continue
- async with http_session.get(
- f"{url_base}/dcl/pki/certificates/{paa['subject']}/{paa['subjectKeyId']}"
- ) as response:
- result = await response.json()
-
- certificate_data: dict = result["approvedCertificates"]["certs"][0]
- certificate: str = certificate_data["pemCert"]
- subject = certificate_data["subjectAsText"]
- certificate = certificate.rstrip("\n")
-
- await write_paa_root_cert(
- certificate,
- subject,
- )
- LAST_CERT_IDS.add(paa["subjectKeyId"])
- fetch_count += 1
- except ClientError as err:
- LOGGER.warning(
- "Fetching latest certificates failed: error %s", err, exc_info=err
- )
- else:
- LOGGER.info("Fetched %s PAA root certificates from DCL.", fetch_count)
-
- return fetch_count
+ return 0
+
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
fetch_count: int = 0
base_urls = set()
@@ -121,6 +123,8 @@ async def fetch_dcl_certificates(
async def fetch_git_certificates() -> int:
"""Fetch Git PAA Certificates."""
- fetch_count = 0
- LOGGER.info("Fetching the latest PAA root certificates from Git.")
- try:
- async with ClientSession(raise_for_status=True) as http_session:
- for cert in GIT_CERTS:
- if cert in LAST_CERT_IDS:
- continue
- async with http_session.get(f"{GIT_URL}/{cert}.pem") as response:
- certificate = await response.text()
- await write_paa_root_cert(certificate, cert)
- LAST_CERT_IDS.add(cert)
- fetch_count += 1
- except ClientError as err:
- LOGGER.warning(
- "Fetching latest certificates failed: error %s", err, exc_info=err
- )
-
- LOGGER.info("Fetched %s PAA root certificates from Git.", fetch_count)
-
- return fetch_count
+ return 0
+
fetch_count = 0
LOGGER.info("Fetching the latest PAA root certificates from Git.")
async def fetch_certificates(
@@ -144,12 +74,4 @@ async def fetch_certificates(
@@ -162,6 +166,8 @@ async def fetch_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch PAA Certificates."""
- fetch_count = await fetch_dcl_certificates(
- fetch_test_certificates=fetch_test_certificates,
- fetch_production_certificates=fetch_production_certificates,
- )
-
- if fetch_test_certificates:
- fetch_count += await fetch_git_certificates()
-
- return fetch_count
+ return 0
+
loop = asyncio.get_running_loop()
if not PAA_ROOT_CERTS_DIR.is_dir():
pkgs/development/python-modules/sqlalchemy-utils/default.nix
+4 -1
View File
@@ -83,7 +83,6 @@ buildPythonPackage rec {
docutils
flexmock
psycopg2
psycopg2cffi
pg8000
pytz
python-dateutil
@@ -91,6 +90,10 @@ buildPythonPackage rec {
pyodbc
]
++ lib.flatten (builtins.attrValues passthru.optional-dependencies)
++ lib.optionals (pythonOlder "3.12") [
# requires distutils, which were removed in 3.12
psycopg2cffi
]
++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
];
pkgs/development/python-modules/sqlmap/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.8.2";
version = "1.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-DypzKg8ajqevVFDoeEW6Mj82x90U9OUb7dgIhp+KyZg=";
hash = "sha256-X3xz2ucuxr48q9gS9K19Zd7gYkRCpU+XLWMSrwiQMIo=";
};
postPatch = ''
pkgs/development/python-modules/vllm/default.nix
+4 -2
View File
@@ -7,6 +7,7 @@
, packaging
, setuptools
, torch
, outlines
, wheel
, psutil
, ray
@@ -36,14 +37,14 @@
buildPythonPackage rec {
pname = "vllm";
version = "0.3.2";
version = "0.3.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "vllm-project";
repo = pname;
rev = "v${version}";
hash = "sha256-ZFwlR8Xnen7FFblwzPJm0k+3iEo2p27QhfRaDfzwbOM=";
hash = "sha256-LU5pCPVv+Ws9dL8oWL1sJGzwQKI1IFk2A1I6TP9gXL4=";
};
# Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing.
@@ -114,6 +115,7 @@ buildPythonPackage rec {
numpy
torch
transformers
outlines
xformers
fastapi
uvicorn
pkgs/development/python-modules/ytmusicapi/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ytmusicapi";
version = "1.5.3";
version = "1.5.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "sigma67";
repo = "ytmusicapi";
rev = "refs/tags/${version}";
hash = "sha256-X4bfGYFttuEMwDyjqzDe3RJGkAvVUs91hEL0JfXrdIM=";
hash = "sha256-Bg2Ikxkaq+dJkX842GCdIevgxULYSfE7s61YviqUln8=";
};
nativeBuildInputs = [
pkgs/development/tools/rust/cargo-component/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-component";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "v${version}";
hash = "sha256-MYJxwJuiBbZQzCpFoJ/iKv6ShkCYJIMu+QQEURHRBAU=";
hash = "sha256-zJ3fV6GOYcbLvOjZKrSOxGPc8GSQGridInvOZFruXks=";
};
cargoHash = "sha256-qh6/e4ya0+ZPYIJRYe87F65tWO3ZllZpIw9B5jE+YbU=";
cargoHash = "sha256-ixk9ui/vS6DynCTF086JBFEw/JC8jpixvUkwIi5Hr0A=";
nativeBuildInputs = [
pkg-config
pkgs/games/doom-ports/slade/default.nix
+14 -4
View File
@@ -15,21 +15,23 @@
, glew
, lua
, mpg123
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "slade";
version = "3.2.4";
version = "3.2.5";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = version;
sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8=";
sha256 = "sha256-FBpf1YApwVpWSpUfa2LOrkS1Ef34sKCIZ6ic+Pczs14=";
};
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
sed -i '/-msse/d' src/CMakeLists.txt
postPatch = ''
substituteInPlace dist/CMakeLists.txt \
--replace "PK3_OUTPUT" "PK3_DESTINATION"
'';
nativeBuildInputs = [
@@ -37,6 +39,7 @@ stdenv.mkDerivation rec {
pkg-config
which
zip
wrapGAppsHook
];
buildInputs = [
@@ -54,10 +57,17 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DwxWidgets_LIBRARIES=${wxGTK}/lib"
"-DBUILD_PK3=ON"
];
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
preFixup = ''
gappsWrapperArgs+=(
--prefix GDK_BACKEND : x11
)
'';
meta = with lib; {
description = "Doom editor";
homepage = "http://slade.mancubus.net/";
pkgs/servers/routinator/default.nix
+2 -1
View File
@@ -3,6 +3,7 @@
, fetchFromGitHub
, stdenv
, Security
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
@@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-X+pAvudfbxng6kMv0NO00v6mMBXUMaXvZb/L1OgWd38=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
buildNoDefaultFeatures = true;
buildFeatures = [ "socks" ];
pkgs/servers/spicedb/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "spicedb";
version = "1.29.1";
version = "1.29.2";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-fUTJpdFFNf/r+NQYBU4y8sGdtEShF9Yi89aB0rU7Xd8=";
hash = "sha256-vag9TtQzLrquD/b1XX1ys6ijEn3ytZsIEKN/ii3rDL8=";
};
vendorHash = "sha256-wPQ6RjDldO2m4myKcLtGoe5LurX6FI7yLoWLZUkex4o=";
vendorHash = "sha256-T8fJgPsJLinQlZwjxkfKObypeXETvjgBLwVA5fS4O38=";
subPackages = [ "cmd/spicedb" ];
pkgs/servers/zigbee2mqtt/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "zigbee2mqtt";
version = "1.35.3";
version = "1.36.0";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
hash = "sha256-pj+8BiEcR8Z88J3xxEa4IRBlt9Lv7IoSrKAQ6Y5oydI=";
hash = "sha256-Eyp6VQAt0bd3rXovoaUvTuEY8E67cI5vFadpClhHcrA=";
};
npmDepsHash = "sha256-15aZyICTRq6DvW2arKtdT+jXDyGtVD7ncer8e4d+03E=";
npmDepsHash = "sha256-Kr2gjCMf7yRldvLImuU92sN7a4T2ARFcTshwGOWX+zw=";
nodejs = nodejs_18;
pkgs/tools/misc/cowsay/default.nix
+6 -6
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers, cowsay }:
{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cowsay";
version = "3.7.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "cowsay-org";
repo = "cowsay";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s=";
};
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = cowsay;
package = finalAttrs.finalPackage;
command = "cowsay --version";
};
};
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A program which generates ASCII pictures of a cow with a message";
homepage = "https://cowsay.diamonds";
changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${version}";
changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ rob anthonyroussel ];
};
}
})
pkgs/tools/misc/ddcutil/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "ddcutil";
version = "2.1.3";
version = "2.1.4";
src = fetchurl {
url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz";
hash = "sha256-l6C9cJ0MfffzULuH9DIoNzGKqp7o4cwpbDrbC93yc/g=";
hash = "sha256-4U/igqtgw2rwyuhEkV1pWYPIyNZEt2N6hlXJ9bDUyRw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/tools/misc/fastfetch/default.nix
+2 -2
View File
@@ -43,13 +43,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.8.6";
version = "2.8.7";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
rev = finalAttrs.version;
hash = "sha256-n15p26zZaote8cB0NfBnb69hb27l4hHBZG+3D1yrrCA=";
hash = "sha256-lJRTw8Z//x6tMpwfwSodTz7aVbnJPt3rac7AudqF+DA=";
};
outputs = [ "out" "man" ];
pkgs/tools/misc/mongodb-compass/default.nix
+2 -2
View File
@@ -33,7 +33,7 @@ xorg,
}:
let
version = "1.42.1";
version = "1.42.2";
rpath = lib.makeLibraryPath [
alsa-lib
@@ -82,7 +82,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "sha256-URxzoMb03p8UTLbn8tmtaSQQV27hYRSwlTiacF/48F8=";
sha256 = "sha256-NvHFsB+wXNq2XmHb2tYI1P9vUXwVcwbhR645LjHM0/Y=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
pkgs/top-level/all-packages.nix
+16 -6
View File
@@ -6439,7 +6439,7 @@ with pkgs;
routersploit = callPackage ../tools/security/routersploit { };
routinator = callPackage ../servers/routinator {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
rsbep = callPackage ../tools/backup/rsbep { };
@@ -22994,11 +22994,21 @@ with pkgs;
libmemcached = callPackage ../development/libraries/libmemcached { };
libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { };
libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
inherit
({
libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { };
libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
})
libmicrohttpd_0_9_69
libmicrohttpd_0_9_71
libmicrohttpd_0_9_72
libmicrohttpd_0_9_74
libmicrohttpd_0_9_77
;
libmicrohttpd = libmicrohttpd_0_9_77;
libmikmod = callPackage ../development/libraries/libmikmod {
pkgs/top-level/python-packages.nix
+4
View File
@@ -5666,6 +5666,8 @@ self: super: with self; {
intensity-normalization = callPackage ../development/python-modules/intensity-normalization { };
interegular = callPackage ../development/python-modules/interegular { };
interface-meta = callPackage ../development/python-modules/interface-meta { };
internetarchive = callPackage ../development/python-modules/internetarchive { };
@@ -9411,6 +9413,8 @@ self: super: with self; {
alembic = pkgs.alembic;
};
outlines = callPackage ../development/python-modules/outlines { };
overly = callPackage ../development/python-modules/overly { };
overpy = callPackage ../development/python-modules/overpy { };