Merge master into staging-nixos

pkgs/by-name/bl/blazesym-c/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blazesym-c";
-  version = "0.1.11";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "blazesym";
     tag = "capi-v${finalAttrs.version}";
-    hash = "sha256-WwL/IbR7y916yvFZGdyHlrexqoyr2wDTNalaKMCdnRs=";
+    hash = "sha256-0ceEzlimp6UfrkoEYhwH6RWCrvkCpHF13G9vmM1HbQM=";
   };
 
-  cargoHash = "sha256-uMb45eScPjJV3NXcqr6TMJQZI/IHYY9cXgprG2j4UJA=";
+  cargoHash = "sha256-uQ7buVP0I+RgWHYFZxQP0hwJFMoB7Fz5D7S2dL1d/CM=";
 
   cargoBuildFlags = [
     "--package"

pkgs/by-name/li/libslirp/package.nix

@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libslirp";
-  version = "4.9.5";
+  version = "4.9.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "slirp";
     repo = "libslirp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iWu3/Klsm8e9MH147BJhn9Vqyneq5ROqPvll1cnieL0=";
+    hash = "sha256-nfR5eQrcpbkmn2tx/8l649NVPOsIFSFSBkW/vw0meCM=";
   };
 
   __structuredAttrs = true;

pkgs/by-name/sl/slskd/deps.json

@@ -29,11 +29,26 @@
     "version": "4.18.1",
     "hash": "sha256-5hZm1Rx4n0e2JNsJ6lketE3c8z6AFdquTgKCQORqRfc="
   },
+  {
+    "pname": "BenchmarkDotNet",
+    "version": "0.15.4",
+    "hash": "sha256-06/H+bX0tnLq3BIDV08klymQEF4YOI3fnbH9hVGBCPA="
+  },
+  {
+    "pname": "BenchmarkDotNet.Annotations",
+    "version": "0.15.4",
+    "hash": "sha256-kDbSs/rzshijG/71GGAPh3lre9sk1oomczTeVs4eygg="
+  },
   {
     "pname": "Castle.Core",
     "version": "4.4.0",
     "hash": "sha256-7hLBAHnB+drr2yU4w3o05eMX2ADy/rXN3XRPBn1d7GY="
   },
+  {
+    "pname": "CommandLineParser",
+    "version": "2.9.1",
+    "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
+  },
   {
     "pname": "coverlet.msbuild",
     "version": "10.0.1",
@@ -59,6 +74,16 @@
     "version": "10.1.301",
     "hash": "sha256-mJZgPWzVXH/bqEH4DKWOQzzJdTvV8xTtJdj4s4nRzYk="
   },
+  {
+    "pname": "Gee.External.Capstone",
+    "version": "2.3.0",
+    "hash": "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="
+  },
+  {
+    "pname": "Iced",
+    "version": "1.21.0",
+    "hash": "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo="
+  },
   {
     "pname": "IPAddressRange",
     "version": "6.3.0",
@@ -104,6 +129,26 @@
     "version": "10.0.9",
     "hash": "sha256-lMpbw7f4Im8BxD57s3s+mii5svedLbEifXGkUXrNe74="
   },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "1.1.0",
+    "hash": "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
   {
     "pname": "Microsoft.CodeAnalysis.NetAnalyzers",
     "version": "10.0.301",
@@ -124,6 +169,31 @@
     "version": "10.0.9",
     "hash": "sha256-qecYi4Zv3k1rMG66B5NUGv0GfUZwJ/CuFOZx/McApYk="
   },
+  {
+    "pname": "Microsoft.Diagnostics.NETCore.Client",
+    "version": "0.2.410101",
+    "hash": "sha256-+GC6mbob+nA9m40niHEJ/GanLYhvAx4RVjWaexcjmCA="
+  },
+  {
+    "pname": "Microsoft.Diagnostics.NETCore.Client",
+    "version": "0.2.510501",
+    "hash": "sha256-vaYSgSoyPH0XJ+CVZq+XlSyL1tJgZ5kEXKMwYx+1I9w="
+  },
+  {
+    "pname": "Microsoft.Diagnostics.Runtime",
+    "version": "3.1.512801",
+    "hash": "sha256-nDE0cI9oVGPE4aKsmq81ojRizZC/Oi+5W4N97bg3c4A="
+  },
+  {
+    "pname": "Microsoft.Diagnostics.Tracing.TraceEvent",
+    "version": "3.1.21",
+    "hash": "sha256-Zk2nRqnBMWdn5FHexMOGxFiqX95sJkYdLVd3T8TMPT8="
+  },
+  {
+    "pname": "Microsoft.DotNet.PlatformAbstractions",
+    "version": "3.1.6",
+    "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
+  },
   {
     "pname": "Microsoft.EntityFrameworkCore",
     "version": "10.0.9",
@@ -319,11 +389,21 @@
     "version": "10.0.9",
     "hash": "sha256-644xYxPB+PtwGUTAKJV9wByXHWFkR5Ol0p08wFQwMm4="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "2.1.1",
+    "hash": "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo="
+  },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "3.1.0",
     "hash": "sha256-BDrsqgiLYAphIOlnEuXy6iLoED/ykFO53merHCSGfrQ="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "6.0.0",
+    "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "10.0.0",
@@ -474,6 +554,11 @@
     "version": "3.0.271",
     "hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
   },
+  {
+    "pname": "Perfolizer",
+    "version": "0.5.3",
+    "hash": "sha256-rDhNfnyxl5fpMAQOM4dCxBBlbeh0gjSSk2sfXjHCksQ="
+  },
   {
     "pname": "prometheus-net",
     "version": "3.1.2",
@@ -644,6 +729,11 @@
     "version": "10.2.3",
     "hash": "sha256-7LJcUhAdEGhZ6CXIfjA1kDj+pZs3U6dgDTvX5KoXdIY="
   },
+  {
+    "pname": "System.CodeDom",
+    "version": "9.0.5",
+    "hash": "sha256-XIZLBpvIDxx6h6tfvG5wz2BJ6O4f1IwCXn1mC4RLXlY="
+  },
   {
     "pname": "System.Configuration.ConfigurationManager",
     "version": "8.0.0",
@@ -664,6 +754,16 @@
     "version": "8.0.1",
     "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg="
   },
+  {
+    "pname": "System.Management",
+    "version": "9.0.5",
+    "hash": "sha256-r1BSfaOI0SSl3ScAUXIYDiEjnljqEJ5Ncx3fXjtwTaU="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.7.0",
+    "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="
+  },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
     "version": "8.0.0",

pkgs/by-name/sl/slskd/package.nix

@@ -18,13 +18,13 @@ let
 in
 buildDotnetModule rec {
   pname = "slskd";
-  version = "0.26.2";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "slskd";
     repo = "slskd";
     tag = version;
-    hash = "sha256-NYJg56/wD1gVm1Pid9H84youkYXmN8WUHrMZa9DrG9s=";
+    hash = "sha256-dS7XowyprQx76Iw7we5j2Rpansk1BmFc5kYN0oYU9sU=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ buildDotnetModule rec {
     name = "${pname}-${version}-npm-deps";
     inherit src;
     sourceRoot = "${src.name}/${npmRoot}";
-    hash = "sha256-nfCT3yBvmRYneuOFD6wx0vUWyTxK0GQ6uOUIfzRT7tE=";
+    hash = "sha256-LtzJQ2x3VBdiAwYl8canAhRNmNk9SPP9LKFkYSDy9bM=";
   };
 
   projectFile = "src/slskd/slskd.csproj";

pkgs/by-name/sp/spectral-mic/package.nix

@@ -4,7 +4,6 @@
   fetchFromCodeberg,
   pkg-config,
   makeWrapper,
-  installShellFiles,
   libxkbcommon,
   wayland,
   libx11,
@@ -31,7 +30,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spectral-mic";
-  version = "0.10.0";
+  version = "0.9.0";
 
   __structuredAttrs = true;
 
@@ -39,16 +38,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "mmc";
     repo = "spectral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lHk4Tn7fYdc/emTat3x/Xs5h0bToFVr4zQ3P9w/Oe78=";
+    hash = "sha256-Uq/Xc6OzHitsUq2gawuRX8qZ52XGIGhXxV9BC+QXGig=";
   };
 
-  cargoHash = "sha256-pEUESRjdIYfYSAuIFrPnnCHVshVEAsyy7KxwojkUWlk=";
+  cargoHash = "sha256-xtLPe7kasHoSQl3Q/7iRSLjLeMMY9w1aw2yupTBDS00=";
 
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
     makeWrapper
-    installShellFiles
   ];
 
   buildInputs = [
@@ -61,8 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     install -Dm644 assets/page.codeberg.mmc.Spectral.metainfo.xml $out/share/metainfo/page.codeberg.mmc.Spectral.metainfo.xml
     install -Dm644 assets/spectral.png $out/share/icons/hicolor/512x512/apps/page.codeberg.mmc.Spectral.png
     install -Dm644 THIRD-PARTY.md $out/share/licenses/spectral-mic/THIRD-PARTY.md
-    installManPage assets/spectral.1
-    installShellCompletion assets/spectral.{bash,fish,zsh}
 
     # The GUI shells out to xdg-open for its Help links; hosts without
     # xdg-utils would otherwise fail the spawn silently.