From d390ce7dfa453024d16ce47b998b3a4d38d158d2 Mon Sep 17 00:00:00 2001 From: Nano Twerpus Date: Wed, 7 Aug 2024 01:49:41 -0400 Subject: [PATCH 01/94] llvmPackages_git.compiler-rt: disable building `ctx_profile` when build sanitizers are disabled https://github.com/llvm/llvm-project/pull/92456#issuecomment-2118873554 Fixes #329838 --- .../compilers/llvm/common/compiler-rt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 8417563cc95f..151b0d22657f 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -39,6 +39,7 @@ let haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; inherit (stdenv.hostPlatform) isMusl isAarch64; + noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc"; @@ -94,7 +95,7 @@ stdenv.mkDerivation ({ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" ] ++ lib.optionals (useLLVM && haveLibc) [ "-DCOMPILER_RT_BUILD_SANITIZERS=ON" - ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [ + ] ++ lib.optionals (noSanitizers) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -131,6 +132,8 @@ stdenv.mkDerivation ({ "-DCOMPILER_RT_ENABLE_IOS=OFF" ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-DSANITIZER_MIN_OSX_VERSION=10.10" + ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ + "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" ]; outputs = [ "out" "dev" ]; From fb3b6cd77b202cad1042876671705736851217f7 Mon Sep 17 00:00:00 2001 From: Vivek Date: Mon, 19 Aug 2024 21:03:32 -0700 Subject: [PATCH 02/94] update caddy service --- nixos/modules/services/web-servers/caddy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 59c0ab13de19..496705beff7b 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -356,6 +356,7 @@ in startLimitIntervalSec = 14400; startLimitBurst = 10; reloadTriggers = optional cfg.enableReload cfg.configFile; + restartTriggers = optional (! cfg.enableReload) cfg.configFile; serviceConfig = let runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}''; From 94db5b237d66742bbe2fd510d3a03852d15366fb Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 22 Jul 2024 17:21:16 +0800 Subject: [PATCH 03/94] pinit: init at 2.1.1 --- pkgs/by-name/pi/pinit/package.nix | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/pi/pinit/package.nix diff --git a/pkgs/by-name/pi/pinit/package.nix b/pkgs/by-name/pi/pinit/package.nix new file mode 100644 index 000000000000..b4d467c58810 --- /dev/null +++ b/pkgs/by-name/pi/pinit/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + blueprint-compiler, + wrapGAppsHook4, + libadwaita, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pinit"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "pinit"; + rev = finalAttrs.version; + hash = "sha256-unvlMytZdjVbrWlwkpw90NZoFw9A6Ga0bB2XqFEPuVE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + blueprint-compiler + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libgee + ]; + + meta = { + description = "Pin portable apps to the launcher"; + homepage = "https://github.com/ryonakano/pinit"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "com.github.ryonakano.pinit"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) From d931a1bebc8128781495afb51672d35b647aad57 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 20 Aug 2024 01:50:02 +0000 Subject: [PATCH 04/94] notation: move to by-name --- .../notation/default.nix => by-name/no/notation/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/notation/default.nix => by-name/no/notation/package.nix} (100%) diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/by-name/no/notation/package.nix similarity index 100% rename from pkgs/tools/security/notation/default.nix rename to pkgs/by-name/no/notation/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00d7e4813468..974fd41b140f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10779,8 +10779,6 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; - notation = callPackage ../tools/security/notation { }; - notify-osd = callPackage ../applications/misc/notify-osd { }; notes = qt6Packages.callPackage ../applications/office/notes { From 12fbf2405837420ea2a83e3952825f9f2e6adb43 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 29 Aug 2024 07:11:00 +0000 Subject: [PATCH 05/94] notation: 1.1.1 -> 1.2.0 --- pkgs/by-name/no/notation/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix index 3afd7bd27f2f..213b91cfa854 100644 --- a/pkgs/by-name/no/notation/package.nix +++ b/pkgs/by-name/no/notation/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "notation"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "notaryproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Pi4Ddlx8G4dRDz79yTiPBf6gf0wsvoE9CuyeVGrHst0="; + hash = "sha256-TliXrI5G+1Zw5vhrpEtcjDv2EjRjUsGEfwKOOf8vtZg="; }; - vendorHash = "sha256-REJPSBLXzIPAmxwzckufTqJvZCWUUkJLBmHTx2nv9QM="; + vendorHash = "sha256-kK4iwpzSz0JFnY1DbA7rjIzrqZO3imTCOfgtQKd0oV8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 974fd41b140f..9d67a6734cae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10779,6 +10779,10 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; + notation = callPackage ../by-name/no/notation/package.nix { + buildGoModule = buildGo123Module; + }; + notify-osd = callPackage ../applications/misc/notify-osd { }; notes = qt6Packages.callPackage ../applications/office/notes { From b1cad710043cd6e213da71ee84dd405e71daa658 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 30 Aug 2024 20:22:59 +0800 Subject: [PATCH 06/94] python312Packages.pytest-twisted: 1.14.2 -> 1.14.2-unstable-2024-08-22 --- pkgs/development/python-modules/pytest-twisted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 93e74cf1c01a..ca345bda486c 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.14.2"; + version = "1.14.2-unstable-2024-08-22"; pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-twisted"; - rev = "refs/tags/v${version}"; - hash = "sha256-1NkKTdk5D36VngJtBEdT42o1MmMT6stBne9KyC17518="; + rev = "0f10b1500aa6c46a2b206abc690a4e00e3c7556b"; + hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME="; }; build-system = [ setuptools ]; From d7c97a26b2130b1cb81c29caca655a7df08a04a4 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Fri, 30 Aug 2024 14:44:25 +0200 Subject: [PATCH 07/94] roslyn-ls: 4.12.0-1.24359.11 -> 4.12.0-2.24422.6 --- pkgs/by-name/ro/roslyn-ls/deps.nix | 13 ++++++------- pkgs/by-name/ro/roslyn-ls/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix index 27aa7a75d268..44e002ea2b45 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.nix +++ b/pkgs/by-name/ro/roslyn-ls/deps.nix @@ -16,7 +16,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-zMBpSXV8dlGI/3ZB9Lx4qQnAHFNCwsjuEAuQzxHWDJU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.7/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.7.nupkg"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.32/microsoft.aspnetcore.app.runtime.osx-x64.6.0.32.nupkg"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-TWXhiLxVkTem4aoBfWpVEhbWvfECfqJQqFP4X8BMhCY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.7/microsoft.aspnetcore.app.runtime.osx-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24327.6"; hash = "sha256-lK1mJ36CZKI+a6RKjAfmM0TD3zYYnasTzVnq3nFmI7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24327.6/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24327.6.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24366.2"; hash = "sha256-SUZfSiONzmTwDQsaTd7VTkE6IrzSu80giAPwrjvuY7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24366.2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24366.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.4"; hash = "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"; }) @@ -41,7 +41,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24352.2"; hash = "sha256-ABdgrKht2runHUtSNpTsv7BTDQaRA3AenjSwaof+3nA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24352.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24352.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24416.2"; hash = "sha256-MMfwLKBLTEtaNt896ueqH50zb/XyeXqpGJAC0O8yifw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24416.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24416.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; }) @@ -56,7 +56,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.1"; hash = "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.10.4"; hash = "sha256-nXY7YaIx6sXn7aMqpF4bW4d2J5U1KNb9sXqRSd8MpOc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.10.4/microsoft.net.stringtools.17.10.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; }) @@ -95,8 +95,8 @@ (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; hash = "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; hash = "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.11.8"; hash = "sha256-w6VeYf5feF1HGpz8g7u7ytEXH3Ve8LLkG+SM4uNpDj4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.11.8/microsoft.visualstudio.telemetry.17.11.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.41"; hash = "sha256-amoJoKroXLRzlpMGH6HwBLnOge4LqgnOmEitQvz/XHQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.10.41/microsoft.visualstudio.threading.17.10.41.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.41"; hash = "sha256-3hn7R+RHr6AInqPv3OrpsYiI7JdM2+qqIJlyG3kWptU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.41/microsoft.visualstudio.threading.analyzers.17.10.41.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.11.20"; hash = "sha256-yuNMLu4qKQpHcYHP2JN45u/dY8wvGHGaFFuHKizupcE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.11.20/microsoft.visualstudio.threading.17.11.20.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.11.20/microsoft.visualstudio.threading.analyzers.17.11.20.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.73"; hash = "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; }) @@ -208,7 +208,6 @@ (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; hash = "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg"; }) @@ -220,7 +219,7 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.0/system.text.json.8.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; hash = "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; }) diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 3207eea29d09..814cfc182695 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -10,18 +10,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.39.29"; + vsVersion = "2.45.17"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-E0gha6jZnXyRVH5XUuXxa7H9+2lfD9XTlQcNSiQycHA="; + hash = "sha256-5u+5UkcWn5XKxhbAbZeUBWBAI4B1nuZFP4qDF4cHerU="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.12.0-1.24359.11"; + version = "4.12.0-2.24422.6"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.nix; From 6986c2091f6ecde550279353f6847e7b5b1cfb58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Aug 2024 20:13:04 +0200 Subject: [PATCH 08/94] neard: 0.18 -> 0.19-unstable-2024-07-02 --- pkgs/servers/neard/default.nix | 71 ++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 12bfc319635e..d82043f2f5e0 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,69 +1,74 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , autoreconfHook , autoconf-archive +, gobject-introspection , pkg-config -, systemd +, wrapGAppsHook3 , glib , dbus , libnl -, python2Packages +, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "neard"; - version = "0.18"; + version = "0.19-unstable-2024-07-02"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz"; - sha256 = "wBPjEVMV4uEdFrXw8cjOmvvNuiaACq2RJF/ZtKXck4s="; + src = fetchFromGitHub { + owner = "linux-nfc"; + repo = "neard"; + rev = "a0a7d4d677800a39346f0c89d93d0fe43a95efad"; + hash = "sha256-6BgX7cJwxX+1RX3wU+HY/PIBgzomzOKemnl0SDLJNro="; }; + postPatch = '' + patchShebangs test/* + ''; + nativeBuildInputs = [ autoreconfHook autoconf-archive + gobject-introspection pkg-config - python2Packages.wrapPython + python3Packages.wrapPython + wrapGAppsHook3 + ]; + + dontWrapGApps = true; + + configureFlags = [ + "--enable-pie" + "--enable-test" + "--enable-tools" + "--with-sysconfdir=/etc" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; buildInputs = [ - systemd - glib dbus + glib libnl - ] ++ (with python2Packages; [ - python - ]); - - pythonPath = with python2Packages; [ - pygobject2 - dbus-python - pygtk ]; strictDeps = true; enableParallelBuilding = true; - configureFlags = [ - "--disable-debug" - "--enable-tools" - "--enable-ese" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + pythonPath = with python3Packages; [ + pygobject3 + dbus-python ]; - postInstall = '' - install -m 0755 tools/snep-send $out/bin/ + doCheck = true; - install -D -m644 src/main.conf $out/etc/neard/main.conf - - # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead - install -d $out/lib/neard - install -m 0755 test/* $out/lib/neard/ - wrapPythonProgramsIn $out/lib/neard "$out $pythonPath" + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapPythonProgramsIn "$out/lib/neard" "$pythonPath" ''; meta = with lib; { @@ -72,7 +77,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.unix; - # error: wcwidth-0.2.13 not supported for interpreter python2.7 - broken = true; # Added 2024-03-17 }; } From e972a34acb84f2c594b999485edd5f7905560cc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Aug 2024 20:14:59 +0200 Subject: [PATCH 09/94] nixos/neard: expose settings option --- nixos/modules/services/desktops/neard.nix | 69 ++++++++++++++++++++--- 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/desktops/neard.nix b/nixos/modules/services/desktops/neard.nix index 5d67adc09870..21a69a34001f 100644 --- a/nixos/modules/services/desktops/neard.nix +++ b/nixos/modules/services/desktops/neard.nix @@ -1,16 +1,69 @@ -# neard service. -{ config, lib, pkgs, ... }: { - ###### interface - options = { - services.neard = { - enable = lib.mkEnableOption "neard, an NFC daemon"; + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkIf + mkOption + types + ; + cfg = config.services.neard; + format = pkgs.formats.ini { }; + configFile = format.generate "neard.conf" cfg.settings; +in +{ + options.services.neard = { + enable = mkEnableOption "neard, an NFC daemon"; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + General = { + ConstantPoll = mkOption { + type = types.bool; + default = false; + description = '' + Enable constant polling. Constant polling will automatically trigger a new + polling loop whenever a tag or a device is no longer in the RF field. + ''; + }; + + DefaultPowered = mkOption { + type = types.bool; + default = true; + description = '' + Automatically turn an adapter on when being discovered. + ''; + }; + + ResetOnError = mkOption { + type = types.bool; + default = true; + description = '' + Power cycle the adapter when getting a driver error from the kernel. + ''; + }; + }; + }; + }; + default = {}; + description = '' + Neard INI-style configuration file as a Nix attribute set. + + See the upstream [configuration file](https://github.com/linux-nfc/neard/blob/master/src/main.conf). + ''; }; }; + config = mkIf cfg.enable { + environment.etc."neard/main.conf".source = configFile; - ###### implementation - config = lib.mkIf config.services.neard.enable { environment.systemPackages = [ pkgs.neard ]; services.dbus.packages = [ pkgs.neard ]; From b5d838aff647259a8d1a6c1265025b9115409e51 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 31 Aug 2024 08:59:41 +0200 Subject: [PATCH 10/94] qt6Packages.drumstick: format with nixfmt --- .../libraries/drumstick/default.nix | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 4b797031696a..5f1867cd5a2e 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchurl -, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null +{ + lib, + stdenv, + fetchurl, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + doxygen, + graphviz-nox, + pkg-config, + qttools, + wrapQtAppsHook, + alsa-lib, + fluidsynth, + libpulseaudio, + qtbase, + qtsvg, + sonivox, + qt5compat ? null, }: let @@ -15,22 +31,37 @@ stdenv.mkDerivation rec { hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; }; - patches = [ - ./drumstick-plugins.patch - ]; + patches = [ ./drumstick-plugins.patch ]; postPatch = '' substituteInPlace library/rt/backendmanager.cpp --subst-var out ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ - cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook + cmake + docbook_xml_dtd_45 + docbook_xml_dtd_45 + docbook_xsl + doxygen + graphviz-nox + pkg-config + qttools + wrapQtAppsHook ]; buildInputs = [ - alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox + alsa-lib + fluidsynth + libpulseaudio + qtbase + qtsvg + sonivox ] ++ lib.optionals isQt6 [ qt5compat ]; cmakeFlags = [ From f8bca49147e4d8f897097e1af21efd6c3ddb33af Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 31 Aug 2024 09:00:47 +0200 Subject: [PATCH 11/94] qt6Packages.drumstick: 2.9.0 -> 2.9.1 --- pkgs/development/libraries/drumstick/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 5f1867cd5a2e..3f2b1ba026ab 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -15,6 +15,7 @@ libpulseaudio, qtbase, qtsvg, + qtwayland, sonivox, qt5compat ? null, }: @@ -24,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; + hash = "sha256-U5Cm9pTDxC8NzyQfjaC/eBBDUWELV4jq4ov4QGefM9g="; }; patches = [ ./drumstick-plugins.patch ]; @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { libpulseaudio qtbase qtsvg + qtwayland sonivox ] ++ lib.optionals isQt6 [ qt5compat ]; From 584e028d6fb8632c01cf5b52301f2cbd30f0919d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:39:05 +0200 Subject: [PATCH 12/94] iotools: Move package definition into by-name directory Signed-off-by: Felix Singer --- .../misc/iotools/default.nix => by-name/io/iotools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/iotools/default.nix => by-name/io/iotools/package.nix} (100%) diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/by-name/io/iotools/package.nix similarity index 100% rename from pkgs/tools/misc/iotools/default.nix rename to pkgs/by-name/io/iotools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b096..3f7e819ad936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5414,8 +5414,6 @@ with pkgs; iotas = callPackage ../applications/office/iotas { }; - iotools = callPackage ../tools/misc/iotools { }; - jellycli = callPackage ../applications/audio/jellycli { }; jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; From 5fc67c2ab7b68e9bc58e6feee6a941163471e2e2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:43:40 +0200 Subject: [PATCH 13/94] libjaylink: Move package definition into by-name directory Signed-off-by: Felix Singer --- .../default.nix => by-name/li/libjaylink/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libjaylink/default.nix => by-name/li/libjaylink/package.nix} (100%) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/by-name/li/libjaylink/package.nix similarity index 100% rename from pkgs/development/libraries/libjaylink/default.nix rename to pkgs/by-name/li/libjaylink/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b096..3c5f0555f145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22227,8 +22227,6 @@ with pkgs; liburcu = callPackage ../development/libraries/liburcu { }; - libjaylink = callPackage ../development/libraries/libjaylink { }; - libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { }; libusb1 = callPackage ../development/libraries/libusb1 { From 8be51a78a90d3625cf8ad520af867d25acfd6269 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 1 Sep 2024 01:54:52 +0100 Subject: [PATCH 14/94] libkeyfinder: 2.2.6 -> 2.2.8 --- .../libraries/audio/libkeyfinder/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 0742297cb69f..d6f16f65df5d 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -1,30 +1,21 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2_3 }: stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; - rev = "v${version}"; - sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; + rev = version; + hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o="; }; - # in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21 - patches = [ - (fetchpatch { - name = "fix-pkg-config"; - url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch"; - sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; - nativeCheckInputs = [ catch2 ]; + nativeCheckInputs = [ catch2_3 ]; doCheck = true; From fa2686d939241cdfe8dbcd493c91eb34c7c5cf36 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 1 Sep 2024 01:54:52 +0100 Subject: [PATCH 15/94] keyfinder-cli: 1.1.1 -> 1.1.2 Includes fixes for FFmpeg 7. --- pkgs/applications/audio/keyfinder-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 9fe910d85769..1a4ac86cc213 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; rev = "v${version}"; - sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; + hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; }; - buildInputs = [ ffmpeg libkeyfinder ]; + buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; makeFlags = [ "PREFIX=$(out)" ]; From 521d3eb8c458c919d06d8cd588be472f3faa7135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 02:01:31 +0000 Subject: [PATCH 16/94] git-town: 15.1.0 -> 16.0.0 --- pkgs/applications/version-management/git-town/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 3654aadaf156..12b52ec042b8 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "15.1.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-e4lOyYQHsVOmOYKQ+3B2EdneWL8NEzboTlRKtO8Wdjg="; + hash = "sha256-aSnUJLoHq5byILuiNRrguawfBzL5as7u7ekAbuAmUgM="; }; vendorHash = null; From 8a65902cdc20815b77374b097b65e62c731e2fe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 05:16:11 +0000 Subject: [PATCH 17/94] yamlscript: 0.1.73 -> 0.1.74 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 14c9bbb5326d..0a27a3cfd54a 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.73"; + version = "0.1.74"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-FXw476RXIFnjnK8cz/Kxni4dZ58LJvevcxiotDO7+bQ="; + hash = "sha256-kAuUXOc3QQ9gxBO+HKZDGm5Y4H/lKeFzyiDlz+GMjv8="; }; executable = "ys"; From f04bb7b644f9c9946948d16794dd63ab940678ae Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:36:16 +0800 Subject: [PATCH 18/94] sdkmanager: 0.6.7 -> 0.6.8 --- .../python-modules/sdkmanager/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index b83579ae3a73..225600d17466 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -6,14 +6,15 @@ pythonAtLeast, argcomplete, requests, + setuptools, looseversion, gnupg, }: buildPythonPackage rec { pname = "sdkmanager"; - version = "0.6.7"; - format = "setuptools"; + version = "0.6.8"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -21,10 +22,14 @@ buildPythonPackage rec { owner = "fdroid"; repo = pname; rev = version; - hash = "sha256-8Iq3sVp9/dZi4zNZIgNm38ntoA2koS/Ism+pIVATr4Q="; + hash = "sha256-Ev90WS/T+Rb8h/21XHQdy/GePhGiYWwyfP88OUyBojQ="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "urllib3" ]; + + build-system = [ setuptools ]; + + dependencies = [ argcomplete requests ] ++ requests.optional-dependencies.socks ++ lib.optionals (pythonAtLeast "3.12") [ looseversion ]; From 7c00a455095f3ce2c951e24aa8b68864f1f4e218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 09:33:52 +0000 Subject: [PATCH 19/94] vault: 1.17.4 -> 1.17.5 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 54446d5d1061..32ad1196edca 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vault"; - version = "1.17.4"; + version = "1.17.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-4/oUL4VF7zN77/0BXVcj3foNXiK/IqN33p5/XEEk5ZM="; + hash = "sha256-OMA4c+Ot5xioRdI4z7zY4Eux8KxxIZ4opnT/xSc5oUk="; }; vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs="; From 554baf851537f72212a64282a3c6bef715cddec7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 13:19:44 +0200 Subject: [PATCH 20/94] qradiolink: 0.8.11-1 -> 0.9.0-1 --- pkgs/applications/radio/qradiolink/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index ab413ca82e38..035f97fd1915 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -19,17 +19,18 @@ , speex , speexdsp , cppzmq +, uhd }: gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.11-1"; + version = "0.9.0-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28="; + sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI="; }; preBuild = '' @@ -67,6 +68,7 @@ gnuradio3_8.pkgs.mkDerivation rec { libsndfile cppzmq gnuradio3_8.qwt + uhd ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ thrift gnuradio3_8.unwrapped.python.pkgs.thrift From 0d125ce7cf3431cfff5c9a71a71764606882ccc1 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 5 Sep 2024 14:08:15 +0200 Subject: [PATCH 21/94] firecracker: 1.8.0 -> 1.9.0 --- pkgs/by-name/fi/firecracker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index 7f93af1ced70..ffd22a70bf03 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -5,7 +5,7 @@ }: let - version = "1.8.0"; + version = "1.9.0"; # nixpkgs-update: no auto update suffix = @@ -32,8 +32,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-vImb2u+NCqew+vv0miv2R+AphVj0+u5Elw2HocbRri0="; - aarch64-linux = "sha256-ZLSc61MWfXYWv0/Sxz3vaWoyAlnqbgfPFEfJCRxfknE="; + x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc="; + aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k="; }; dontConfigure = true; From b13b8bf3cdb1b47311e080db619879865b5ef9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 14:02:42 +0000 Subject: [PATCH 22/94] emacsPackages.lsp-bridge: 0-unstable-2024-08-17 -> 0-unstable-2024-09-05 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 67becac274f5..adca228ca3e2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -29,13 +29,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2024-08-17"; + version = "0-unstable-2024-09-05"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "fe7a0729f9f46a0713b7049d20b25bb78d93f68f"; - hash = "sha256-lbtg1n72xNePs1DNpjy6Hvg4OhACk9vSfVwFffkeb0I="; + rev = "bd0cea9639bb902d22ec05189681eef1f1df7e17"; + hash = "sha256-QBtYSZAmdRhZqaR0/y0A1Q8fx62+owfdRiIVZOgWxkQ="; }; patches = [ From 3ab46c9f85b2b5b8c68c7f32865c91b7a20d0ca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 15:42:15 +0000 Subject: [PATCH 23/94] raspberrypi-eeprom: 2024.06.05-2712 -> 2024.07.30-2712 --- pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 4c72c2a4fd5e..28ad60cbf7c4 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.06.05-2712"; + version = "2024.07.30-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-VcMDDnM0VNr+Y+16ZChZdlEcmlHx6mYNCK0mrPMJHes="; + hash = "sha256-4rTq8O6TqE7vRr4o+/149FraYLmKFUQRUFffzC0aeIQ="; }; buildInputs = [ python3 ]; From 6269821e6fc6e6e25a4a3f55483db48c6b841ce2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 4 Sep 2024 23:28:18 +0200 Subject: [PATCH 24/94] vrcadvert: init at 1.0.0 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/vr/vrcadvert/deps.nix | 396 ++++++++++++++++++++++++++ pkgs/by-name/vr/vrcadvert/package.nix | 30 ++ 2 files changed, 426 insertions(+) create mode 100644 pkgs/by-name/vr/vrcadvert/deps.nix create mode 100644 pkgs/by-name/vr/vrcadvert/package.nix diff --git a/pkgs/by-name/vr/vrcadvert/deps.nix b/pkgs/by-name/vr/vrcadvert/deps.nix new file mode 100644 index 000000000000..52926e314d9e --- /dev/null +++ b/pkgs/by-name/vr/vrcadvert/deps.nix @@ -0,0 +1,396 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "MeaMod.DNS"; + version = "1.0.70"; + hash = "sha256-Hl6ZmKBbS6YZX7cc1Jp4/Hz6ksZqlFR7ZllbZgHzeYw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "6.0.2"; + hash = "sha256-VRyyMGCMBh25vIIzbLapMAqY8UffqJRvkF/kcYcjZfM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; + }) + (fetchNuGet { + pname = "System.CommandLine"; + version = "2.0.0-beta4.22272.1"; + hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.4"; + hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "VRChat.OSCQuery"; + version = "0.0.7"; + hash = "sha256-qivB0feWMAGYa6qE2pNK1Mhxt5xiFCICj9bEgUu2W+w="; + }) +] diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix new file mode 100644 index 000000000000..79a07252a077 --- /dev/null +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -0,0 +1,30 @@ +{ + buildDotnetModule, + fetchFromGitHub, + lib, +}: + +buildDotnetModule rec { + pname = "VrcAdvert"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "galister"; + repo = "VrcAdvert"; + rev = "v${version}"; + hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ="; + }; + + nugetDeps = ./deps.nix; + + executables = [ "VrcAdvert" ]; + + meta = { + description = "Advertise your OSC app through OSCQuery"; + homepage = "https://github.com/galister/VrcAdvert"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ Scrumplex ]; + mainProgram = "VrcAdvert"; + platforms = lib.platforms.all; + }; +} From 1ee3b55663fd151db3149f6cb509677df22e6754 Mon Sep 17 00:00:00 2001 From: 0x3f Date: Sun, 1 Sep 2024 17:59:40 +0200 Subject: [PATCH 25/94] maintainers: add 0x3f --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 64693c47043c..ceefa708f97b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -95,6 +95,11 @@ github = "0x120581f"; githubId = 130835755; }; + _0x3f = { + name = "0x3f"; + github = "0x3fiona"; + githubId = 178507884; + }; _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; matrix = "@0x4a6f:matrix.org"; From 0492444ea5ee5baafea360fb0cfd92bb0fa70d54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 19:54:41 +0000 Subject: [PATCH 26/94] sentry-cli: 2.34.1 -> 2.35.0 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index f90c06c3eee8..a39447e070ed 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.34.1"; + version = "2.35.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-TaBhYZYIoY1W+O7lMRFKlMAhoaz2emqVE9h6AB+jMbE="; + sha256 = "sha256-o93re2owDozZt5GdnoofRS6erfJH+69rxoEUsDZ2zmM="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-uCNlOsgrQNoHZvuoQDdxuvD4JCqi82OdGeKlphayPC8="; + cargoHash = "sha256-7bgME43pdW9Oe8olOq2OdswyapBg5b7zKFrjmubWyMc="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ From cebc8a3cf2118ffcb7504fc14a969e1d1100d8d1 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Thu, 5 Sep 2024 20:05:22 +0100 Subject: [PATCH 27/94] maintainers: add callumio --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 958948d62b19..f69cb983654f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3229,6 +3229,13 @@ githubId = 24193; name = "Dan Callahan"; }; + callumio = { + email = "git@cleslie.uk"; + github = "callumio"; + githubId = 16057677; + name = "Callum Leslie"; + keys = [ { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } ]; + }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; From 9838a041fb101639f66cb334669029d9395c3d58 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Thu, 5 Sep 2024 20:43:07 +0100 Subject: [PATCH 28/94] linuxPackages.nullfs: init at 0.17 --- pkgs/os-specific/linux/nullfs/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/os-specific/linux/nullfs/default.nix diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix new file mode 100644 index 000000000000..62a71829b2e1 --- /dev/null +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + fetchFromGitHub, + kernel, +}: +stdenv.mkDerivation rec { + pname = "nullfs"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "abbbi"; + repo = "nullfsvfs"; + rev = "v${version}"; + sha256 = "sha256-Hkplhem4Gb1xsYQtRSWub0m15Fiil3qJAO183ygP+WI="; + }; + + hardeningDisable = [ "pic" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + prePatch = '' + substituteInPlace "Makefile" \ + --replace-fail "/lib/modules/\$(shell uname -r)/build" "\$(KSRC)" + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/" + install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/ + runHook postInstall + ''; + + meta = with lib; { + description = "A virtual black hole file system that behaves like /dev/null"; + homepage = "https://github.com/abbbi/nullfsvfs"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ callumio ]; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d5bd0f19bac2..3c69f5f5ece8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -605,6 +605,8 @@ in { drbd = callPackage ../os-specific/linux/drbd/driver.nix { }; + nullfs = callPackage ../os-specific/linux/nullfs { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 From b22c0958707c0ef7070dbb354196ca84fce35713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 01:01:20 +0000 Subject: [PATCH 29/94] clusterctl: 1.8.1 -> 1.8.2 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index c100416a55c4..7774248cd30a 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-Z7cFwR8IUThEd4Te3KHPC8K8v56ymAG7nIM/7pxWq4U="; + hash = "sha256-7MTl1PzkcvnLZgpGQ+SA29Zb3h0iLMWQcN/FvQflM7s="; }; vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw="; From fc3e4ab52ac9e7ceb25134612d9c5b700f7c302a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 01:27:44 +0000 Subject: [PATCH 30/94] orchard: 0.22.1 -> 0.23.0 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 0e52c45ebdd3..24661422a58c 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-GdcDouGL6wshCdzKZ7TAm/Ty3c8dAsWQSNRlGIUIq2Y="; + hash = "sha256-cBl3dvLZGO8a3rc4bqw7eDcSn0mcUBo3AlkjmSPKp9E="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Xf/d0Zv+aSzJhE2+XtKFqhNnPZrtaNhM3IKnNb8JOTQ="; + vendorHash = "sha256-HphNpli6hYvmeIJlkkSzOZDbdqFL4XI+koUK9RvWfw8="; nativeBuildInputs = [ installShellFiles ]; From 92b1b371c4d6a133c47efe35ca565c6a710e1226 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 02:35:31 +0000 Subject: [PATCH 31/94] python312Packages.galois: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 139e103d40a1..a1688f1054f6 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA="; + hash = "sha256-DbmrrNw7XwTL4i6pJIfkBOUs+KGEmdV2FmQa1xfOHYU="; }; nativeBuildInputs = [ From 8bb9e868c4b9f2b44e821108ccb8e13ad09bd18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:18:16 +0000 Subject: [PATCH 32/94] ruff-lsp: 0.0.55 -> 0.0.56 --- pkgs/by-name/ru/ruff-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index c87b90ab5f5a..b85ad34fd203 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.55"; + version = "0.0.56"; pyproject = true; disabled = python3.pythonOlder "3.7"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-FFIZ8fDAPK03tnkjd2AUrz7iL8S9FziJQJKOxAisu48="; + hash = "sha256-L5bfGW5R9kDCK8zcFh+a/zquJefwKxOB0JdYDTyPFuQ="; }; postPatch = '' From c9be8e9821cdb94956dcecd5290bc1d42a037124 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:31:29 +0000 Subject: [PATCH 33/94] sesh: 2.0.2 -> 2.1.0 --- pkgs/by-name/se/sesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 8e5f95eb91de..cbd5c2b4ef91 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "sesh"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-oOr2jJAJuddyIPp9z7ottHFUDSpSyc5+PiNYyVD6Alg="; + hash = "sha256-IbXd+lk257nw+Kh9ziQ3f6vn387A7jkJB7MUAGfgDmU="; }; vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg="; From f7347881cb4c87cdf31497372cb69b5b60ad8d9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 06:52:20 +0000 Subject: [PATCH 34/94] hadolint-sarif: 0.6.5 -> 0.6.6 --- pkgs/by-name/ha/hadolint-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index d828d36bc1ae..a4fae90fb606 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "hadolint-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-wMb/taAAR0W8YVowNik0S8nFSmsD6LAQ5Egn0k52U74="; + hash = "sha256-v1rbM1HEZpSIS07x4GyICu6OR7PfH89wNywlXXPh1to="; }; - cargoHash = "sha256-OpUUmte/NfMNbyO3H4ikJF5ALnvfNkUBwFhIN9vefd0="; + cargoHash = "sha256-lojb6tESIl2kbVDUyoDf1CntvzJOtoZZJEyDs9PR7Gw="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 5902de231babb3265a4af9ab3a11fb078aaebc76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 07:04:30 +0000 Subject: [PATCH 35/94] sarif-fmt: 0.6.5 -> 0.6.6 --- pkgs/by-name/sa/sarif-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index c3dc24758ec5..37e59c4a332b 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "sarif-fmt"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-Zflwjj5ArNmE/7Im/O09kG07ZekCyz5jU2S3vpnlXT8="; + hash = "sha256-0LyTXyycdIq0FuBTxE9D7FRFfn4iZnDKOt+Rk4P1HwU="; }; - cargoHash = "sha256-hCtVfGutgvncb05zt+lSNdlrDO+UruSUahzrxaERjFE="; + cargoHash = "sha256-UpVZtZ3d0N/uL9+yc1gIO3SQsoqvUBMEDjdl9SDSKd8="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin From 07b9d93fd0f344d453e419983069f9fe42719b10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 07:04:45 +0000 Subject: [PATCH 36/94] shellcheck-sarif: 0.6.5 -> 0.6.6 --- pkgs/by-name/sh/shellcheck-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index c038301d52d5..1bc064992f5d 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "shellcheck-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-fvOxZd6xLyOm1OjK24Xx6uHz2e8eyIklX1kUAuRGcyY="; + hash = "sha256-NPf8BkrpqM/MaVha9/AIuUXPQpslslLFv0l9a0lzYyc="; }; - cargoHash = "sha256-jHOCjZ6NAU8YmAc2T1aCSaa2Yx9wkP361LZ2MKAWVLA="; + cargoHash = "sha256-YUyZZcSaBqnc216Hu+BAv1raNFRzSnikedr+/n8wTbE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From b5c156e5689ff32f1bf5c1514bbce70219cd112d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 07:06:19 +0000 Subject: [PATCH 37/94] clippy-sarif: 0.6.5 -> 0.6.6 --- pkgs/by-name/cl/clippy-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 063493ea35f3..199e6603866a 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "clippy-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-vwHb622JIJr+iRx/MhWdXoRULnKqtxx6HB4rv9zpYA8="; + hash = "sha256-GoVUOtxgLKEG+G1vgmFqtm0b2NRl4bhIe7DVo1tOqaw="; }; - cargoHash = "sha256-bRB6DedlvFsHcjTJQiGn///M9YOp1rl9FxXQlzuI0vo="; + cargoHash = "sha256-DZdU1QyIvzHm9UekqA2nZUKSRcgn7pKQFhPkPcAVFPY="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 55eb1b64451296ed0756f5c19f6aac6b6b46c699 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 08:16:58 +0000 Subject: [PATCH 38/94] ledfx: 2.0.99 -> 2.0.100 --- pkgs/applications/audio/ledfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 593fd72c6d0c..1a42bdc45819 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.99"; + version = "2.0.100"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig="; + hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0="; }; pythonRelaxDeps = true; From e81edcaded0ab770db700456c13e69feeeadc706 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Fri, 6 Sep 2024 02:16:03 -0700 Subject: [PATCH 39/94] eask: Rename eask -> eask-cli --- pkgs/by-name/ea/{eask => eask-cli}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/ea/{eask => eask-cli}/package.nix (97%) diff --git a/pkgs/by-name/ea/eask/package.nix b/pkgs/by-name/ea/eask-cli/package.nix similarity index 97% rename from pkgs/by-name/ea/eask/package.nix rename to pkgs/by-name/ea/eask-cli/package.nix index 3f7fb419795b..745830c0d5a9 100644 --- a/pkgs/by-name/ea/eask/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -5,7 +5,7 @@ }: buildNpmPackage rec { - pname = "eask"; + pname = "eask-cli"; version = "0.10.0"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8bc72301739f..c322fd984509 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -359,6 +359,7 @@ mapAliases ({ ### E ### EBTKS = ebtks; # Added 2024-01-21 + eask = eask-cli; # Added 2024-09-05 ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 From 613f2d5124c8f7c185f30e183a8c6bfe45436f70 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 23 Aug 2024 22:43:50 +0200 Subject: [PATCH 40/94] ayatana-indicator-bluetooth: init at 24.5.0 --- .../ayatana-indicator-bluetooth/package.nix | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix new file mode 100644 index 000000000000..59039f4f47e6 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix @@ -0,0 +1,82 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + cmake, + gettext, + glib, + gobject-introspection, + intltool, + libayatana-common, + lomiri, + pkg-config, + systemd, + vala, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-bluetooth"; + version = "24.5.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-bluetooth"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-EreOhrlWbSZtwazsvwWsPji2iLfQxr2LbjCI13Hrb28="; + }; + + postPatch = '' + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail '/etc' "\''${CMAKE_INSTALL_SYSCONFDIR}" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + gobject-introspection + intltool + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + lomiri.cmake-extras + glib + libayatana-common + systemd + ]; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + passthru = { + ayatana-indicators = { + ayatana-indicator-bluetooth = [ + "ayatana" + "lomiri" + ]; + }; + updateScript = gitUpdater { }; + }; + + meta = { + description = "Ayatana System Indicator for Bluetooth Management"; + longDescription = '' + This Ayatana Indicator exposes bluetooth functionality via the system + indicator API and provides fast user controls for Bluetooth devices. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.linux; + }; +}) From 00929036f88e1bb6642e3595f10656f341abe5f6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 23 Aug 2024 22:48:15 +0200 Subject: [PATCH 41/94] tests/ayatana-indicators: Add ayatana-indicators-bluetooth --- nixos/tests/ayatana-indicators.nix | 1 + pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 72d172d3885d..8d134e1af2ee 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -33,6 +33,7 @@ in packages = with pkgs; [ + ayatana-indicator-bluetooth ayatana-indicator-datetime ayatana-indicator-display ayatana-indicator-messages diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix index 59039f4f47e6..7f4eb6cef35a 100644 --- a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, gitUpdater, + nixosTests, cmake, gettext, glib, @@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; }; updateScript = gitUpdater { }; + tests.vm = nixosTests.ayatana-indicators; }; meta = { From 132b5ce9d31ea6c30a9573fa879fa72d444191d1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 24 Aug 2024 11:02:11 +0200 Subject: [PATCH 42/94] nixos/lomiri: Add bluetooth indicator --- nixos/modules/services/desktop-managers/lomiri.nix | 6 ++++++ nixos/tests/lomiri.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 151bdc42c725..a8b17d274060 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -50,6 +50,10 @@ in { }; }; + hardware = { + bluetooth.enable = lib.mkDefault true; + }; + networking.networkmanager.enable = lib.mkDefault true; systemd.packages = with pkgs.lomiri; [ @@ -87,6 +91,8 @@ in { ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session + ] ++ lib.optionals config.hardware.bluetooth.enable [ + ayatana-indicator-bluetooth ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 328d9656b5f5..b146cba93fe6 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -654,6 +654,7 @@ in machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there with subtest("ayatana indicator display works"): @@ -661,6 +662,11 @@ in wait_for_text("Lock") machine.screenshot("indicators_display") + with subtest("ayatana indicator bluetooth works"): + machine.send_key("right") + wait_for_text("Bluetooth settings") + machine.screenshot("indicators_bluetooth") + with subtest("lomiri indicator network works"): machine.send_key("right") wait_for_text(r"(Flight|Wi-Fi)") From 8d2ba0feaecb6a00905186a3881e498f4af640bd Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 3 Sep 2024 20:26:24 +0300 Subject: [PATCH 43/94] buildRustCrate: Fix rust-overlay usage I broke the usage of buildRustCrate with a toolchain from rust-overlay when I added support for wasm32-unknown-unknown, this change adds additional conditionals to restore the usage. The toolchain can now be overriden either through ``` buildRustCrate { rust = toolchain; cargo = toolchain } ``` or ``` buildRustCrate.override { rustc = toolchain; cargo = toolchain; } ``` They should now be consistent with each other. --- .../rust/build-rust-crate/build-crate.nix | 2 +- .../rust/build-rust-crate/default.nix | 31 ++++++++----------- pkgs/top-level/all-packages.nix | 15 +++++++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 3af13fe70a7d..4bf1b188cd1c 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -27,7 +27,7 @@ # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" - ++ lib.optional (stdenv.hostPlatform.linker == "lld") # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' + ++ lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' "-C linker=${rustc.llvmPackages.lld}/bin/lld" ++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld") "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 841e8e86cbfb..313e7601f617 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -16,16 +16,6 @@ }: let - # Returns a true if the builder's rustc was built with support for the target. - targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget - (lib.splitString "," (lib.removePrefix "--target=" ( - lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0) - )); - - # If the build's rustc was built with support for the target then reuse it. (Avoids uneeded compilation for targets like `wasm32-unknown-unknown`) - rustc' = if targetAlreadyIncluded then pkgsBuildBuild.rustc else rustc; - cargo' = if targetAlreadyIncluded then pkgsBuildBuild.cargo else cargo; - # Create rustc arguments to link against the given list of dependencies # and renames. # @@ -85,11 +75,6 @@ let inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; - buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; - rustc = rustc'; - }; - installCrate = import ./install-crate.nix { inherit stdenv; }; in @@ -103,7 +88,11 @@ crate_: lib.makeOverridable # The rust compiler to use. # # Default: pkgs.rustc - { rust + { rust ? rustc + # The cargo package to use for getting some metadata. + # + # Default: pkgs.cargo + , cargo ? cargo # Whether to build a release version (`true`) or a debug # version (`false`). Debug versions are faster to build # but might be much slower at runtime. @@ -262,6 +251,11 @@ crate_: lib.makeOverridable # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 crateBin = lib.filter (bin: !(bin ? name && bin.name == ",")) (crate.crateBin or [ ]); hasCrateBin = crate ? crateBin; + + buildCrate = import ./build-crate.nix { + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; + rustc = rust; + }; in stdenv.mkDerivation (rec { @@ -285,7 +279,7 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rustc' cargo' jq ] + nativeBuildInputs = [ rust cargo jq ] ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; @@ -392,7 +386,8 @@ crate_: lib.makeOverridable ) ) { - rust = rustc'; + rust = crate_.rust or rustc; + cargo = crate_.cargo or cargo; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 327ad752c650..9e8a9e6d2bec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15941,9 +15941,18 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { - stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. - }); + buildRustCrate = + let + # Returns a true if the builder's rustc was built with support for the target. + targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget + (lib.splitString "," (lib.removePrefix "--target=" ( + lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0 + ))); + in + callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { + stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. + } // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization. + ); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; From 8c3c9fb276a8597837706ee2d57b4699d4da313a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Sep 2024 16:29:27 +0200 Subject: [PATCH 44/94] matrix-appservice-irc: 3.0.0 -> 3.0.1 https://github.com/matrix-org/matrix-appservice-irc/releases/tag/3.0.1 --- .../matrix-synapse/matrix-appservice-irc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 86be2ddb41f8..e62e43ff7055 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -13,19 +13,19 @@ let pname = "matrix-appservice-irc"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZT8ugev+Tgu47KLuVVo5sFfiGtWLDc6JW5NZvsQ1mA8="; + hash = "sha256-LlcGcE3ik/xaiySyW5vfemGmukR7rlZrhfZOJwwfLDM="; }; yarnOfflineCache = fetchYarnDeps { name = "${pname}-${version}-offline-cache"; yarnLock = "${src}/yarn.lock"; - hash = "sha256-13OUcxZOlW1pp4uB1aRmqlzKf6rTgyP/nMnLmksXV3w="; + hash = "sha256-VUqi1OBuUeLbjDH0yBZDSkJBkaMWdzYddcHB5rikJwQ="; }; in From ceba9df0a0924637b5028ba658ad2653d8e9ad97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 17:37:08 +0000 Subject: [PATCH 45/94] libpulsar: 3.5.1 -> 3.6.0 --- pkgs/development/libraries/libpulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 2dabe89bc50b..f083ef041457 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "libpulsar"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-cpp"; rev = "v${version}"; - hash = "sha256-BSDkF0MAc54N59t7ozMLof0of4sURL3qiksLZhb+6I8="; + hash = "sha256-P1LhUH7V3EtWBXwPHQdN11mCjuyUyVdrtZsUItvC8xU="; }; nativeBuildInputs = [ cmake pkg-config ] From 77e1f40eeda4a3982028c5d68a2eef9846652565 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 6 Sep 2024 13:43:23 -0400 Subject: [PATCH 46/94] incus: 6.4.0 -> 6.5.0 --- pkgs/by-name/in/incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 2f458bc84da6..8703e43c61c7 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-fWc+qUAFlqMuiDhZzEY99rXHjKq40GPzplSN8ggId9g="; - version = "6.4.0"; - vendorHash = "sha256-j+ywLnN+/6HvMKOEr1FuXTLxUMX7VtU4eG3GGx3yAOo="; + hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc="; + version = "6.5.0"; + vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk="; patches = [ ]; } From 573794c4f9be5866098c1e23282cdb6af204460f Mon Sep 17 00:00:00 2001 From: 0x3f Date: Sun, 1 Sep 2024 18:34:40 +0200 Subject: [PATCH 47/94] magicard-cups-driver: init at 1.4.0 --- .../ma/magicard-cups-driver/CMakeLists.patch | 52 +++++++++++++ .../ma/magicard-cups-driver/package.nix | 78 +++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch create mode 100644 pkgs/by-name/ma/magicard-cups-driver/package.nix diff --git a/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch b/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch new file mode 100644 index 000000000000..419c3d205bba --- /dev/null +++ b/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt 2022-10-20 17:03:52.000000000 +0200 ++++ b/CMakeLists.txt 2024-09-05 21:39:27.172090291 +0200 +@@ -98,7 +98,9 @@ + src/magencd.c + src/rp2mag.c + src/utils.c +- src/rp2mag_encode.c) ++ src/rp2mag_encode.c ++ src/commandmb1.c ++ src/command_helper.c) + + target_compile_options(rastertoultra PRIVATE ${CUPS_CFLAGS}) + target_link_libraries(rastertoultra ${CUPS_LIBS}) +@@ -164,38 +166,3 @@ + ) + set(CPACK_VERBATIM_VARIABLES YES) + include(CPack) +- +-## TESTS +- +-add_subdirectory(test/unity EXCLUDE_FROM_ALL) +-add_executable(test_rp2_mag EXCLUDE_FROM_ALL test/test_rp2_mag.c +- src/rp2mag.c +- src/rp2mag_encode.c +- src/utils.c) +-target_compile_definitions(test_rp2_mag PRIVATE TEST) +-target_include_directories(test_rp2_mag PRIVATE src) +-target_link_libraries(test_rp2_mag unity) +- +-add_executable(test_dpi EXCLUDE_FROM_ALL test/test_dpi.c +- src/rastertoultra.c +- src/utils.c +- src/crc32.c +- src/rp2mag.c +- src/colrmtch.c +- src/rp2mag_encode.c +- src/magencd.c +- src/colour-profiles/magir2x.c +- src/colour-profiles/magiox.c +- src/colour-profiles/magiry.c) +-target_include_directories(test_dpi PRIVATE src) +-target_compile_definitions(test_dpi PRIVATE TEST) +-target_compile_options(test_dpi PRIVATE -Wno-unused-function) +-target_link_libraries(test_dpi unity m ${CUPS_LIBS}) +- +-enable_testing() +-add_test(test_rp2_mag test_rp2_mag) +-add_test(test_dpi test_dpi) +- +-# Autotools-style "make check" command +-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) +-add_dependencies(check test_rp2_mag test_dpi) diff --git a/pkgs/by-name/ma/magicard-cups-driver/package.nix b/pkgs/by-name/ma/magicard-cups-driver/package.nix new file mode 100644 index 000000000000..5d1c59754891 --- /dev/null +++ b/pkgs/by-name/ma/magicard-cups-driver/package.nix @@ -0,0 +1,78 @@ +{ + stdenv, + lib, + fetchzip, + cmake, + cups, +}: + +stdenv.mkDerivation rec { + pname = "magicard-cups-driver"; + version = "1.4.0"; + + src = fetchzip { + # https://support.magicard.com/solution/linux-driver/ + url = "https://f08ddbe93aa02eaf9a6c-f08cd513e3a8c914f4f8f62af1786149.ssl.cf3.rackcdn.com/magicard_ltd-linux_driver-${version}.tar.gz"; + hash = "sha256-1k2Twn1JBizw/tzQ0xF1uJIecblRd6VurB7FAUop5F0="; + }; + + src_v1_3_4 = fetchzip { + url = "https://techs.magicard.com/linux/v1.3.4/magicard_ltd-linux_driver-1.3.4.tar.gz"; + hash = "sha256-6UIL2wyFOjOJeyGjYScfjbpURycN469raye6DnP19jg="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ cups ]; + + # Replace the supplied cmake generated makefile (which is useless on a different machine) + # with the CMakeLists.txt taken from v1.3.4 of the driver and patch it to make it compatible with v1.4.0 + prePatch = '' + cp ${src_v1_3_4}/CMakeLists.txt CMakeLists.txt + rm makefile + ''; + + patches = [ ./CMakeLists.patch ]; + + cmakeFlags = [ + "-DCUPS_SERVER_BIN=lib/cups" + "-DCUPS_DATA_DIR=share/cups" + ]; + + meta = { + description = "CUPS driver for Magicard Printers"; + longDescription = '' + This driver supports Magicard printers and rebrands sold at least under the following brands: + + - Aisino + - AlphaCard + - BOOD + - Brady + - Cardmaker + - Centena + - DTP + - Digital ID + - DoH + - Elliaden + - Fagoo + - Goodcard + - Gudecard + - IDentilam + - IDville + - ilinkcard + - Intersider + - Magicard + - Orphicard + - PPC ID + - Polaroid + - PriceCardPro + - Pridento + - ScreenCheck + - Titan + - Ying + ''; + homepage = "https://support.magicard.com/solution/linux-driver/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x3f ]; + }; +} From a5049ccf8a0745d9d43df8b160fd919dbd47b778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Sep 2024 20:25:59 +0200 Subject: [PATCH 48/94] python312Packages.galois: refactor --- .../python-modules/galois/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index a1688f1054f6..50999a139bf0 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "galois"; version = "0.4.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,11 +25,14 @@ buildPythonPackage rec { hash = "sha256-DbmrrNw7XwTL4i6pJIfkBOUs+KGEmdV2FmQa1xfOHYU="; }; - nativeBuildInputs = [ - setuptools-scm + pythonRelaxDeps = [ + "numpy" + "numba" ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ numpy numba typing-extensions @@ -40,11 +43,6 @@ buildPythonPackage rec { pytest-xdist ]; - pythonRelaxDeps = [ - "numpy" - "numba" - ]; - pythonImportsCheck = [ "galois" ]; meta = with lib; { From a1f8ff0b6d43136d6cfb455f64aac3c49edab85e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 18:51:07 +0000 Subject: [PATCH 49/94] python312Packages.pyinstrument: 4.7.2 -> 4.7.3 --- pkgs/development/python-modules/pyinstrument/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 9019091a003d..4cda737f82e7 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.7.2"; + version = "4.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X28GRYlGrlDUcY+7teaCiJkG+kQ7p367TK0zOjfHi5o="; + hash = "sha256-Dvpx6Bf4obHL3inzIHhOrM3u/7X+0NRfEAyynDjtEwE="; }; nativeBuildInputs = [ From f5cf41fb938de37bf231eabb24855c695d3dca97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 18:52:30 +0000 Subject: [PATCH 50/94] stu: 0.5.1 -> 0.5.2 --- pkgs/by-name/st/stu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index 05c46f784ad7..fa931ff011d4 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -8,7 +8,7 @@ testers, }: let - version = "0.5.1"; + version = "0.5.2"; in rustPlatform.buildRustPackage { pname = "stu"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "lusingander"; repo = "stu"; rev = "v${version}"; - hash = "sha256-JLsUMZDXK89QmHLlGG9i5L+1e/redjk5ff6NiZdNsYo="; + hash = "sha256-R+ebDW6qkYK92seQHCWGKby544UrNGg+CfdK1NLIwas="; }; - cargoHash = "sha256-1sAK+F0Wghz2X78OzYJ3QN+5sdpNQw/pxHof0IoJPQo="; + cargoHash = "sha256-6uporgZTii97xLdEt7KXuSxoRMmFOGEGU3bPXP7Z14g="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From b59af8aadf76f4b18aaff3df595faaed9d0bb8df Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Sep 2024 00:15:55 +0200 Subject: [PATCH 51/94] python312Packages.rising: patch for python 3.12 --- pkgs/development/python-modules/rising/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 2c96fbf92eda..0e876aecbb05 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,6 +3,9 @@ buildPythonPackage, fetchFromGitHub, + # build-system + versioneer, + # dependencies lightning-utilities, numpy, @@ -15,8 +18,6 @@ pytestCheckHook, stdenv, - - pythonAtLeast, }: buildPythonPackage rec { @@ -33,6 +34,13 @@ buildPythonPackage rec { pythonRelaxDeps = [ "lightning-utilities" ]; + # Remove vendorized versioneer (incompatible with python 3.12) + postPatch = '' + rm versioneer.py + ''; + + build-system = [ versioneer ]; + dependencies = [ lightning-utilities numpy @@ -66,7 +74,5 @@ buildPythonPackage rec { homepage = "https://rising.rtfd.io"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; - # AttributeError: module 'configparser' has no attribute 'SafeConfigParser'. Did you mean: 'RawConfigParser'? - broken = pythonAtLeast "3.12"; }; } From fcccf4ccec111b7cc606b68237844d83d4a0fcae Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 6 Sep 2024 23:25:15 +0100 Subject: [PATCH 52/94] python312Packages.simpleaudio: crash fix --- .../python-modules/simpleaudio/default.nix | 2 + .../simpleaudio/python312-fix.patch | 98 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 pkgs/development/python-modules/simpleaudio/python312-fix.patch diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 71d9cb43c06d..8e336d4e61c2 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; }; + patches = [ ./python312-fix.patch ]; + buildInputs = [ alsa-lib ]; meta = with lib; { diff --git a/pkgs/development/python-modules/simpleaudio/python312-fix.patch b/pkgs/development/python-modules/simpleaudio/python312-fix.patch new file mode 100644 index 000000000000..4fc689fc8d3a --- /dev/null +++ b/pkgs/development/python-modules/simpleaudio/python312-fix.patch @@ -0,0 +1,98 @@ +From 6a7cb95c5af4537bad72bad9b190e09cb6d7883c Mon Sep 17 00:00:00 2001 +From: cexen +Date: Sun, 21 Jan 2024 21:01:29 +0900 +Subject: [PATCH] replace PyMem_* to PyMem_Raw* + +Fixes #72. +--- + c_src/posix_mutex.c | 4 ++-- + c_src/simpleaudio.c | 8 ++++---- + c_src/simpleaudio_win.c | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/c_src/posix_mutex.c b/c_src/posix_mutex.c +index 533a3f1..04619f1 100644 +--- a/c_src/posix_mutex.c ++++ b/c_src/posix_mutex.c +@@ -10,14 +10,14 @@ MIT License (see LICENSE.txt) + + void* create_mutex() { + void* mutex; +- mutex = PyMem_Malloc(sizeof(pthread_mutex_t)); ++ mutex = PyMem_RawMalloc(sizeof(pthread_mutex_t)); + pthread_mutex_init((pthread_mutex_t*)mutex, NULL); + return mutex; + } + + void destroy_mutex(void* mutex) { + pthread_mutex_destroy((pthread_mutex_t*)mutex); +- PyMem_Free(mutex); ++ PyMem_RawFree(mutex); + } + + void grab_mutex(void* mutex) { +diff --git a/c_src/simpleaudio.c b/c_src/simpleaudio.c +index edacba3..b0b24b8 100644 +--- a/c_src/simpleaudio.c ++++ b/c_src/simpleaudio.c +@@ -219,7 +219,7 @@ void delete_list_item(play_item_t* play_item) { + play_item->prev_item->next_item = play_item->next_item; + } + destroy_mutex(play_item->mutex); +- PyMem_Free(play_item); ++ PyMem_RawFree(play_item); + } + + /*********************************************/ +@@ -228,7 +228,7 @@ play_item_t* new_list_item(play_item_t* list_head) { + play_item_t* new_item; + play_item_t* old_tail; + +- new_item = PyMem_Malloc(sizeof(play_item_t)); ++ new_item = PyMem_RawMalloc(sizeof(play_item_t)); + new_item->next_item = NULL; + + old_tail = list_head; +@@ -269,13 +269,13 @@ void destroy_audio_blob(audio_blob_t* audio_blob) { + grab_mutex(audio_blob->list_mutex); + delete_list_item(audio_blob->play_list_item); + release_mutex(audio_blob->list_mutex); +- PyMem_Free(audio_blob); ++ PyMem_RawFree(audio_blob); + } + + /********************************************/ + + audio_blob_t* create_audio_blob() { +- audio_blob_t* audio_blob = PyMem_Malloc(sizeof(audio_blob_t)); ++ audio_blob_t* audio_blob = PyMem_RawMalloc(sizeof(audio_blob_t)); + + dbg1("created audio blob at %p\n", audio_blob); + +diff --git a/c_src/simpleaudio_win.c b/c_src/simpleaudio_win.c +index 5aed022..ba79d23 100644 +--- a/c_src/simpleaudio_win.c ++++ b/c_src/simpleaudio_win.c +@@ -57,8 +57,8 @@ MMRESULT fill_buffer(WAVEHDR* wave_header, audio_blob_t* audio_blob) { + if (audio_blob->num_buffers > 0) { + dbg2("done buffering - dellocating a buffer\n"); + +- PyMem_Free(wave_header->lpData); +- PyMem_Free(wave_header); ++ PyMem_RawFree(wave_header->lpData); ++ PyMem_RawFree(wave_header); + audio_blob->num_buffers--; + } + if (audio_blob->num_buffers == 0) { +@@ -182,9 +182,9 @@ PyObject* play_os(Py_buffer buffer_obj, int len_samples, int num_channels, int b + dbg1("allocating %d buffers of %d bytes\n", NUM_BUFS, buffer_size); + + for (i = 0; i < NUM_BUFS; i++) { +- temp_wave_hdr = PyMem_Malloc(sizeof(WAVEHDR)); ++ temp_wave_hdr = PyMem_RawMalloc(sizeof(WAVEHDR)); + memset(temp_wave_hdr, 0, sizeof(WAVEHDR)); +- temp_wave_hdr->lpData = PyMem_Malloc(buffer_size); ++ temp_wave_hdr->lpData = PyMem_RawMalloc(buffer_size); + temp_wave_hdr->dwBufferLength = buffer_size; + + result = fill_buffer(temp_wave_hdr, audio_blob); From d66577ee069bc634d6ade2c2e7367005d6b33983 Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Mon, 6 May 2024 01:54:46 -0400 Subject: [PATCH 53/94] lxgw-wenkai-screen: init at version 1.330 --- .../by-name/lx/lxgw-wenkai-screen/package.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/lx/lxgw-wenkai-screen/package.nix diff --git a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix new file mode 100644 index 000000000000..8719113c429a --- /dev/null +++ b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -0,0 +1,31 @@ +{ + stdenvNoCC, + fetchurl, + lib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lxgw-wenkai-screen"; + version = "1.330"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; + hash = "sha256-3C6gZmL5Bn6+26TfI2UdCCnGI8Vw4UTFJRc8n6qlP5o="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm644 "$src" "$out/share/fonts/truetype/LXGWWenKaiScreen.ttf" + runHook postInstall + ''; + + meta = { + description = "LXGW WenKai font optimized for screen reading"; + homepage = "https://github.com/lxgw/LxgwWenKai-Screen"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lebensterben ]; + }; +}) From 6423ae728c61ed65705d062c261aa1d4d949b592 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:04:01 +0200 Subject: [PATCH 54/94] libjaylink: Format package.nix Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index f313241d6d86..46d3ccefca17 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -1,6 +1,10 @@ -{ fetchFromGitLab, lib, stdenv -, autoreconfHook, pkg-config -, libusb1 +{ + fetchFromGitLab, + lib, + stdenv, + autoreconfHook, + pkg-config, + libusb1, }: stdenv.mkDerivation rec { @@ -15,7 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ libusb1 ]; postPatch = '' From 844c32097b6cec02f624fe43418894965c6e36e6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:07:53 +0200 Subject: [PATCH 55/94] libjaylink: Use SRI hash for source Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 46d3ccefca17..594726f6efe1 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; + hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; nativeBuildInputs = [ From 55f70de250b7d163147deba4f038ca5a535d82ca Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:18:55 +0200 Subject: [PATCH 56/94] iotools: Format package.nix Signed-off-by: Felix Singer --- pkgs/by-name/io/iotools/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iotools/package.nix b/pkgs/by-name/io/iotools/package.nix index 17330d9c19cb..182b8f977913 100644 --- a/pkgs/by-name/io/iotools/package.nix +++ b/pkgs/by-name/io/iotools/package.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "iotools"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; }; - makeFlags = [ "DEBUG=0" "STATIC=0" ]; + makeFlags = [ + "DEBUG=0" + "STATIC=0" + ]; installPhase = '' install -Dm755 iotools -t $out/bin @@ -30,7 +37,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/adurbin/iotools"; license = licenses.gpl2Only; maintainers = with maintainers; [ felixsinger ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; mainProgram = "iotools"; }; } From c25ca885562bb8eaaf737a3abbcf1f9c6dbe28cb Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Tue, 3 Sep 2024 22:25:11 +1000 Subject: [PATCH 57/94] nix-update-source: 0.6.3 -> 0.7.0 --- .../nix-update-source/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 13b158db81e0..9b21c1514046 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "nix-update-source"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { + hash = "sha256-+49Yb+rZ3CzFnwEpwj5xrcMUVBiYOJtCk9YeZ15IM/U="; owner = "timbertson"; repo = "nix-update-source"; rev = "version-${version}"; - sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; propagatedBuildInputs = [ nix-prefetch-scripts ]; @@ -34,20 +34,25 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; - updateScript = '' - #!${runtimeShell} - set -e - echo - cd ${toString ./.} - ${pkgs.nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo nix-update-source \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; + + updateScript = [ + runtimeShell + "-c" + '' + set -e + echo + cd ${toString ./.} + ${pkgs.nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo nix-update-source \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --nix-literal rev 'version-''${version}'\ + --modify-nix default.nix + '' + ]; }; meta = { From 1753f8f317fe0d337136ec841085f681c624a578 Mon Sep 17 00:00:00 2001 From: Kimb Date: Fri, 6 Sep 2024 20:48:26 -0400 Subject: [PATCH 58/94] maintainers: add mccartykim --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1932b01c3aa3..9774692837b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13144,6 +13144,12 @@ githubId = 10420834; name = "Mihai-Drosi Caju"; }; + mccartykim = { + email = "mccartykim@zoho.com"; + github = "mccartykim"; + githubId = 9851221; + name = "Kimberly McCarty"; + }; mccurdyc = { email = "mccurdyc22@gmail.com"; github = "mccurdyc"; From 688184a5fcb56035854c01c46eb31bca29f4237b Mon Sep 17 00:00:00 2001 From: Kimb Date: Fri, 6 Sep 2024 20:50:27 -0400 Subject: [PATCH 59/94] python3Packages.llm: add mccartykim to meta.maintainers --- pkgs/development/python-modules/llm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 7680577f6316..985e1d284cf8 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -81,7 +81,10 @@ let changelog = "https://github.com/simonw/llm/releases/tag/${version}"; license = licenses.asl20; mainProgram = "llm"; - maintainers = with maintainers; [ aldoborrero ]; + maintainers = with maintainers; [ + aldoborrero + mccartykim + ]; }; }; From 0a8a86723e354619741d8773f5370421ba66249d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Sep 2024 03:59:47 +0200 Subject: [PATCH 60/94] pkgs/by-name: Update manual migration guidelines Since this original guideline has been written, the new nixpkgs-merge-bot has appeared, and depends on packages being in `pkgs/by-name`. It's totally fine to move packages for that purpose only. Also update the guidelines to indicate that it might take some time still for the automated migration to be completed. --- pkgs/by-name/README.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index de21371cbffd..aacd1d084af5 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -79,18 +79,21 @@ and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-p ## Manual migration guidelines Most packages are still defined in `all-packages.nix` and the [category hierarchy](../README.md#category-hierarchy). -Please hold off migrating your maintained packages to this directory. +Since it would take a lot of contributor and reviewer time to migrate all packages manually, +an [automated migration is planned](https://github.com/NixOS/nixpkgs/pull/211832), +though it is expected to still take some time to get done. +If you're interested in helping out with this effort, +please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56). -1. An automated migration for the majority of packages [is being worked on](https://github.com/NixOS/nixpkgs/pull/211832). - In order to save on contributor and reviewer time, packages should only be migrated manually afterwards if they couldn't be migrated automatically. +Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests), +if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`. +To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR, +though this is not required and must not be expected. -1. Manual migrations should only be lightly encouraged if the relevant code is being worked on anyways. - For example with a package update or refactoring. - -1. Manual migrations should not remove definitions from `all-packages.nix` with custom arguments. - That is a backwards-incompatible change because it changes the `.override` interface. - Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`. - See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). +Note that definitions in `all-packages.nix` with custom arguments should not be removed. +That is a backwards-incompatible change because it changes the `.override` interface. +Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`. +See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). ## Limitations From aa1612edebea21182057cd46222c71e3a372c61a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:07:16 +0000 Subject: [PATCH 61/94] pastel: 0.9.0 -> 0.10.0 --- pkgs/applications/misc/pastel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index f77bf332b57d..e48c0bbcab7b 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc="; + sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; }; - cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; + cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; buildInputs = lib.optional stdenv.isDarwin Security; From a94479d719aa6c7f64b70a00730680b76c531194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:13:55 +0000 Subject: [PATCH 62/94] python312Packages.pulsectl-asyncio: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pulsectl-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 1a985c8ab1d3..8b7c70dc79eb 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pulsectl-asyncio"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mhthies"; repo = "pulsectl-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ="; + hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc="; }; build-system = [ setuptools ]; From 6accb8b96937c76f1180716a74a7c60270b121d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:45:54 +0000 Subject: [PATCH 63/94] whitesur-icon-theme: 2024-05-28 -> 2024-09-07 --- pkgs/data/icons/whitesur-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 588389f856ed..09c54a72287a 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-28"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-60pz/ET3jorEui31Aq6I3LMTz0djwWUv7poEI0USzJw="; + hash = "sha256-/cW/ymT9MjB07Sw7ifpr6x8oaaeI4PSyaOdLci7AncY="; }; nativeBuildInputs = [ gtk3 jdupes ]; From b151f8f35df5a8b3c3b2da118f39331a982971c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:46:15 +0000 Subject: [PATCH 64/94] vhs: 0.7.2 -> 0.8.0 --- pkgs/applications/misc/vhs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 82633111c33c..368a8163657b 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE="; + hash = "sha256-kUsh+jy4dXYW1uAUfFv/HKBqIIyVogLKUYNjBhIKlls="; }; - vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0="; + vendorHash = "sha256-1UBhiRemJ+dQNm20+8pbOJus5abvTwVcuzxNMzrniN8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 57b28b372fc3327d19be4763330e1d214be97e65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 04:16:23 +0000 Subject: [PATCH 65/94] python312Packages.slack-sdk: 3.31.0 -> 3.32.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 9f6e1cba8a5b..3a5573a50bb4 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.31.0"; + version = "3.32.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-6fuC2yIGtjIxnEiI2/1sQ5RZB18WlteozyS8/XDTwkg="; + hash = "sha256-lAFisE1So1h7xWzqZHbv1iJrVckzxT4vEU7mA2Vc7oA="; }; postPatch = '' From 9693d04f69df6e912e31b69138c1912bd9b247c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 04:16:34 +0000 Subject: [PATCH 66/94] termius: 9.3.2 -> 9.5.0 --- pkgs/applications/networking/termius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index e5ea9ae91dce..79ffd109e52d 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.3.2"; - revision = "200"; + version = "9.5.0"; + revision = "203"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-LPNwyDqVRFVAmhtZGpxoYEQK5B8BIdaV/ylTD0JfvAJAHWpGrbBJT1jMpT7LetNH5XQyXW81nY26JlcmXHaAwg=="; + hash = "sha512-BouIQvJZbi350l30gl9fnXKYRHhi5q1oOvyEIVEmd4DjXvJLQisV4cK4OZIJ/bPOCI5DTxNOY7PwEduVQd3SYA=="; }; desktopItem = makeDesktopItem { From 4cc9f32b136da870347c6a687cc5c93a339931b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 07:02:32 +0000 Subject: [PATCH 67/94] openfga-cli: 0.5.3 -> 0.6.0 --- pkgs/by-name/op/openfga-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index a1ca9738b61b..e5ebf9a2711c 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.5.3"; + version = "0.6.0"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-74wHhVGhLiuszRZBjxGGk9jfN+D6T1eZg8OFEkE3gPE="; + hash = "sha256-6bzVT+SnYAFDYdy5nyXPpmUuLsmjvUuaIlPkICjw30U="; }; - vendorHash = "sha256-TDjXy5zR5LJWVmIfAolHgzM7JElgyksHbv0NAS97QnU="; + vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8="; nativeBuildInputs = [ installShellFiles ]; From 00aec2800307f4c046e4cdf4ffcb00548b95b642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 07:05:53 +0000 Subject: [PATCH 68/94] kubescape: 3.0.16 -> 3.0.17 --- pkgs/tools/security/kubescape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 2b58b365a28d..25f004d99074 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.16"; + version = "3.0.17"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-bCL9M4bqdmK7CHF/GDAaVuIaAekkiLAMy1xxwq/nGUE="; + hash = "sha256-xErgJPtf89Zmjn2lyRSuVmHT692xzupxWuBsu547+E0="; fetchSubmodules = true; }; From 54216ceb22773bef033af6989effcd5aeb8d7035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 7 Sep 2024 09:19:18 +0200 Subject: [PATCH 69/94] pkgs/stdenv/freebsd: update x86_64-unknown-freebsd bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build/on-server/* 7fb16ac6da63effd126ecfa452032cee82742663ee8776ea0f66333814f0d9f7 /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build/on-server/bootstrap-tools.tar.xz aff88c12a32eab790f8bbaea08ef4917b0a52ea71ca2fcefe8093f1f40c1ff27 /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build/on-server/unpack.nar.xz Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build $ aws s3 cp --recursive --acl public-read /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build/on-server/ s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2 ./ $ sha256sum bootstrap-tools.tar.xz unpack.nar.xz $ sha256sum /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build/on-server/* --- .../x86_64-unknown-freebsd.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix index bc43eef9efc4..2b0d620b906d 100644 --- a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix +++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix @@ -1,13 +1,22 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd +# +# Metadata: +# - nixpkgs revision: 6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/271214352 +# - instantiated derivation: /nix/store/aahbgs95ani3bd70vxb8kwrvbms0d6ii-build.drv +# - output directory: /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build +# - build time: Sat, 31 Aug 2024 17:18:35 +0000 { + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/bootstrap-tools.tar.xz"; + hash = "sha256-f7Fqxtpj7/0Sbs+kUgMs7oJ0JmPuh3bqD2YzOBTw2fc="; + }; unpack = import { - url = "http://192.168.122.1:8000/result/on-server/unpack.nar.xz"; - hash = "sha256-y6quCU9JKnKBdHDcUkdkM0ypWDT2cdSiqR1WqA+8ozE="; - name = "boostrapUnpacked"; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/unpack.nar.xz"; + hash = "sha256-3NTRtonoc3ZqnEF3hr1mUPH/aw+04OlwVxGhZmjXlMM="; + name = "unpack"; unpack = true; }; - bootstrapTools = import { - url = "http://192.168.122.1:8000/result/on-server/bootstrap-tools.tar.xz"; - hash = "sha256-ypIOxsB8a/RPupki0ZTjb+vuE+ibtmS8e3DazeolHj8="; - name = "bootstrapTools.tar.xz"; - }; } From c8975035587f2136c42b76e9336fc8f052216bb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 07:56:44 +0000 Subject: [PATCH 70/94] cargo-binstall: 1.10.3 -> 1.10.4 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 45ddee8da311..9db54c7ed676 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-2Vo8zORVyWu0IA44K8BmXCjiFtdKJelZm/D6p5vqI2k="; + hash = "sha256-I6MyeKKqAxDb2BT6Uvmudw953kof1DIrZf1zmidwURo="; }; - cargoHash = "sha256-iKhP1P/8oz/0ulkLeZFiAdFGhhs3vZh6JGeQpmd1ZdQ="; + cargoHash = "sha256-tNYqUODqZSUb+p6JxZXWma5OE2v657yosObJ49Ei4+k="; nativeBuildInputs = [ pkg-config From 1938960bfea9923c36ee3960862259f6c6480884 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 7 Sep 2024 10:16:03 +0200 Subject: [PATCH 71/94] nixos/samba: fix conditional activation of samba services --- nixos/modules/services/network-filesystems/samba.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 71160659c90a..02688afb8aa5 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -183,7 +183,7 @@ in networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 137 138 ]; }) - (lib.mkIf cfg.nmbd.enable { + (lib.mkIf (cfg.enable && cfg.nmbd.enable) { systemd.services.samba-nmbd = { description = "Samba NMB Daemon"; documentation = [ "man:nmbd(8)" "man:samba(7)" "man:smb.conf(5)" ]; @@ -214,7 +214,7 @@ in }; }) - (lib.mkIf cfg.smbd.enable { + (lib.mkIf (cfg.enable && cfg.smbd.enable) { systemd.services.samba-smbd = { description = "Samba SMB Daemon"; documentation = [ "man:smbd(8)" "man:samba(7)" "man:smb.conf(5)" ]; @@ -250,7 +250,7 @@ in }; }) - (lib.mkIf cfg.winbindd.enable { + (lib.mkIf (cfg.enable && cfg.winbindd.enable) { systemd.services.samba-winbindd = { description = "Samba Winbind Daemon"; documentation = [ "man:winbindd(8)" "man:samba(7)" "man:smb.conf(5)" ]; From 62fae879a82e68ab4cc2e827ac000c3eddba7729 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sun, 18 Aug 2024 00:05:34 +0800 Subject: [PATCH 72/94] python3Packages.llvmlite: make it statically link to llvm Llvmlite doc says that they link to llvm statically, but it's not. Check - https://github.com/numba/llvmlite/issues/1027. - https://github.com/numba/llvmlite/blob/ca123c3ae2a6f7db865661ae509862277ec5d692/docs/source/faqs.rst#why-static-linking-to-llvm This behavior causes problems when python uses another version of llvm, for example, mesa llvmpipe. This PR force llvmlite statically link to llvm. Besides, this PR also use llvm as buildInputs rather than nativeBuildInputs since it's a library that llvmlite use rather than a part of build system. This PR also cleans outdated patches. --- .../python-modules/llvmlite/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 9fdcab6d7534..9d76e64fde35 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -6,12 +6,14 @@ isPyPy, pythonAtLeast, - # build-system - llvm, setuptools, # tests pytestCheckHook, + llvm, + libxml2, + + withStaticLLVM ? true, }: buildPythonPackage rec { @@ -28,24 +30,19 @@ buildPythonPackage rec { hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; }; - nativeBuildInputs = [ - llvm - setuptools - ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace llvmlite/tests/test_binding.py \ - --replace-fail "test_linux" "nope" + buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ]; + + postPatch = lib.optionalString withStaticLLVM '' + substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all" ''; # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm.dev}/bin/llvm-config - ''; + env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config"; + + nativeCheckInputs = [ pytestCheckHook ]; - nativeCheckInputs = [ - pytestCheckHook - ]; # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' cd $out @@ -53,7 +50,7 @@ buildPythonPackage rec { __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - passthru.llvm = llvm; + passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; }; meta = { changelog = "https://github.com/numba/llvmlite/blob/v${version}/CHANGE_LOG"; From de5a0215fb3dedbf589f60101c249c6f649031ea Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 7 Sep 2024 11:54:02 +0300 Subject: [PATCH 73/94] lazygit: 0.43.1 -> 0.44.0 --- pkgs/by-name/la/lazygit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 4f7134692ba5..6d3e74a04758 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - hash = "sha256-iFx/ffaijhOqEDRW1QVzhQMvSgnS4lKFOzq1YdlkUzc="; + hash = "sha256-bJ2wdS0BCAGjfbnMoQSUhw/xAkC5HPRklefXx2ux078="; }; vendorHash = null; From 16e1ffe0432efb7941b7a16541495180264fdab7 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 7 Sep 2024 12:17:54 +0300 Subject: [PATCH 74/94] subtitleedit: 4.0.7 -> 4.0.8 --- pkgs/by-name/su/subtitleedit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index e672b04c2436..7de6d0ba2f4a 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.7"; + version = "4.0.8"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-7BTW0wqlxyxtXu4aBVQXMQ1mUdSINn+S6W7XPL5pcSI="; + hash = "sha256-pUCuAxCljRu1fXPQIBDWtkC17RBD+Bv6Nx5Tw/ACuXw="; stripRoot = false; }; From e3e191400987f90e4b4ae40d25fdc530744f80fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 09:40:42 +0000 Subject: [PATCH 75/94] picocrypt-cli: 2.06 -> 2.07 --- pkgs/by-name/pi/picocrypt-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix index 392082ecb8bc..21812f4b1492 100644 --- a/pkgs/by-name/pi/picocrypt-cli/package.nix +++ b/pkgs/by-name/pi/picocrypt-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "picocrypt-cli"; - version = "2.06"; + version = "2.07"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "CLI"; rev = version; - hash = "sha256-vxHYTgNVhTTN1yQkqjvlzqq7pV0XiQqTHI9HqIUVyR4="; + hash = "sha256-z6xtqo0VBLneXNaP6NdyuHTX905cqrzxvECIHVBGNlY="; }; sourceRoot = "${src.name}/picocrypt"; From 465962afef8bf6db37b78a6cc962f20fe21d138e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 09:42:04 +0000 Subject: [PATCH 76/94] nixpacks: 1.27.0 -> 1.28.1 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 6f7142cace5f..772cc2189d99 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.27.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aIg+CuWa97FlSs8kOFe6BxV2lB4M6R8QosoSomFPqFA="; + sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ="; }; - cargoHash = "sha256-4Q6nduLEK2ym+3o3OD8jJwpl+sLbryk/TzoOSd/d4yE="; + cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50="; # skip test due FHS dependency doCheck = false; From 5b8050054f29c851915f106ade3fdaa7f6f26efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 09:46:33 +0000 Subject: [PATCH 77/94] openfga: 1.5.9 -> 1.6.0 --- pkgs/by-name/op/openfga/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index a1f4d8cf2e92..2c97f9849b10 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.9"; + version = "1.6.0"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-btk7I1jHWJfV1KgWpPXbKbn1f/2MnLrqA0HuHD3fSQc="; + hash = "sha256-Y0ffBbNQFPGoLq2B9HtImU1tH0JqhvPYgftNCUQtcJo="; }; - vendorHash = "sha256-rU45E9yEh7a1MrbnzFFuNeMpfbODO2O7tqEaiv7CA9Y="; + vendorHash = "sha256-+awhoYHstxLarPRDIzETAx0wR8TqoyDz3iFSQxH2vG4="; nativeBuildInputs = [ installShellFiles ]; From e931c242b654db6c601199808fa88ade9dd757dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 11:04:00 +0000 Subject: [PATCH 78/94] poethepoet: 0.27.0 -> 0.28.0 --- pkgs/by-name/po/poethepoet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index 75e0224742ff..7760d53e9312 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.27.0"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "refs/tags/v${version}"; - hash = "sha256-2AxNu4/tTTH5aW02ec83jxhLJoDKSogY/fm8PUm1cSg="; + hash = "sha256-um17UHFLX7zLQXLWbYnEnaLUwMgFSxdGt85fjMBEhjQ="; }; nativeBuildInputs = [ From bbe02809f6c4718e37384a9dd7276a511998eab3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 11:38:35 +0000 Subject: [PATCH 79/94] remote-touchpad: 1.4.6 -> 1.4.8 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 88c6db4842ef..59e448c46170 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LytZBVubsGajx4hFYwP3MwHkAW7LlIr77aVLpeHwWxU="; + sha256 = "sha256-C/qaLEYvIbl0XINsumAFLnsQgy+EDjoX446BJnuE6eQ="; }; buildInputs = [ libXi libXrandr libXt libXtst ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-vL6kSm0yPEn5TNpB6E+2+Xjm/ANNUxgA8XEWz9n7kHI="; + vendorHash = "sha256-bt5KUgNDgWX7CVHvX5c0uYqoxGRDbGbae52+mpnBEZU="; meta = with lib; { description = "Control mouse and keyboard from the web browser of a smartphone"; From 5828cef58bdb680d576fe748e4255484928ea8f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 11:59:48 +0000 Subject: [PATCH 80/94] serie: 0.2.0 -> 0.3.0 --- pkgs/by-name/se/serie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index e13b53b30fdc..f003e5b80390 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-0NQ/csgAoD15fyuXCDgABF6eDEITwJk98qPL81IptJA="; + hash = "sha256-LjWpWgOInnPL4Ke8Ntk+bEJBljPSEe14RCKzN50JUGA="; }; - cargoHash = "sha256-4Mic+hFBmId01k4AmOBA2matf28Py3mVOsVNWgqaMA0="; + cargoHash = "sha256-Ynnp7jSnkNHbL98JOXjV6v97IXWwi2HiZC5SkChCRv0="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From c389eaa1e61953f9d91fc4ccc264fae0c0c2b2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 12:30:16 +0000 Subject: [PATCH 81/94] boxbuddy: 2.2.10 -> 2.2.11 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 17694f6abe61..4ba6c90fdeb8 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-q09yrFO/qBXr/O3tK7seqWyBEraQ7VJB39RukS6v+ys="; + hash = "sha256-MPeGaAoKbLit/d0UCZjAEso4i2vZ8H4D8Ia8Mutqnvg="; }; - cargoHash = "sha256-Ow16RxhauuisQ+GiJ5TdFa0D9FcgmAjwnk7WenXoQYo="; + cargoHash = "sha256-5tSM5sqrePpP7YOLuKi4i78F48oSexLVHQSyx6g7fio="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 4b632e63b42e40d7a285b848d38efabbf9a2d41e Mon Sep 17 00:00:00 2001 From: Funkeleinhorn Date: Sat, 7 Sep 2024 14:33:33 +0200 Subject: [PATCH 82/94] flashprog: add funkeleinhorn as maintainer --- pkgs/by-name/fl/flashprog/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 746ab572bb32..b0bb52f1d383 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ felixsinger ]; + maintainers = with maintainers; [ felixsinger funkeleinhorn ]; platforms = platforms.all; mainProgram = "flashprog"; }; From 02e696a3bc7710561d662824112c2445a5039da7 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Sep 2024 15:19:43 +0800 Subject: [PATCH 83/94] amp: format with nixfmt-rfc-style --- pkgs/applications/editors/amp/default.nix | 38 ++++++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index e559ceb73ec7..dac368068f82 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin -, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, + python3, + xorg, + cmake, + libgit2, + darwin, + curl, +}: rustPlatform.buildRustPackage rec { pname = "amp"; @@ -14,9 +26,25 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4c72l3R9OyxvslKC4RrIu/Ka3grGxIUCY6iF/NHS5X8="; - nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + buildInputs = + [ + openssl + xorg.libxcb + libgit2 + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + curl + Security + AppKit + ] + ); # Tests need to write to the theme directory in HOME. preCheck = "export HOME=`mktemp -d`"; From 7905b1a5a816b12daf9950552fdd013c0064fbd0 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Sep 2024 15:20:45 +0800 Subject: [PATCH 84/94] amp: move to pkgs/by-name --- .../editors/amp/default.nix => by-name/am/amp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/editors/amp/default.nix => by-name/am/amp/package.nix} (100%) diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/by-name/am/amp/package.nix similarity index 100% rename from pkgs/applications/editors/amp/default.nix rename to pkgs/by-name/am/amp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eef06aced26..a5d506b2c03a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3042,8 +3042,6 @@ with pkgs; ammonite_2_13; ammonite = ammonite_2_13; - amp = callPackage ../applications/editors/amp { }; - ams = callPackage ../applications/audio/ams { }; amtterm = callPackage ../tools/system/amtterm { }; From 11eb2396e6e1d3ff526d496c1ae118b8e82b05c8 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Sep 2024 15:35:32 +0800 Subject: [PATCH 85/94] amp: fix build due to rust 1.80 update --- pkgs/by-name/am/amp/package.nix | 4 +- pkgs/by-name/am/amp/update_time_crate.patch | 56 +++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/am/amp/update_time_crate.patch diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index dac368068f82..c92ca977d364 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -24,7 +24,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; }; - cargoHash = "sha256-4c72l3R9OyxvslKC4RrIu/Ka3grGxIUCY6iF/NHS5X8="; + cargoPatches = [ ./update_time_crate.patch ]; + + cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/am/amp/update_time_crate.patch b/pkgs/by-name/am/amp/update_time_crate.patch new file mode 100644 index 000000000000..92f6ad73c9ea --- /dev/null +++ b/pkgs/by-name/am/amp/update_time_crate.patch @@ -0,0 +1,56 @@ +From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001 +From: Drewry Pope +Date: Wed, 28 Aug 2024 18:45:41 -0500 +Subject: [PATCH] update time + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 0e1b8ff6..bd8b5814 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -864,6 +864,12 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.16" +@@ -1372,12 +1378,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + From fdda62acd50c0d1432b127c0e38fa9f6884bd20c Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Sep 2024 15:36:53 +0800 Subject: [PATCH 86/94] amp: refactor --- pkgs/by-name/am/amp/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index c92ca977d364..36cc922420ce 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "jmacdonald"; - repo = pname; + repo = "amp"; rev = version; - sha256 = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; + hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; }; cargoPatches = [ ./update_time_crate.patch ]; @@ -51,12 +51,11 @@ rustPlatform.buildRustPackage rec { # Tests need to write to the theme directory in HOME. preCheck = "export HOME=`mktemp -d`"; - meta = with lib; { + meta = { description = "Modern text editor inspired by Vim"; homepage = "https://amp.rs"; - license = [ licenses.gpl3 ]; - maintainers = [ maintainers.sb0 ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sb0 ]; mainProgram = "amp"; }; } From 71419b8dcf66093c370a5d3ab024c4ad093c003f Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Sep 2024 15:37:16 +0800 Subject: [PATCH 87/94] amp: add aleksana to maintainers --- pkgs/by-name/am/amp/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index 36cc922420ce..ebb662ee11c8 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -55,7 +55,10 @@ rustPlatform.buildRustPackage rec { description = "Modern text editor inspired by Vim"; homepage = "https://amp.rs"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sb0 ]; + maintainers = with lib.maintainers; [ + sb0 + aleksana + ]; mainProgram = "amp"; }; } From 41ab86b1d039aa17da723afb1e97c418c993e4f8 Mon Sep 17 00:00:00 2001 From: Bryan Honof Date: Sat, 7 Sep 2024 16:33:58 +0200 Subject: [PATCH 88/94] cuetsy: init at 0.1.11 (#340223) * cuetsy: init at 0.1.11 * Update package.nix Co-authored-by: Aleksana --------- Co-authored-by: Aleksana --- pkgs/by-name/cu/cuetsy/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/cu/cuetsy/package.nix diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix new file mode 100644 index 000000000000..e7afa8b140ad --- /dev/null +++ b/pkgs/by-name/cu/cuetsy/package.nix @@ -0,0 +1,27 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: + +buildGoModule rec { + pname = "cuetsy"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "cuetsy"; + rev = "v${version}"; + hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0="; + }; + + vendorHash = "sha256-CDa7ZfbVQOIt24VZTy4j0Dn24nolmYa0h9zgrJ3QTeY="; + + meta = { + description = "Experimental CUE->TypeScript exporter"; + homepage = "https://github.com/grafana/cuetsy"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bryanhonof ]; + mainProgram = "cuetsy"; + }; +} From 17ed2a5b50079412f8e19ae4cfa26fb308b1efd1 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 7 Sep 2024 10:42:49 -0400 Subject: [PATCH 89/94] incus: apply qemu 9.1 patches --- ...b7e3ec65b4d0e166e2127d9f1835320165b8.patch | 29 ++++++++++++++++ ...fb06f66f83ca95efa1b9386fceeaa1c9e11b.patch | 28 ++++++++++++++++ ...b4eeee8a9e7f9fa9c62443d00f0ec6797078.patch | 33 +++++++++++++++++++ pkgs/by-name/in/incus/package.nix | 7 +++- 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch create mode 100644 pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch create mode 100644 pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch diff --git a/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch b/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch new file mode 100644 index 000000000000..d4f9cfccc21a --- /dev/null +++ b/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch @@ -0,0 +1,29 @@ +From 0c37b7e3ec65b4d0e166e2127d9f1835320165b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Fri, 6 Sep 2024 17:07:11 -0400 +Subject: [PATCH] incusd/instance/qemu: Make O_DIRECT conditional on + directCache +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stéphane Graber +--- + internal/server/instance/drivers/driver_qemu.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go +index 5a94c9db43..9609b73c1b 100644 +--- a/internal/server/instance/drivers/driver_qemu.go ++++ b/internal/server/instance/drivers/driver_qemu.go +@@ -4276,7 +4276,9 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] + permissions = unix.O_RDONLY + } + +- permissions |= unix.O_DIRECT ++ if directCache { ++ permissions |= unix.O_DIRECT ++ } + + f, err := os.OpenFile(driveConf.DevPath, permissions, 0) + if err != nil { diff --git a/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch b/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch new file mode 100644 index 000000000000..e918deb8569c --- /dev/null +++ b/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch @@ -0,0 +1,28 @@ +From 572afb06f66f83ca95efa1b9386fceeaa1c9e11b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Fri, 6 Sep 2024 15:51:35 -0400 +Subject: [PATCH] incusd/instance/qemu: Set O_DIRECT when passing in FDs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is required in most cases with QEMU 9.1.0. + +Signed-off-by: Stéphane Graber +--- + internal/server/instance/drivers/driver_qemu.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go +index 37da21f42f..e25aab0667 100644 +--- a/internal/server/instance/drivers/driver_qemu.go ++++ b/internal/server/instance/drivers/driver_qemu.go +@@ -4277,6 +4277,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] + permissions = unix.O_RDONLY + } + ++ permissions |= unix.O_DIRECT ++ + f, err := os.OpenFile(driveConf.DevPath, permissions, 0) + if err != nil { + return fmt.Errorf("Failed opening file descriptor for disk device %q: %w", driveConf.DevName, err) diff --git a/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch b/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch new file mode 100644 index 000000000000..10ca57733409 --- /dev/null +++ b/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch @@ -0,0 +1,33 @@ +From 58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Fri, 6 Sep 2024 17:10:01 -0400 +Subject: [PATCH] incusd/instance/qemu: Force threads I/O mode for + unsafe/writeback +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The default "native" aioMode requires direct I/O which is incompatible +with unsafe/writeback. + +Signed-off-by: Stéphane Graber +--- + internal/server/instance/drivers/driver_qemu.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go +index 9609b73c1b..a5a4944d40 100644 +--- a/internal/server/instance/drivers/driver_qemu.go ++++ b/internal/server/instance/drivers/driver_qemu.go +@@ -4088,9 +4088,11 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] + noFlushCache := false // Don't ignore any flush requests for the device. + + if cacheMode == "unsafe" { ++ aioMode = "threads" + directCache = false + noFlushCache = true + } else if cacheMode == "writeback" { ++ aioMode = "threads" + directCache = false + } + diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 8703e43c61c7..d7383c210b12 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -2,5 +2,10 @@ import ./generic.nix { hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc="; version = "6.5.0"; vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk="; - patches = [ ]; + patches = [ + # qemu 9.1 compat, remove in 6.6 + ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch + ./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch + ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch + ]; } From 597b2976e7917ce79d43932157aaf9e62c140924 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 7 Sep 2024 09:21:22 +0200 Subject: [PATCH 90/94] envision-unwrapped: fix update script Signed-off-by: Sefa Eyeoglu --- .../by-name/en/envision-unwrapped/package.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 136491c5c142..caab441723b5 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -1,31 +1,30 @@ { - lib, - stdenv, - fetchFromGitLab, - writeScript, appstream-glib, - cargo, - meson, - ninja, - pkg-config, - rustPlatform, - rustc, - wrapGAppsHook4, cairo, + cargo, desktop-file-utils, + fetchFromGitLab, gdb, gdk-pixbuf, glib, gtk4, gtksourceview5, + lib, libadwaita, libgit2, libusb1, + meson, + ninja, + nix-update-script, openssl, pango, + pkg-config, + rustPlatform, + rustc, + stdenv, vte-gtk4, + wrapGAppsHook4, zlib, - unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -80,11 +79,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : "${lib.makeBinPath [ gdb ]}" ''; - passthru.updateScript = writeScript "envision-update" '' - source ${builtins.head (unstableGitUpdater { })} - - cp $tmpdir/Cargo.lock ./pkgs/by-name/en/envision-unwrapped/Cargo.lock - ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; meta = { description = "UI for building, configuring and running Monado, the open source OpenXR runtime"; From 764f7c1011f1fc6a26b1831bc7b7612562cd53a5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 7 Sep 2024 09:24:01 +0200 Subject: [PATCH 91/94] envision-unwrapped: 0-unstable-2024-07-03 -> 0-unstable-2024-09-06 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/en/envision-unwrapped/Cargo.lock | 580 ++++++++++++------ .../by-name/en/envision-unwrapped/package.nix | 13 +- 2 files changed, 390 insertions(+), 203 deletions(-) diff --git a/pkgs/by-name/en/envision-unwrapped/Cargo.lock b/pkgs/by-name/en/envision-unwrapped/Cargo.lock index 38d9964de6ff..06e4c6ebff42 100644 --- a/pkgs/by-name/en/envision-unwrapped/Cargo.lock +++ b/pkgs/by-name/en/envision-unwrapped/Cargo.lock @@ -28,9 +28,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading 0.8.5", +] [[package]] name = "atomic-waker" @@ -71,7 +80,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -96,9 +105,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -106,6 +115,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "bumpalo" version = "3.14.0" @@ -120,11 +138,11 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -133,9 +151,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", @@ -191,7 +209,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -228,6 +246,35 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dlopen2" version = "0.7.0" @@ -271,6 +318,7 @@ name = "envision" version = "0.1.0" dependencies = [ "anyhow", + "ash", "gettext-rs", "git2", "gtk4", @@ -278,17 +326,19 @@ dependencies = [ "libadwaita", "libmonado-rs", "nix", - "phf", - "phf_macros", + "openxr", "relm4", "relm4-components", "reqwest", "rusb", "serde", "serde_json", + "sha2", + "tokio", "tracker", "uuid", "vte4", + "xdg", ] [[package]] @@ -479,9 +529,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -491,9 +541,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", @@ -504,9 +554,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -519,9 +569,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -534,6 +584,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" version = "0.2.10" @@ -575,9 +635,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -593,9 +653,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", @@ -606,11 +666,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -621,11 +681,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -643,11 +703,11 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", @@ -656,9 +716,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", "system-deps", @@ -672,9 +732,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", @@ -683,9 +743,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -694,9 +754,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", @@ -706,9 +766,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -721,9 +781,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -737,9 +797,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -758,9 +818,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -770,9 +830,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -812,12 +872,6 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -826,9 +880,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" @@ -899,6 +953,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1002,9 +1073,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1014,11 +1085,10 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -1030,9 +1100,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -1052,9 +1122,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1074,17 +1144,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + [[package]] name = "libmonado-rs" version = "0.1.0" -source = "git+https://github.com/technobaboo/libmonado-rs?rev=e32e78c79ce9ec4a5a5de9eff30661c6c4307347#e32e78c79ce9ec4a5a5de9eff30661c6c4307347" +source = "git+https://github.com/technobaboo/libmonado-rs?rev=6edb1163627d87db9904c57d7ed9dd4dcc7228b7#6edb1163627d87db9904c57d7ed9dd4dcc7228b7" dependencies = [ "bindgen", "cmake", "convert_case", "dlopen2", "flagset", + "mint", "semver", + "serde", + "serde_json", + "xdg", ] [[package]] @@ -1171,9 +1255,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1206,14 +1290,21 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.11" +name = "mint" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1243,13 +1334,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1265,16 +1362,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -1325,7 +1412,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1363,11 +1450,30 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "openxr" +version = "0.18.0" +source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" +dependencies = [ + "libc", + "libloading 0.8.5", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.10.0" +source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" +dependencies = [ + "libc", +] + [[package]] name = "pango" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", @@ -1377,9 +1483,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", @@ -1393,47 +1499,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project" version = "1.1.5" @@ -1499,18 +1564,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1585,9 +1650,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "relm4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e0e187b58db367305e8486d3228158251da1c8ba1e18baa9de61894e822649" +checksum = "cf0363f92b6a7eefd985b47f27b7ae168dd2fd5cd4013a338c9b111c33744d1f" dependencies = [ "flume", "fragile", @@ -1595,6 +1660,7 @@ dependencies = [ "gtk4", "libadwaita", "once_cell", + "relm4-css", "relm4-macros", "tokio", "tracing", @@ -1602,9 +1668,9 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffcb6431605810fca4430b3da5d496fcf67d39f32db6a2799bcaac27469154b9" +checksum = "fb3d67f2982131c5e6047af4278d8fe750266767e57b58bc15f2e11e190eef36" dependencies = [ "once_cell", "relm4", @@ -1612,10 +1678,16 @@ dependencies = [ ] [[package]] -name = "relm4-macros" -version = "0.8.1" +name = "relm4-css" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0774e846889823aa5766f5b62cface3189a5b36280e65b2faaa6df0319da1726" +checksum = "1d3b924557df1cddc687b60b313c4b76620fdbf0e463afa4b29f67193ccf37f9" + +[[package]] +name = "relm4-macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5885640821d60062497737dd42fd04248d13c7ecccee620caaa4b210fe9905" dependencies = [ "proc-macro2", "quote", @@ -1624,9 +1696,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64", "bytes", @@ -1639,6 +1711,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -1665,6 +1738,21 @@ dependencies = [ "winreg", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rusb" version = "0.9.4" @@ -1702,13 +1790,26 @@ version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -1725,6 +1826,17 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.15" @@ -1777,18 +1889,18 @@ checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1797,9 +1909,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1808,9 +1920,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -1827,6 +1939,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shlex" version = "1.2.0" @@ -1834,10 +1957,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] -name = "siphasher" -version = "0.3.11" +name = "signal-hook-registry" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] [[package]] name = "slab" @@ -1874,10 +2000,16 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.37" +name = "subtle" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -1886,9 +2018,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-configuration" @@ -1913,12 +2045,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck", "pkg-config", "toml", "version-compare", @@ -1986,18 +2118,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", + "signal-hook-registry", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2010,6 +2142,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.9" @@ -2026,14 +2169,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.16", ] [[package]] @@ -2045,19 +2188,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -2066,7 +2196,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.15", +] + +[[package]] +name = "toml_edit" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.16", ] [[package]] @@ -2129,18 +2272,18 @@ dependencies = [ [[package]] name = "tracker" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8" +checksum = "ce5c98457ff700aaeefcd4a4a492096e78a2af1dd8523c66e94a3adb0fdbd415" dependencies = [ "tracker-macros", ] [[package]] name = "tracker-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f" +checksum = "dc19eb2373ccf3d1999967c26c3d44534ff71ae5d8b9dacf78f4b13132229e48" dependencies = [ "proc-macro2", "quote", @@ -2153,6 +2296,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -2180,6 +2329,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -2193,9 +2348,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -2209,15 +2364,21 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vte4" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666a15c7ac6316a3c1bf8c5bc30d687e7405a8cba120c50569a7adeeabbbd1c6" +checksum = "7759016227e58e3239b8dca9c4a70086345844872b1f27cba0dba990fef5cb44" dependencies = [ "cairo-rs", "gdk4", @@ -2232,9 +2393,9 @@ dependencies = [ [[package]] name = "vte4-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d893a06a0907d5b843f34400ff0a7990332011e53faa7435635f0b12aacc3f88" +checksum = "2c1aa57d29283c6eeac2e34c16791436275d254ac02b8590b02698feef197234" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2519,6 +2680,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.52.0" @@ -2528,3 +2698,15 @@ dependencies = [ "cfg-if", "windows-sys 0.48.0", ] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index caab441723b5..4011c7487c2c 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -6,6 +6,7 @@ fetchFromGitLab, gdb, gdk-pixbuf, + git, glib, gtk4, gtksourceview5, @@ -17,6 +18,7 @@ ninja, nix-update-script, openssl, + openxr-loader, pango, pkg-config, rustPlatform, @@ -29,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-07-03"; + version = "0-unstable-2024-09-06"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "6cf5e40b96d1cbd99a3cfcef1f03899356e79448"; - hash = "sha256-a/IUNGoq9OKEC3uCg6PUp2TRHkfm4mTT3QQ8SfA29RU="; + rev = "849f47a8533bc3fc673afbdd9b32acac3ff26f7d"; + hash = "sha256-t1+4MXD1s4NW38r3Ht+1OmCAY44MqEPijXdUVKy0rY4="; }; strictDeps = true; @@ -43,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "libmonado-rs-0.1.0" = "sha256-PsNgfpgso3HhIMXKky/u6Xw8phk1isRpNXKLhvN1wIE="; + "libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y="; + "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk="; }; }; @@ -51,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib desktop-file-utils cargo + git meson ninja pkg-config @@ -69,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { libgit2 libusb1 openssl + openxr-loader pango vte-gtk4 zlib From 7d902bdf05c26aa52162be899809690ac6b5f72d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 15:30:06 +0000 Subject: [PATCH 92/94] python312Packages.xiaomi-ble: 0.31.1 -> 0.32.0 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 542096715a88..a053c5313997 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.31.1"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-ggI0beyE3gfgs5hyh7Rn9YDDkIvqqd0hA/XCy55/r2E="; + hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc="; }; postPatch = '' From 2758384408cd28ec4ad23b833b0301d9bc3a5a6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 15:30:29 +0000 Subject: [PATCH 93/94] python312Packages.githubkit: 0.11.8 -> 0.11.9 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 5d69969fa5dc..a58ee3362693 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.8"; + version = "0.11.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU="; + hash = "sha256-aN8LTWDtzj04w0dQvUVMJ2QhHWaFK4ml1ZoLO2LmKTY="; }; pythonRelaxDeps = [ "hishel" ]; From 322047d654e9fa4cd11b161e3030ba892389232f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 5 Sep 2024 09:46:40 -0400 Subject: [PATCH 94/94] home-assistant: disable test_circular_imports test This reduces the nixpkgs-review load when updating debugpy, so PRs can be merged directly into master without going through staging --- pkgs/servers/home-assistant/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1d146f0a8218..54fbe1457ed0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -100,12 +100,6 @@ let ]; }); - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { - # tests are deadlocking too often - # https://github.com/NixOS/nixpkgs/issues/262000 - doCheck = false; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -569,10 +563,7 @@ in python.pkgs.buildPythonApplication rec { ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" - "debugpy" "hue" - "qwikswitch" - "sentry" ]; pytestFlagsArray = [ @@ -605,6 +596,8 @@ in python.pkgs.buildPythonApplication rec { "tests/hassfest" # we don't care about code quality "tests/pylint" + # redundant component import test, which would make debugpy & sentry expensive to review + "tests/test_circular_imports.py" # don't bulk test all components "tests/components" ];