From 16a1b0e53160fd26cd778bedfa9cfe23848c07bc Mon Sep 17 00:00:00 2001 From: euxane Date: Sun, 7 Sep 2025 13:09:20 +0200 Subject: [PATCH 01/68] nixos/tor: add onion service unix sockets to BindPaths Setting up an onion service with a UNIX socket with `services.tor.relay.onionServices..target.unix` didn't work out of the box because the tor service runs within an isolated root. This adds the missing path binding to make this work. --- nixos/modules/services/security/tor.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 3d5c817532e5..219458870472 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -1410,7 +1410,14 @@ in RootDirectoryStartOnly = true; #InaccessiblePaths = [ "-+${runDir}/root" ]; UMask = "0066"; - BindPaths = [ stateDir ]; + BindPaths = [ + stateDir + ] + ++ lib.catAttrs "unix" ( + lib.catAttrs "target" ( + lib.concatMap (onionService: onionService.map) (lib.attrValues cfg.relay.onionServices) + ) + ); BindReadOnlyPaths = [ builtins.storeDir "/etc" From fc81f11cc15811f7b367d2d4435c9da3ac790e0d Mon Sep 17 00:00:00 2001 From: Ilya Savitsky Date: Thu, 24 Apr 2025 13:10:02 +0100 Subject: [PATCH 02/68] dformat: init at 0.15.2 --- pkgs/by-name/df/dformat/dub-lock.json | 8 ++++ pkgs/by-name/df/dformat/fix_version.patch | 13 ++++++ pkgs/by-name/df/dformat/package.nix | 53 +++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 pkgs/by-name/df/dformat/dub-lock.json create mode 100644 pkgs/by-name/df/dformat/fix_version.patch create mode 100644 pkgs/by-name/df/dformat/package.nix diff --git a/pkgs/by-name/df/dformat/dub-lock.json b/pkgs/by-name/df/dformat/dub-lock.json new file mode 100644 index 000000000000..4776c1dbac2e --- /dev/null +++ b/pkgs/by-name/df/dformat/dub-lock.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "libdparse": { + "version": "0.25.0", + "sha256": "012ihzwhikvpd7crr3ql38hs32lfy9gnkg9qvjgpd7ar3xbsa5sz" + } + } +} diff --git a/pkgs/by-name/df/dformat/fix_version.patch b/pkgs/by-name/df/dformat/fix_version.patch new file mode 100644 index 000000000000..5ffd727cc33c --- /dev/null +++ b/pkgs/by-name/df/dformat/fix_version.patch @@ -0,0 +1,13 @@ +diff --git a/dub.json b/dub.json +index a0d6357..abae578 100644 +--- a/dub.json ++++ b/dub.json +@@ -13,8 +13,5 @@ + ], + "versions" : [ + "built_with_dub" +- ], +- "preBuildCommands" : [ +- "$DC -run \"$PACKAGE_DIR/dubhash.d\"" + ] + } diff --git a/pkgs/by-name/df/dformat/package.nix b/pkgs/by-name/df/dformat/package.nix new file mode 100644 index 000000000000..54bce54029d4 --- /dev/null +++ b/pkgs/by-name/df/dformat/package.nix @@ -0,0 +1,53 @@ +{ + lib, + buildDubPackage, + fetchFromGitHub, + versionCheckHook, +}: + +buildDubPackage rec { + pname = "dfmt"; + version = "0.15.2"; + + src = fetchFromGitHub { + owner = "dlang-community"; + repo = "dfmt"; + tag = "v${version}"; + hash = "sha256-QjmYPIQFs+91jB1sdaFoenfWt5TLXyEJauSSHP2fd+M="; + }; + + preBuild = '' + mkdir -p bin/ + echo "v${version}" > bin/dubhash.txt + ''; + + patches = [ + # do not run the dubhash tool, we supply the version in preBuild + ./fix_version.patch + ]; + + dubLock = ./dub-lock.json; + + doCheck = true; + + installPhase = '' + runHook preInstall + install -Dm755 bin/dfmt -t $out/bin + runHook postInstall + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + meta = { + description = "Formatter for D source code"; + changelog = "https://github.com/dlang-community/dfmt/releases/tag/v${version}"; + homepage = "https://github.com/dlang-community/dfmt"; + maintainers = with lib.maintainers; [ ipsavitsky ]; + mainProgram = "dfmt"; + license = lib.licenses.boost; + }; +} From cbad32071b6244aa34cc1fdff0324d2f319dbce3 Mon Sep 17 00:00:00 2001 From: Jaco Malan Date: Tue, 30 Sep 2025 15:14:48 +0200 Subject: [PATCH 03/68] p2pool: 4.10.1 -> 4.11 --- pkgs/by-name/p2/p2pool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index 216a7532bbdb..262a38bf5c11 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "p2pool"; - version = "4.10.1"; + version = "4.11"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${finalAttrs.version}"; - hash = "sha256-oxUxgooIiesSyew8t/0asa/sEV4I8C+Firp5cLi0fnU="; + hash = "sha256-qoz7wMI6hheF+Pecfq3pPZRc2H3nkrxKRMWR2qmJdsI="; fetchSubmodules = true; }; From e944cc62692b7b3dc69323d6198dd3b52aceceff Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:17:59 +0200 Subject: [PATCH 04/68] nixos/jenkins: Configure system group in service config Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 2dae8b61296c..49632095d6ea 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -251,6 +251,7 @@ in serviceConfig = { User = cfg.user; + Group = cfg.group; StateDirectory = lib.mkIf (lib.hasPrefix "/var/lib/jenkins" cfg.home) "jenkins"; # For (possible) socket use RuntimeDirectory = "jenkins"; From ff7673d90e0abfc36904ab33f0831c4ec0156c60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 21:50:27 +0000 Subject: [PATCH 05/68] mysqltuner: 2.6.0 -> 2.7.0 --- pkgs/by-name/my/mysqltuner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mysqltuner/package.nix b/pkgs/by-name/my/mysqltuner/package.nix index 0b67c9066dff..41d4ba01e5ce 100644 --- a/pkgs/by-name/my/mysqltuner/package.nix +++ b/pkgs/by-name/my/mysqltuner/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "mysqltuner"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; rev = "v${version}"; - hash = "sha256-JIO/auY8E6at9OCIqgKbBz9OhOeZMtQvUoUYPMEVtCg="; + hash = "sha256-v0+iFmAzbFelVyZSRvcSd0AgW73N6no0/n6LuBooKN4="; }; postPatch = '' From 8a34d860efe68cc20a361d8377bfae22e7ea63ab Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 7 Oct 2025 08:49:32 +0200 Subject: [PATCH 06/68] mariadb-galera: 26.4.23 -> 26.4.24 Changelog: https://releases.galeracluster.com/galera-4/release-notes-galera-26.4.24.txt --- pkgs/by-name/ma/mariadb-galera/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index 996a513b4919..adcfd704a9a5 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.23"; + version = "26.4.24"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; tag = "release_${version}"; - hash = "sha256-v7zwhXfW9K1wvV951Utt/rUbSIMiRZB1rWfeK1VJzN4="; + hash = "sha256-mpf+YY0m+UwvemdZt6SfRP9IJlq5IZtlOJMucADc1oM="; fetchSubmodules = true; }; From cc38ed4577517666fd52b6d832b638702d1b1f89 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 7 Oct 2025 16:03:09 +0200 Subject: [PATCH 07/68] nixos/pgadmin: Use lib.mkEnableOption where possible Signed-off-by: Felix Singer --- nixos/modules/services/admin/pgadmin.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix index 0fbc6a19a814..1e46d2794261 100644 --- a/nixos/modules/services/admin/pgadmin.nix +++ b/nixos/modules/services/admin/pgadmin.nix @@ -94,13 +94,7 @@ in }; emailServer = { - enable = lib.mkOption { - description = '' - Enable SMTP email server. This is necessary, if you want to use password recovery or change your own password - ''; - type = lib.types.bool; - default = false; - }; + enable = lib.mkEnableOption "SMTP email server. This is necessary, if you want to use password recovery or change your own password"; address = lib.mkOption { description = "SMTP server for email delivery"; type = lib.types.str; @@ -111,16 +105,8 @@ in type = lib.types.port; default = 25; }; - useSSL = lib.mkOption { - description = "SMTP server should use SSL"; - type = lib.types.bool; - default = false; - }; - useTLS = lib.mkOption { - description = "SMTP server should use TLS"; - type = lib.types.bool; - default = false; - }; + useSSL = lib.mkEnableOption "SSL for connecting to the SMTP server"; + useTLS = lib.mkEnableOption "TLS for connecting to the SMTP server"; username = lib.mkOption { description = "SMTP server username for email delivery"; type = lib.types.nullOr lib.types.str; From 8765032b50fde4d5db39d94c7eba641ccf2aa300 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:27:15 +0200 Subject: [PATCH 08/68] nixos/jenkins: Ensure proper permissions for state directory Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 49632095d6ea..ef7f5ac613b8 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -253,6 +253,7 @@ in User = cfg.user; Group = cfg.group; StateDirectory = lib.mkIf (lib.hasPrefix "/var/lib/jenkins" cfg.home) "jenkins"; + StateDirectoryMode = "750"; # For (possible) socket use RuntimeDirectory = "jenkins"; AmbientCapabilities = ""; From 6cece348c4165f46dac8c68d561140a6af88a9d8 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:28:29 +0200 Subject: [PATCH 09/68] nixos/jenkins: Ensure proper permissions for cache directory Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index ef7f5ac613b8..012b91b18b5b 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -256,6 +256,7 @@ in StateDirectoryMode = "750"; # For (possible) socket use RuntimeDirectory = "jenkins"; + RuntimeDirectoryMode = "750"; AmbientCapabilities = ""; CapabilityBoundingSet = ""; LockPersonality = true; From d969bdbedaf4d496f4e63c8e24d61eec143c7e4e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:20:00 +0200 Subject: [PATCH 10/68] nixos/jenkins: Set ProtectControlGroups to `strict` For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#ProtectControlGroups= Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 012b91b18b5b..150393acccaf 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -266,7 +266,7 @@ in PrivateMounts = true; PrivateTmp = true; ProtectClock = true; - ProtectControlGroups = true; + ProtectControlGroups = "strict"; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; From bfae9b0212d76918921f928df28bfe3df3b5e724 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:23:19 +0200 Subject: [PATCH 11/68] nixos/jenkins: Set ProtectProc to `invisible` For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#ProtectProc= Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 150393acccaf..2fe53e173f4f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -272,6 +272,7 @@ in ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; + ProtectProc = "invisible"; ProtectSystem = "full"; RemoveIPC = true; RestrictAddressFamilies = [ From d62c46fec7425c290add47416dc6487a3591b71b Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:22:15 +0200 Subject: [PATCH 12/68] nixos/jenkins: Enable PrivateUsers hardening in service config For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#PrivateUsers= Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 2fe53e173f4f..8b44dfb83335 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -265,6 +265,7 @@ in PrivateDevices = true; PrivateMounts = true; PrivateTmp = true; + PrivateUsers = true; ProtectClock = true; ProtectControlGroups = "strict"; ProtectHome = true; From 01a263c29ac63aef0d6bac2afb59213fe400d5db Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 20:20:48 +0200 Subject: [PATCH 13/68] nixos/jenkins: Enable MountAPIVFS hardening in service config This setting is already implied by others, but add it for completeness as well. For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#MountAPIVFS= Signed-off-by: Felix Singer --- .../modules/services/continuous-integration/jenkins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 8b44dfb83335..8ec7c972436b 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -261,6 +261,7 @@ in CapabilityBoundingSet = ""; LockPersonality = true; # MemoryDenyWriteExecute = false; Breaks execution; + MountAPIVFS = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; From f655c05f894f7766f230ce46c2cb67b899865ac8 Mon Sep 17 00:00:00 2001 From: akotro Date: Thu, 25 Sep 2025 00:50:13 +0100 Subject: [PATCH 14/68] tsidp: init at 0.0.4 --- pkgs/by-name/ts/tsidp/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ts/tsidp/package.nix diff --git a/pkgs/by-name/ts/tsidp/package.nix b/pkgs/by-name/ts/tsidp/package.nix new file mode 100644 index 000000000000..8162f533ec07 --- /dev/null +++ b/pkgs/by-name/ts/tsidp/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule (finalAttrs: { + pname = "tsidp"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "tailscale"; + repo = "tsidp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-u6dQORtB4eNEFLlouuFV5oxedSN1fZ31YkZavfU1F0U="; + }; + + vendorHash = "sha256-obtcJTg7V4ij3fGVmZMD7QQwKJX6K5PPslpM1XKCk9Q="; + + meta = { + homepage = "https://github.com/tailscale/tsidp"; + changelog = "https://github.com/tailscale/tsidp/releases/tag/v${finalAttrs.version}"; + description = "Simple OIDC / OAuth Identity Provider (IdP) server for your tailnet"; + license = lib.licenses.bsd3; + mainProgram = "tsidp"; + maintainers = with lib.maintainers; [ akotro ]; + }; +}) From 8fe314f409bb131ce88012189d26770259cb992e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Oct 2025 14:53:58 +0000 Subject: [PATCH 15/68] roslyn-ls: 5.0.0-2.25424.1 -> 5.0.0-2.25472.11 --- pkgs/by-name/ro/roslyn-ls/deps.json | 414 +------------------------- pkgs/by-name/ro/roslyn-ls/package.nix | 6 +- 2 files changed, 15 insertions(+), 405 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 59f5a702b6db..6eab1bf51ab6 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -43,9 +43,9 @@ }, { "pname": "Microsoft.Build.Framework", - "version": "17.11.4", - "hash": "sha256-CpRliCQT2v/Xw+TgEvUvFKLVlqYHnhX8NIEY/WaHLSE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.4/microsoft.build.framework.17.11.4.nupkg" + "version": "17.11.31", + "hash": "sha256-YS4oASrmC5dmZrx5JPS7SfKmUpIJErlUpVDsU3VrfFE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.31/microsoft.build.framework.17.11.31.nupkg" }, { "pname": "Microsoft.Build.Framework", @@ -133,15 +133,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "10.0.0-beta.25367.5", - "hash": "sha256-BXE25tCcZgri9yxfIx8S5mEC8F5hYx7rvibc5Q/SNeY=", - "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/10.0.0-beta.25367.5/microsoft.dotnet.arcade.sdk.10.0.0-beta.25367.5.nupkg" + "version": "11.0.0-beta.25469.3", + "hash": "sha256-OOyYn8tt/lqeZvJ+HzEq2LvvnkO/yLShEzOodLqZBIg=", + "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/11.0.0-beta.25469.3/microsoft.dotnet.arcade.sdk.11.0.0-beta.25469.3.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "10.0.0-beta.25367.5", - "hash": "sha256-S3amNkCq0gbp9FCYWMxKIwrMNDhyX7AbGLSqH1O5sPk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.25367.5/microsoft.dotnet.xlifftasks.10.0.0-beta.25367.5.nupkg" + "version": "11.0.0-beta.25469.3", + "hash": "sha256-ZyNid1Ur78TyCAD4524+HgGC8agFPD0l9RuKdu/87ts=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25469.3/microsoft.dotnet.xlifftasks.11.0.0-beta.25469.3.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -239,12 +239,6 @@ "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg" - }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.3", @@ -359,12 +353,6 @@ "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" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg" - }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", @@ -461,198 +449,6 @@ "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg" - }, { "pname": "SQLitePCLRaw.bundle_green", "version": "2.1.0", @@ -701,12 +497,6 @@ "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/8.0.0/system.codedom.8.0.0.nupkg" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg" - }, { "pname": "System.Collections.Immutable", "version": "8.0.0", @@ -721,9 +511,9 @@ }, { "pname": "System.CommandLine", - "version": "2.0.0-rc.2.25420.109", - "hash": "sha256-jZMqUnzqJVY5GNdzJO8rk/NumyYDj4dqNTZjEz+Qccc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.2.25420.109/system.commandline.2.0.0-rc.2.25420.109.nupkg" + "version": "2.0.0-rc.2.25468.104", + "hash": "sha256-fqMHo4QbUqZRv0KgdRHIBOlksVs3vwEfAP3ThqZqcLg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.2.25468.104/system.commandline.2.0.0-rc.2.25468.104.nupkg" }, { "pname": "System.ComponentModel.Composition", @@ -779,12 +569,6 @@ "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg" }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "9.0.0", @@ -803,72 +587,18 @@ "hash": "sha256-t+l5WgfxivrZhWKjr0rpqtCcNXyRgytsGgWf/BIv5PU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg" }, - { - "pname": "System.Diagnostics.Process", - "version": "4.3.0", - "hash": "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg" - }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.3.0", - "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg" - }, - { - "pname": "System.Formats.Asn1", - "version": "8.0.0", - "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.0/system.formats.asn1.8.0.0.nupkg" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg" - }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg" - }, { "pname": "System.IO.Pipelines", "version": "9.0.0", "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/9.0.0/system.io.pipelines.9.0.0.nupkg" }, - { - "pname": "System.IO.Pipes", - "version": "4.3.0", - "hash": "sha256-2QA4FIwDB7mT4Hs8bj0oDJcCzr4ycsw+tSzF+58J+/k=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes/4.3.0/system.io.pipes.4.3.0.nupkg" - }, { "pname": "System.Management", "version": "7.0.0", @@ -881,42 +611,12 @@ "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.0/system.memory.4.6.0.nupkg" }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg" - }, { "pname": "System.Numerics.Vectors", "version": "4.6.0", "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.0/system.numerics.vectors.4.6.0.nupkg" }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg" - }, { "pname": "System.Reflection.Emit", "version": "4.7.0", @@ -947,48 +647,12 @@ "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.1.0", "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.0/system.runtime.compilerservices.unsafe.6.1.0.nupkg" }, - { - "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" - }, - { - "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" - }, - { - "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" - }, { "pname": "System.Security.AccessControl", "version": "5.0.0", @@ -1019,42 +683,18 @@ "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg" }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg" }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg" - }, { "pname": "System.Text.Encoding.CodePages", "version": "8.0.0", "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=", "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/8.0.0/system.text.encoding.codepages.8.0.0.nupkg" }, - { - "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" - }, { "pname": "System.Text.Encodings.Web", "version": "9.0.0", @@ -1067,30 +707,12 @@ "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/9.0.0/system.text.json.9.0.0.nupkg" }, - { - "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" - }, { "pname": "System.Threading.Channels", "version": "8.0.0", "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/8.0.0/system.threading.channels.8.0.0.nupkg" }, - { - "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" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg" - }, { "pname": "System.Threading.Tasks.Dataflow", "version": "9.0.0", @@ -1103,18 +725,6 @@ "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.6.0/system.threading.tasks.extensions.4.6.0.nupkg" }, - { - "pname": "System.Threading.Thread", - "version": "4.3.0", - "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg" - }, { "pname": "System.ValueTuple", "version": "4.5.0", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 87bb43074d98..1c77c2ce6040 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -53,18 +53,18 @@ in buildDotnetModule (finalAttrs: rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.90.51-prerelease"; + vsVersion = "2.93.21-prerelease"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-l2/EIvN/GFIyCZRNBnS7bAzkYB1wZbD1DxD1EW040X4="; + hash = "sha256-Vpx3BCbjmLr8YBuf4BisH4ZjWBenCv5QwMlSOcS3WnE="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.0.0-2.25424.1"; + version = "5.0.0-2.25472.11"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 4f652cfaf41b39ebc395976fbecfb446bfc3d8c8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 9 Oct 2025 12:22:37 -0700 Subject: [PATCH 16/68] lib.filesystem: remove Nix 2.14 shim It was added in fcaa2b1097e46. Lix is based off of 2.18, and the minimum version for Nixpkgs has long since incorporated this builtin. --- lib/filesystem.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index afc4c2698291..750d47f8de18 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -56,25 +56,7 @@ in ::: */ - pathType = - builtins.readFileType or - # Nix <2.14 compatibility shim - ( - path: - if - !pathExists path - # Fail irrecoverably to mimic the historic behavior of this function and - # the new builtins.readFileType - then - abort "lib.filesystem.pathType: Path ${toString path} does not exist." - # The filesystem root is the only path where `dirOf / == /` and - # `baseNameOf /` is not valid. We can detect this and directly return - # "directory", since we know the filesystem root can't be anything else. - else if dirOf path == path then - "directory" - else - (readDir (dirOf path)).${baseNameOf path} - ); + pathType = builtins.readFileType; /** Whether a path exists and is a directory. From af671ded863a26a789a83e08c80be4d4a1b04ac2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 14:17:28 +0200 Subject: [PATCH 17/68] nixos/murmur: Enable MountAPIVFS hardening in service config This setting is already implied by others, but add it for completeness as well. For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#MountAPIVFS= Signed-off-by: Felix Singer --- nixos/modules/services/networking/murmur.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 87c309e6a2e9..ba6e5f5fe52d 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -345,6 +345,7 @@ in CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; LockPersonality = true; MemoryDenyWriteExecute = true; + MountAPIVFS = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; From 9bd10e556b222e1b84094d3ad17649a041736b94 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 14:17:43 +0200 Subject: [PATCH 18/68] nixos/murmur: Enable PrivateUsers hardening in service config For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#PrivateUsers= Signed-off-by: Felix Singer --- nixos/modules/services/networking/murmur.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index ba6e5f5fe52d..ef2bd0b28b6d 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -350,6 +350,7 @@ in PrivateDevices = true; PrivateMounts = true; PrivateTmp = true; + PrivateUsers = true; ProtectClock = true; ProtectControlGroups = "strict"; ProtectHome = true; From 9638a1ba2483c956da0b53ae406e188941e65946 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 6 Oct 2025 14:24:41 +0200 Subject: [PATCH 19/68] nixos/murmur: Set ProtectProc to `invisible` For documentation see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#ProtectProc= Signed-off-by: Felix Singer --- nixos/modules/services/networking/murmur.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index ef2bd0b28b6d..c67b4ac47390 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -358,6 +358,7 @@ in ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; + ProtectProc = "invisible"; ProtectSystem = "strict"; ReadWritePaths = [ cfg.stateDir From 61bc859c8af00a5f52a580187f92981eca7e78bd Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 Oct 2025 10:25:20 +0530 Subject: [PATCH 20/68] bcachefs-tools: mark it broken on x86 (32 bit) --- pkgs/by-name/bc/bcachefs-tools/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index e4f2f7659109..f9a7a663738b 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -145,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.linux; mainProgram = "bcachefs"; + broken = stdenv.hostPlatform.isi686; # error: stack smashing detected }; }) From 04f905fae910b999f9a501e5d2af121ecc7cf049 Mon Sep 17 00:00:00 2001 From: Fugi Date: Sat, 11 Oct 2025 10:53:36 +0200 Subject: [PATCH 21/68] joplin-desktop: use clang_20 to fix darwin build --- pkgs/by-name/jo/joplin-desktop/buildPlugin.nix | 6 ++++++ pkgs/by-name/jo/joplin-desktop/package.nix | 2 ++ 2 files changed, 8 insertions(+) diff --git a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix b/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix index 4ef26f8e1fb1..40b2d68d036a 100644 --- a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix +++ b/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix @@ -1,8 +1,10 @@ { lib, + stdenv, fetchzip, npm-lockfile-fix, buildNpmPackage, + clang_20, name, url, @@ -22,6 +24,10 @@ buildNpmPackage { ''; }; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + clang_20 # clang_21 breaks keytar + ]; + postPatch = '' sed -i '/preinstall/d' package.json ''; diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 8c90b9572407..ec93ead2a33d 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -19,6 +19,7 @@ callPackage, runCommand, libGL, + clang_20, }: let @@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild buildPackages.cctools + clang_20 # clang_21 breaks keytar, sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems From 4c62609f6927e894944a200050f8ac2e8598047f Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 11 Oct 2025 11:41:48 +0200 Subject: [PATCH 22/68] lixPackageSets.git: 2.94.0-pre-20251001_f1ef994f120a -> 2.94.0-pre-20251010_53d172a30838 --- pkgs/tools/package-management/lix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index da35192c5e5a..c3cc1f9afc2d 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -217,14 +217,14 @@ lib.makeExtensible ( attrName = "git"; lix-args = rec { - version = "2.94.0-pre-20251001_${builtins.substring 0 12 src.rev}"; + version = "2.94.0-pre-20251010_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "f1ef994f120a723839a6d837cc2b33914a30a4db"; - hash = "sha256-Rmq98EchbKygPo+2g0nDsZ7QNMLe+loiMbflV5VKDzc="; + rev = "53d172a3083840846043f7579936e0a3e86737e5"; + hash = "sha256-PPDHXtv6U5oIj8utzIqcH+ZSjMy4vXpv/y8c2I7dZ+g="; }; cargoDeps = rustPlatform.fetchCargoVendor { From adc035fad24bb95976859816f69dc3d2f239bfd6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Oct 2025 01:34:28 +0300 Subject: [PATCH 23/68] beets: 2.4.0 -> 2.5.0 --- pkgs/tools/audio/beets/builtin-plugins.nix | 1 + pkgs/tools/audio/beets/common.nix | 1 + pkgs/tools/audio/beets/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 3961eec1e0df..21b949affbb4 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -180,4 +180,5 @@ _typing = { testPaths = [ ]; }; + _utils = { }; } diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 2fee2461ab53..29fdaa91ebcb 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -88,6 +88,7 @@ python3Packages.buildPythonApplication { build-system = [ python3Packages.poetry-core + python3Packages.poetry-dynamic-versioning ]; dependencies = diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 67e59ba8c7ea..f08a874426cf 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,12 +31,12 @@ lib.makeExtensible ( beets-stable = callPackage ./common.nix rec { inherit python3Packages extraPatches; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; tag = "v${version}"; - hash = "sha256-BM4NW8iukw9+zLD2cfAETmFYNAiNPUn9cLrkVlCE+jM="; + hash = "sha256-YZvS9oB+v+48i1avQcs6ClnYz4aMqJQ2e6cBiZ4ULb0="; }; }; From 9b8ee02e9703796c3b6002826bab3e90d7db8b59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 10:40:59 +0000 Subject: [PATCH 24/68] positron-bin: 2025.09.0-139 -> 2025.10.0-199 --- pkgs/by-name/po/positron-bin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index b226cbad0764..1061faf40eac 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.09.0-139"; + version = "2025.10.0-199"; in stdenv.mkDerivation { inherit version pname; @@ -31,17 +31,17 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg"; - hash = "sha256-N6urQYmpVoL2JeriHxO/H0J66U6nAez7U8w8qbzZ+ys="; + hash = "sha256-iYEkuMQZkn/71bjHCvltTK6EC5l45kNdBhcK6TUB1hM="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb"; - hash = "sha256-IbMLnI/SDDLKIL1sTWjez186tbY3SZtuNmfNe9b6PXw="; + hash = "sha256-JkgFuVebyDRqGh2ZcTZitVWzRSYdatKCtXWL1GMb0ZM="; } else fetchurl { url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb"; - hash = "sha256-XlRj+1Gmo7HUzluehmJ4VjcIWbqWl2ncB0dfyC6iz8I="; + hash = "sha256-ycheOOKirLhDiNIh2Bg/7KBTau7YPGGWHLkRmZJkrnk="; }; buildInputs = [ From bb2eafe3b0f48082ffae6505315faf43f9183050 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 12:52:46 +0000 Subject: [PATCH 25/68] tigerbeetle: 0.16.60 -> 0.16.61 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 07ce6bc2c1c4..d0b465fa8b17 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-gOKlait5tNZcfnyDWp+Kpws+RoKB5/5M5eCt68NHWww="; - "x86_64-linux" = "sha256-LTjjupAXS702mUrgbW3JwetZskTCChrlsSJK+AVysGs="; - "aarch64-linux" = "sha256-HYRL76no1VyAPC1nDTu62rGOfBbs+TTkoEFnTA+YN9I="; + "universal-macos" = "sha256-m/T1Ns8mmifODTLoQ426Co/07rg/kpq/XewNKozDStE="; + "x86_64-linux" = "sha256-ClQLzae+8xd9Jb9fGRJ3u/SAYSlk/bxgSITDxSIbS7U="; + "aarch64-linux" = "sha256-G2l2636rhXbhegdehSJj6VQpOYHe1Lp8jsBaG53kzUk="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.60"; + version = "0.16.61"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 98b06d67eb499689115327908d37bac3d8bb620f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 15:49:36 +0200 Subject: [PATCH 26/68] wownero: fix build with cmake4 --- pkgs/by-name/wo/wownero/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index a35b9147e956..acc584adde11 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchFromGitea, + fetchpatch, cmake, python3, boost186, @@ -54,6 +55,14 @@ stdenv.mkDerivation rec { "-Wno-error=int-conversion" ]; + patches = [ + # build: set cmake_minimum_required(VERSION 3.5) consistently + (fetchpatch { + url = "https://codeberg.org/wownero/wownero/commit/0d0a656618e396de7ff60368dde708ad9d45f866.patch"; + hash = "sha256-xnpEZxWg5YzOhDIWZjNyXH8GBdK7c2rxL9DewPKghIg="; + }) + ]; + nativeBuildInputs = [ cmake python3 From 42a6c864fd01f38875681019ada8ddebd45891a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 16:59:09 +0000 Subject: [PATCH 27/68] lunatask: 2.1.10 -> 2.1.12 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index c01739f59cca..af5ac7909264 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.10"; + version = "2.1.12"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-8lnMg3mkdfXqimOdyujk/DE8CU6lzj9RDM8Nb2cEUms="; + hash = "sha256-2wYUvAersPFNJILtNV5m7den1o6OOB2jxa0ZwqwQlx0="; }; appimageContents = appimageTools.extract { From 6ece78c509113434418fcde792ee3a885b967b44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 17:16:48 +0000 Subject: [PATCH 28/68] uniex: 0.1.8 -> 0.1.19 --- pkgs/by-name/un/uniex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/uniex/package.nix b/pkgs/by-name/un/uniex/package.nix index 2f2d16f63b1b..2ddd817cc42b 100644 --- a/pkgs/by-name/un/uniex/package.nix +++ b/pkgs/by-name/un/uniex/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "uniex"; - version = "0.1.8"; + version = "0.1.19"; src = fetchFromGitHub { owner = "paepckehh"; repo = "uniex"; tag = "v${version}"; - hash = "sha256-+wcAm3UFRs70HJ64emuWNnyroUhFHUPsaMQPCaMAexg="; + hash = "sha256-6a/jVTDur0h1n+YtbaaZLyhgi1RDJDTTDLJrknHFUxY="; }; vendorHash = "sha256-s/oWtYziUtSKDQmvDxWznqynlKmWxwt5jAAT5xl+gqo="; From 20d24050904ecf3e188b423ff2375f5397cf2886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 18:40:49 +0000 Subject: [PATCH 29/68] tlsinfo: 0.1.49 -> 0.1.50 --- pkgs/by-name/tl/tlsinfo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix index d5ccd084678f..668fd919e3d2 100644 --- a/pkgs/by-name/tl/tlsinfo/package.nix +++ b/pkgs/by-name/tl/tlsinfo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tlsinfo"; - version = "0.1.49"; + version = "0.1.50"; src = fetchFromGitHub { owner = "paepckehh"; repo = "tlsinfo"; tag = "v${version}"; - hash = "sha256-Lp1RTyQMkYSMS+qdr0R8zkBI/68zzltq3F4pjyrKfFo="; + hash = "sha256-EtKke+kMheZ7R7q+4TlJD18x+s5qTa+JFpdwFdDsa7A="; }; - vendorHash = "sha256-RB/EoSRbWPYNFg73+nWuxf7i+kMAUQsJk0KQAZyJgj0="; + vendorHash = "sha256-L5xL66T2FDTjiGb4VrCjwalcvKzCYdGaJ/w77FyEZjo="; ldflags = [ "-s" From 790332164484c7bbb75b7e02980c8c78ad5ea692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 21:04:46 +0000 Subject: [PATCH 30/68] python3Packages.resend: 2.14.0 -> 2.16.0 --- pkgs/development/python-modules/resend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index eba4b1b254e2..f34684b9ca4e 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.14.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; tag = "v${version}"; - hash = "sha256-rRaW32hKfbYOKuh5lcPWiq6sD35tUzRS8ZCsyAyy4Mo="; + hash = "sha256-BXvy/6LaCQ+fyL6ubWZqIXn/IueE3IEhP07n2oT4cZQ="; }; build-system = [ setuptools ]; From 2012e25968b1dfee5ba342192f5da8141de83db9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 12 Oct 2025 19:03:12 -0400 Subject: [PATCH 31/68] ovn: fix build failure due to make install race condition Periodically happens in Hydra: https://hydra.nixos.org/build/309529541 --- ...ondition-when-installing-ovn-detrace.patch | 64 +++++++++++++++++++ pkgs/by-name/ov/ovn/package.nix | 3 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/by-name/ov/ovn/0001-build-Fix-race-condition-when-installing-ovn-detrace.patch diff --git a/pkgs/by-name/ov/ovn/0001-build-Fix-race-condition-when-installing-ovn-detrace.patch b/pkgs/by-name/ov/ovn/0001-build-Fix-race-condition-when-installing-ovn-detrace.patch new file mode 100644 index 000000000000..6bd2a7c96190 --- /dev/null +++ b/pkgs/by-name/ov/ovn/0001-build-Fix-race-condition-when-installing-ovn-detrace.patch @@ -0,0 +1,64 @@ +From a94104a0c419a5049712f7372690dab10f54ab2f Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Sun, 12 Oct 2025 18:46:14 -0400 +Subject: [PATCH ovn] build: Fix race condition when installing ovn-detrace. + +When running parallel make install (-j), ovn-detrace-install could +trigger before ovn_detrace.py is installed. In this case, `ln` will +fail. + +When it happens, make fails with: + +``` +ln: failed to create symbolic link '[...]/bin/ovn-detrace': No such file or directory +make[2]: *** [Makefile:3852: ovn-detrace-install] Error 1 +``` + +Automake install-*-local targets are not guaranteed any order. In +contrast, install-*-hook does [1]. This patch switches the make target +to use the latter. + +[1] https://www.gnu.org/software/automake/manual/html_node/Extending-Installation.html + +Signed-off-by: Ihar Hrachyshka +--- + Makefile.am | 2 ++ + utilities/automake.mk | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 6119ef510..060d3189d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -128,6 +128,7 @@ dist_scripts_SCRIPTS = + dist_scripts_DATA = + EXTRA_PROGRAMS = + INSTALL_DATA_LOCAL = ++INSTALL_DATA_HOOK = + UNINSTALL_LOCAL = + man_MANS = + MAN_FRAGMENTS = +@@ -487,6 +488,7 @@ dist-hook: $(DIST_HOOKS) + all-local: $(ALL_LOCAL) + clean-local: $(CLEAN_LOCAL) + install-data-local: $(INSTALL_DATA_LOCAL) ++install-data-hook: $(INSTALL_DATA_HOOK) + uninstall-local: $(UNINSTALL_LOCAL) + .PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL) $(INSTALL_DATA_LOCAL) $(UNINSTALL_LOCAL) + +diff --git a/utilities/automake.mk b/utilities/automake.mk +index 1de33614f..ec955f6bf 100644 +--- a/utilities/automake.mk ++++ b/utilities/automake.mk +@@ -106,7 +106,7 @@ utilities_ovn_appctl_SOURCES = utilities/ovn-appctl.c + utilities_ovn_appctl_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la + + # ovn-detrace +-INSTALL_DATA_LOCAL += ovn-detrace-install ++INSTALL_DATA_HOOK += ovn-detrace-install + ovn-detrace-install: + ln -sf ovn_detrace.py $(DESTDIR)$(bindir)/ovn-detrace + +-- +2.51.0 + diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index cf0ef482dab0..6751a8123df7 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ovn-org/ovn/commit/b396babaa54ea0c8d943bbfef751dbdbf288c7af.patch"; hash = "sha256-RjWxT3EYKjGhtvCq3bAhKN9PrPTkSR72xPkQQ4SPWWU="; }) + # Fix build failure due to make install race condition. + # Posted at: https://patchwork.ozlabs.org/project/ovn/patch/20251012225908.37855-1-ihar.hrachyshka@gmail.com/ + ./0001-build-Fix-race-condition-when-installing-ovn-detrace.patch ]; nativeBuildInputs = [ From 37874d41063188bf776a77c2d5a82b27e1afa81f Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Sun, 12 Oct 2025 18:31:37 -0700 Subject: [PATCH 32/68] nixos/tpm2: Fix FAPI directory permission setting Use `tssUser` option value for FAPI log directory user in systemd-tmpfiles rules, instead of hardcoding `tss`. If `security.tpm2.abrmd.enable = false` (default), `tssUser` is root. Fixes systemd-tmpfiles-resetup error: /etc/tmpfiles.d/00-nixos.conf:: Failed to resolve user 'tss': No such process --- nixos/modules/security/tpm2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index 1fefc8f38adc..a8e6efdc780f 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -380,7 +380,7 @@ in { environment.etc."tpm2-tss/fapi-config.json".source = fapiConfig; systemd.tmpfiles.rules = [ - "d ${cfg.fapi.logDir} 2750 tss ${cfg.tssGroup} -" + "d ${cfg.fapi.logDir} 2750 ${cfg.tssUser} ${cfg.tssGroup} -" "d ${cfg.fapi.systemDir} 2750 root ${cfg.tssGroup} -" ]; } From dd4bf1f1a6ea9e94fdf0915cffde5dc5b027d411 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 12 Oct 2025 21:53:02 -0400 Subject: [PATCH 33/68] kodiPackages.svtplay: drop Has been marked broken since April 2024. Dropping per RFC 180. --- .../video/kodi/addons/svtplay/default.nix | 33 ------------------- pkgs/top-level/kodi-packages.nix | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/video/kodi/addons/svtplay/default.nix diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix deleted file mode 100644 index 2c6e75fe86de..000000000000 --- a/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildKodiAddon, - fetchFromGitHub, -}: -buildKodiAddon rec { - pname = "svtplay"; - namespace = "plugin.video.svtplay"; - version = "5.1.21"; - - src = fetchFromGitHub { - owner = "nilzen"; - repo = "xbmc-" + pname; - rev = "v${version}"; - sha256 = "sha256-CZtBUqFaKtMmKcpfBQp0Mb8sVvpCTkqcpfdYe41YSJs="; - }; - - meta = with lib; { - homepage = "https://forum.kodi.tv/showthread.php?tid=67110"; - description = "Watch content from SVT Play"; - longDescription = '' - With this addon you can stream content from SVT Play - (svtplay.se). The plugin fetches the video URL from the SVT - Play website and feeds it to the Kodi video player. HLS (m3u8) - is the preferred video format by the plugin. - ''; - platforms = platforms.all; - license = licenses.gpl3Plus; - teams = [ teams.kodi ]; - - broken = true; # no release for kodi 21 - }; -} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index b401629cda1b..3e966b4f6a37 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -143,8 +143,6 @@ let skyvideoitalia = callPackage ../applications/video/kodi/addons/skyvideoitalia { }; - svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; - steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; steam-launcher = callPackage ../applications/video/kodi/addons/steam-launcher { }; @@ -272,4 +270,6 @@ self throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { }; + + svtplay = throw "kodiPackages.svtplay has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-12 } From a83bfa3f723d5e31e2dc64c27b8adf65faffc8e5 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 12 Oct 2025 21:32:59 -0400 Subject: [PATCH 34/68] kodiPackages.osmc-skin: 20.1.0 -> 21.1.1; unbreak Diff: https://github.com/osmc/skin.osmc/compare/v20.1.0-August-update...v21.1.1-August-update Changelog: https://github.com/osmc/skin.osmc/blob/v21.1.1-August-update/Changelog.md --- pkgs/applications/video/kodi/addons/osmc-skin/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 0fddffde51f8..b45b7d51255c 100644 --- a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -6,13 +6,13 @@ buildKodiAddon rec { pname = "osmc-skin"; namespace = "skin.osmc"; - version = "20.1.0"; + version = "21.1.1"; src = fetchFromGitHub { owner = "osmc"; repo = namespace; - rev = "v20.1.0-August-update"; - sha256 = "E/+gC7NlVRMaymeYMBO39/+rs0blDjr2zIROr24ekzQ="; + tag = "v${version}-August-update"; + hash = "sha256-3BR6HfKefuyybDv9c/ZkkZMRDyWNZWpftulXyUAD9nY="; }; meta = with lib; { @@ -21,7 +21,5 @@ buildKodiAddon rec { platforms = platforms.all; maintainers = [ ]; license = licenses.cc-by-nc-sa-30; - - broken = true; # no release for kodi 21 }; } From 25e16108bcdc1e93206cc239214d72c44e2757b9 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sun, 12 Oct 2025 19:06:42 -0400 Subject: [PATCH 35/68] chez: Fix on Darwin --- pkgs/by-name/ch/chez/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 42035a6a82ba..0eea53f8bd98 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; depsBuildBuild = [ zuo # Used as the build driver - buildPackages.stdenv.cc # Needed for cross ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -86,8 +85,9 @@ stdenv.mkDerivation (finalAttrs: { "--threads" "--installprefix=${placeholder "out"}" "--installman=${placeholder "out"}/share/man" + "--installabsolute" "--enable-libffi" - "CC_FOR_BUILD=cc" + "CC_FOR_BUILD=${lib.getExe buildPackages.stdenv.cc}" # Use Nixpkgs dependencies "ZUO=zuo" "ZLIB=${zlib}/lib/libz${extensions.sharedLibrary}" @@ -112,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; + doInstallCheck = true; + installCheckPhase = '' + echo "(exit)" | "$out/bin/scheme" + ''; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 77e773dbc6c45c0678d1c5c588a071a30add51bf Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 9 Oct 2025 00:50:10 -0700 Subject: [PATCH 36/68] fetchpatch: support `hunks` option We can pick individual hunks or ranges of hunks with filterdiff, so expose that in fetchpatch. This was originally useful for openssh, since the first hunks always look like this (that is, only differing in the date): ``` @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.616 2025/08/29 03:50:38 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.617 2025/09/04 00:29:09 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland ``` The usage looks something like this to skip the first hunk in the patch. Numbers work too, if you'd like to only pick out specific hunks. ``` fetchpatch { name = "my-patch"; url = "..."; hunks = [ "2-" ]; hash = "..."; } ``` --- pkgs/build-support/fetchpatch/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index d42d7eedcdb1..aae62b688739 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -17,6 +17,7 @@ extraPrefix ? null, excludes ? [ ], includes ? [ ], + hunks ? [ ], revert ? false, postFetch ? "", nativeBuildInputs ? [ ], @@ -90,6 +91,10 @@ lib.throwIfNot (excludes == [ ] || includes == [ ]) -p1 \ ${toString (map (x: "-x ${lib.escapeShellArg x}") excludes)} \ ${toString (map (x: "-i ${lib.escapeShellArg x}") includes)} \ + ${ + lib.optionalString (hunks != [ ]) + "-# ${lib.escapeShellArg (lib.concatMapStringsSep "," toString hunks)}" + } \ "$tmpfile" > "$out" if [ ! -s "$out" ]; then @@ -113,6 +118,7 @@ lib.throwIfNot (excludes == [ ] || includes == [ ]) "extraPrefix" "excludes" "includes" + "hunks" "revert" "postFetch" "nativeBuildInputs" From 03ff9b06537b95477d8cfb9a2cff00c10809ab27 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 12 Oct 2025 23:23:57 -0700 Subject: [PATCH 37/68] fetchpatch: add tests for hunks --- pkgs/build-support/fetchpatch/tests.nix | 26 ++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index 77fe380d9710..3e79e9dd5469 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -24,18 +24,34 @@ in "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }; + hunks = testers.invalidateFetcherByDrvHash fetchpatch { + url = "https://github.com/openssh/openssh-portable/commit/35d5917652106aede47621bb3f64044604164043.patch"; + stripLen = 1; + hunks = [ + 2 + 3 + 4 + 5 + 6 + 7 + ]; + sha256 = + if isFetchpatch2 then + "sha256-SXJALY4zC4y/ZV7uVglf+XB5cpC5tS4M8QDGlFRmcFM=" + else + "sha256-MV7uGgA1ESMR7W6H5FjAIxKcpySdQjWB+L2zaHjd96M="; + }; + full = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "test"; stripLen = 1; extraPrefix = "foo/bar/"; excludes = [ "foo/bar/bernoulli_no_atomic_mp.cpp" ]; + # Should result in no change. + hunks = [ "1-" ]; revert = true; - sha256 = - if isFetchpatch2 then - "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM=" - else - "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; + sha256 = "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; }; decode = testers.invalidateFetcherByDrvHash fetchpatch { From b6659f5d61f337ec2f7471a40baae7398a3c02b1 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 12 Oct 2025 23:45:54 -0700 Subject: [PATCH 38/68] doc: add hunks to fetchpatch --- doc/build-helpers/fetchers.chapter.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 62c38ec4c59e..e5ec5f93888b 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -699,6 +699,9 @@ MSCREATE.DIR PINBALL.DOC PINBALL.MID Sounds WAVEMIX.INF - `extraPrefix`: Prefix pathnames by this string. - `excludes`: Exclude files matching these patterns (applies after the above arguments). - `includes`: Include only files matching these patterns (applies after the above arguments). +- `hunks`: Choose the specified hunks from each file (applies after the above arguments). + Note that you can specify a list of numbers or ranges of numbers + (for example, `[ 1 2 3 4 ]`, `[ "1-4" ]`, `[ "-4" ]`, or `[ "1-" ]` would all be the same effective range in a patch applying 4 hunks to a single file). - `revert`: Revert the patch. Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `hash` argument is changed as well. From df834320446d605203a76e6d5b4a86a5ff637062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 08:18:27 +0000 Subject: [PATCH 39/68] azahar: 2123.2 -> 2123.3 --- pkgs/by-name/az/azahar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 4b79ea2a4a9f..723afbd6da93 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2123.2"; + version = "2123.3"; src = fetchzip { url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-T0oVWYedap3BfMvnzKWEoW3+y3f3ld0RKp3z49LJIds="; + hash = "sha256-iFYA4qbeMHIV5nPlRc0OSnb4D5y6WacPIXvt/1ZwnTA="; }; patches = [ From f01178ef9cd6f90d83976bfc0187ba1ccddf67b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 09:34:37 +0000 Subject: [PATCH 40/68] saga: 9.9.3 -> 9.10.0 --- pkgs/by-name/sa/saga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 691268e2d6a3..f935cd93dc36 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.9.3"; + version = "9.10.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-6wyAUf4Dy41OEHqlY1T8wh/RCmPeCboDccX7ieqXPdo="; + hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA="; }; sourceRoot = "saga-${version}/saga-gis"; From 300e0f70eb289bd181668aaf2d32d38dfeaae5f5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 13 Oct 2025 10:49:38 +0100 Subject: [PATCH 41/68] docuseal.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. docuseal.tests error: … while evaluating the attribute 'docuseal-postgresql' at pkgs/by-name/do/docuseal/package.nix:121:28: 120| tests = { 121| inherit (nixosTests) docuseal-postgresql docuseal-sqlite; | ^ 122| }; error: attribute 'docuseal-postgresql' missing at pkgs/by-name/do/docuseal/package.nix:121:28: 120| tests = { 121| inherit (nixosTests) docuseal-postgresql docuseal-sqlite; | ^ 122| }; --- pkgs/by-name/do/docuseal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix index fe9cd755e6d1..e161f5ea0708 100644 --- a/pkgs/by-name/do/docuseal/package.nix +++ b/pkgs/by-name/do/docuseal/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (nixosTests) docuseal-postgresql docuseal-sqlite; + inherit (nixosTests) docuseal-psql docuseal-sqlite; }; updateScript = ./update.sh; }; From af4f868a216ea94a0b5cecab302551a746979c17 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 13 Oct 2025 13:03:02 +0200 Subject: [PATCH 42/68] tini: add patch for cmake minimum version --- pkgs/by-name/ti/tini/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/ti/tini/package.nix b/pkgs/by-name/ti/tini/package.nix index 0779a1ac627c..8ec27ff2b298 100644 --- a/pkgs/by-name/ti/tini/package.nix +++ b/pkgs/by-name/ti/tini/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + fetchpatch, }: stdenv.mkDerivation rec { @@ -16,6 +17,18 @@ stdenv.mkDerivation rec { sha256 = "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; + # Note: These patches can be removed with the next release + patches = [ + (fetchpatch { + url = "https://github.com/krallin/tini/commit/0b44d3665869e46ccbac7414241b8256d6234dc4.patch"; + hash = "sha256-gjM8MaPVx65f7KIry2XVYnVyjoBCQZAp2cQ8m7eW24c="; + }) + (fetchpatch { + url = "https://github.com/krallin/tini/commit/071c715e376e9ee0ac1a196fe8c38bcb61ad385c.patch"; + hash = "sha256-idnYcVuhCXQuhFSqcrNjbCLhR4HNlv8QonrtBqEbo3A="; + }) + ]; + postPatch = "sed -i /tini-static/d CMakeLists.txt"; env.NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; From fca7dd3f16d797749391e4f501b6e3865ebb72d1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 Oct 2025 11:10:19 +0000 Subject: [PATCH 43/68] nbqa: skip failing test --- pkgs/by-name/nb/nbqa/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 7f2f12863ee9..f9dd52c2f360 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -7,6 +7,7 @@ ruff, # tests + addBinToPathHook, versionCheckHook, nix-update-script, @@ -51,14 +52,12 @@ let tomli ]; + # Force using the Ruff executable rather than the Python package postPatch = '' - # Force using the Ruff executable rather than the Python package - substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' - ''; - - preCheck = '' - # Allow the tests to run `nbqa` itself from the path - export PATH="$out/bin":"$PATH" + substituteInPlace nbqa/__main__.py \ + --replace-fail \ + 'if shell:' \ + 'if shell or main_command == "ruff":' ''; nativeCheckInputs = @@ -72,7 +71,10 @@ let yapf ]) ++ lib.flatten (lib.attrValues optional-dependencies) - ++ [ versionCheckHook ]; + ++ [ + addBinToPathHook + versionCheckHook + ]; versionCheckProgramArg = "--version"; disabledTests = [ @@ -86,6 +88,9 @@ let "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" "test_pylint_works" + + # ruff output has changed and invalidates the snapshot tests (AssertionError) + "test_ruff_works" ]; disabledTestPaths = [ From 354c687b5e983fc83d546f4e6387fb2753f4f4e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 11:40:12 +0000 Subject: [PATCH 44/68] vscode-extensions.charliermarsh.ruff: 2025.26.0 -> 2025.28.0 --- .../vscode/extensions/charliermarsh.ruff/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 50a8e97e3537..0a72e3de88a1 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-7tP5hFK1ohPN143Vwt6XJxk2mOXURpD7k95MRcMOCkY="; + hash = "sha256-Rf8cx11qoXxFdPoItXSsEFc/QvLxYnyEt46Fv9fZdWw="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-PhwYpFSeZU/00JyQ+BpVbqlmsgfJgsGsbfnBGZ5WrnA="; + hash = "sha256-t97dol5FTLl2gSi3HbI4S7YpHcRygfBNcpNhWnlO1Xc="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-GS9h2PkVjhButVrug7A7gx1qwLqFUI5tv/b++vhSetM="; + hash = "sha256-BRkebtBrOVD/usNbu1TOXxklrLyKIOxSgzZEeBlhRAo="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-Twr0WcxZ4x9/85FyBHbzTKzCzZzamGKyX3yolql9l90="; + hash = "sha256-us/4xn6IO09MZApja9KwdD+0HIKm5+cmG/kmggJ6mC8="; }; }; in { name = "ruff"; publisher = "charliermarsh"; - version = "2025.26.0"; + version = "2025.28.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); From 772f368f7f74ce79a1e2eaa488a7d7e2e1d80ae2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Oct 2025 13:49:20 +0200 Subject: [PATCH 45/68] python313Packages.fountains: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/fountains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index 8d789b9b7c4c..8596f2086643 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "fountains"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kRu+jCKRfkH0URNuYvTF3TF1WslyfeE2EHE1VLCMyys="; + hash = "sha256-gGYmHvlD9cmivPtM/2sKW36FvUzk5FxYBgZfLUX2lIg="; }; build-system = [ setuptools ]; From 10195ef7c8c7c0309a7358ed66196dd41a4deccb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Oct 2025 13:50:03 +0200 Subject: [PATCH 46/68] python313Packages.pyvicare: 2.52.0 -> 2.54.0 Diff: https://github.com/openviess/PyViCare/compare/2.52.0...2.54.0 Changelog: https://github.com/openviess/PyViCare/releases/tag/2.54.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 0b9c3d1dffa8..73989dfa6fda 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.52.0"; + version = "2.54.0"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; tag = version; - hash = "sha256-Fq4XRJIN7f5SgSkSh0EveQHSHT35NVvCbPEEeW8h+vc="; + hash = "sha256-WRh3Qwo2ZB3zEwfnm5QRSCe46dNlanduPVeFSlbWEFY="; }; postPatch = '' From b8ca65a70682789857846042bfe3b44d2a1d81c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Oct 2025 13:58:42 +0200 Subject: [PATCH 47/68] wapiti: 3.2.5 -> 3.2.6 Changelog: https://github.com/wapiti-scanner/wapiti/blob/3.2.6/doc/ChangeLog_Wapiti --- pkgs/by-name/wa/wapiti/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index ad536e558efc..54915ee3556b 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "wapiti"; - version = "3.2.5"; + version = "3.2.6"; pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = "wapiti"; tag = version; - hash = "sha256-Sof7ZaCeIJ6Hsut0uK9yPcunXArexpzIbSbksZpHqVU="; + hash = "sha256-dcPFHy7W6wJ+KpD8e9VfO+AgedwaA2+xeJImxRxq4oE="; }; pythonRelaxDeps = true; @@ -66,6 +66,7 @@ python3Packages.buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; + versionCheckProgramArg = "--version"; disabledTests = [ @@ -94,6 +95,7 @@ python3Packages.buildPythonApplication rec { "test_meta_detection" "test_multi_detection" "test_no_crash" + "test_ns_takeover" "test_options" "test_out_of_band" "test_partial_tag_name_escape" From 7fdea47a79af893d9a16513b0bf71c1d3b97c5d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 12:01:36 +0000 Subject: [PATCH 48/68] build(deps): bump cachix/install-nix-action from 31.7.0 to 31.8.0 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.7.0 to 31.8.0. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md) - [Commits](https://github.com/cachix/install-nix-action/compare/9280e7aca88deada44c930f1e2c78e21c3ae3edd...7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-version: 31.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/check.yml | 2 +- .github/workflows/eval.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- .github/workflows/reviewers.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b13ddd68f26..3f27b3e46538 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 with: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 53601bfcc023..cc36502c89cf 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -79,7 +79,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index e88ed1b9999c..9d99c888bec7 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -47,7 +47,7 @@ jobs: ci/pinned.json - name: Install Nix - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - name: Load supported versions id: versions @@ -92,7 +92,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Install Nix - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -190,7 +190,7 @@ jobs: merge-multiple: true - name: Install Nix - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - name: Combine all output paths and eval stats run: | @@ -350,7 +350,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} - name: Install Nix - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - name: Run misc eval tasks in parallel run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bf17d67016ff..1858f463ad83 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,7 +32,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well, # because the cache would be invalidated on every commit - treefmt checks every file. @@ -66,7 +66,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -94,7 +94,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index e96a09169e32..32290c179130 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -33,7 +33,7 @@ jobs: sparse-checkout: ci - name: Install Nix - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31 + uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31 - name: Build the requestReviews derivation run: nix-build trusted/ci -A requestReviews From eeaca62324bc0ed22942e59259758b9de20c6645 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 12:24:53 +0000 Subject: [PATCH 49/68] python3Packages.types-aiobotocore: 2.24.2 -> 2.25.0 --- pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index a075384f036a..82b27593cd0a 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.24.2"; + version = "2.25.0"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-TSmuDoSPIKzr/NIpzavsrj4cE/E9n8yemHMlRGFBOxw="; + hash = "sha256-fl6WVok11SVQlbX4qu3AwbJldwomCiq27X1Mfqf+gig="; }; build-system = [ setuptools ]; From 12828f1fa027d9b09bbec49b3a553263514c9aed Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 13 Oct 2025 14:58:33 +0200 Subject: [PATCH 50/68] docker-tini: unset patches of original tini package --- pkgs/applications/virtualization/docker/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 26754231051b..1a6924d470d4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -123,6 +123,8 @@ let hash = tiniHash; }; + patches = [ ]; + # Do not remove static from make files as we want a static binary postPatch = ""; From 4d7dfe90ec9ec1468c5e400b6ed77e9d23223917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 13:05:18 +0000 Subject: [PATCH 51/68] prometheus-solaredge-exporter: 0.1.6 -> 0.1.7 --- pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix index 032b3d222d83..d326c422b492 100644 --- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "prometheus-solaredge-exporter"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "paepckehh"; repo = "solaredge_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-vk2e9OeTt1T0f8H3uLHbd2fBO2KVse0IYrSFCu68Wgk="; + hash = "sha256-nWx+8meEzdMuOMEYiV+/VxDosFA/LM8qwWz4VbRzZds="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-Utydte6V07BN5Lz3Js54DqPV+cdnH2p1J5gYliFQYlU="; + vendorHash = "sha256-8dAC/NydnpusEN4mTRewSvLjaF3pMlrVd+wo/A/S0fM="; passthru.updateScript = nix-update-script { }; From b08521e6c2b2a53f93493eed26a8d3d1cba2a047 Mon Sep 17 00:00:00 2001 From: akotro Date: Wed, 1 Oct 2025 18:09:03 +0100 Subject: [PATCH 52/68] maintainers: add mikeodr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f72df1c17bcf..8702b382f900 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16848,6 +16848,12 @@ githubId = 123373126; name = "Mike Horn"; }; + mikeodr = { + email = "mike@unusedbytes.ca"; + github = "mikeodr"; + githubId = 61757; + name = "Mike O'Driscoll"; + }; mikesperber = { email = "sperber@deinprogramm.de"; github = "mikesperber"; From 7e5920bcf3b7ddbaa998fa88720ac0a8f5260f7f Mon Sep 17 00:00:00 2001 From: akotro Date: Thu, 25 Sep 2025 13:23:42 +0100 Subject: [PATCH 53/68] nixos/tsidp: init module --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/security/tsidp.nix | 236 ++++++++++++++++++ 3 files changed, 239 insertions(+) create mode 100644 nixos/modules/services/security/tsidp.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 8240c63ab2d8..f69aeae62847 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -78,6 +78,8 @@ - [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable). +- [tsidp](https://github.com/tailscale/tsidp), a simple OIDC / OAuth Identity Provider (IdP) server for your tailnet. Available as [services.tsidp](#opt-services.tsidp.enable). + - [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable). - [IfState](https://ifstate.net), manage host interface settings in a declarative manner. Available as [networking.ifstate](options.html#opt-networking.ifstate.enable) and [boot.initrd.network.ifstate](options.html#opt-boot.initrd.network.ifstate.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 876e463d7a86..cc338fc65b21 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1485,6 +1485,7 @@ ./services/security/tor.nix ./services/security/torify.nix ./services/security/torsocks.nix + ./services/security/tsidp.nix ./services/security/usbguard.nix ./services/security/vault-agent.nix ./services/security/vault.nix diff --git a/nixos/modules/services/security/tsidp.nix b/nixos/modules/services/security/tsidp.nix new file mode 100644 index 000000000000..f79c4eceaf3e --- /dev/null +++ b/nixos/modules/services/security/tsidp.nix @@ -0,0 +1,236 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + getExe + maintainers + mkEnableOption + mkIf + mkOption + mkPackageOption + optional + ; + inherit (lib.types) + path + str + port + bool + enum + nullOr + ; + + cfg = config.services.tsidp; +in +{ + options.services.tsidp = { + enable = mkEnableOption "tsidp server"; + + package = mkPackageOption pkgs "tsidp" { }; + + environmentFile = mkOption { + type = nullOr path; + description = '' + Path to an environment file loaded for the tsidp service. + + This can be used to securely store tokens and secrets outside of the world-readable Nix store. + + Example contents of the file: + ``` + TS_AUTH_KEY=YOUR_TAILSCALE_AUTHKEY + ``` + ''; + default = null; + example = "/run/secrets/tsidp"; + }; + + settings = { + hostName = mkOption { + type = str; + default = "idp"; + description = '' + The hostname to use for the tsnet node. + ''; + }; + + port = mkOption { + type = port; + default = 443; + description = '' + Port to listen on (default: 443). + ''; + }; + + localPort = mkOption { + type = nullOr port; + default = null; + description = "Listen on localhost:."; + }; + + useLocalTailscaled = mkOption { + type = bool; + description = '' + Use local tailscaled instead of tsnet. + ''; + default = false; + }; + + enableFunnel = mkOption { + type = bool; + default = false; + description = '' + Use Tailscale Funnel to make tsidp available on the public internet so it works with SaaS products. + ''; + }; + + enableSts = mkOption { + type = bool; + default = true; + description = '' + Enable OAuth token exchange using RFC 8693. + ''; + }; + + logLevel = mkOption { + type = enum [ + "debug" + "info" + "warn" + "error" + ]; + description = '' + Set logging level: debug, info, warn, error. + ''; + default = "info"; + }; + + debugAllRequests = mkOption { + type = bool; + description = '' + For development. Prints all requests and responses. + ''; + default = false; + }; + + debugTsnet = mkOption { + type = bool; + description = '' + For development. Enables debug level logging with tsnet connection. + ''; + default = false; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings.useLocalTailscaled -> config.services.tailscale.enable == true; + message = "Tailscale service must be enabled if services.tsidp.settings.useLocalTailscaled is used."; + } + ]; + + systemd.services.tsidp = + let + deps = [ + "network.target" + ] + ++ optional (cfg.settings.useLocalTailscaled) "tailscaled.service"; + in + { + description = "tsidp"; + after = deps; + wants = deps; + wantedBy = [ + "multi-user.target" + "network-online.target" + ]; + restartTriggers = [ + cfg.package + cfg.environmentFile + ]; + + environment = { + HOME = "/var/lib/tsidp"; + TAILSCALE_USE_WIP_CODE = "1"; # Needed while tsidp is in development (< v1.0.0). + }; + + serviceConfig = { + Type = "simple"; + ExecStart = + let + args = lib.cli.toGNUCommandLineShell { mkOptionName = k: "-${k}"; } { + hostname = cfg.settings.hostName; + port = cfg.settings.port; + local-port = cfg.settings.localPort; + use-local-tailscaled = cfg.settings.useLocalTailscaled; + funnel = cfg.settings.enableFunnel; + enable-sts = cfg.settings.enableSts; + log = cfg.settings.logLevel; + debug-all-requests = cfg.settings.debugAllRequests; + debug-tsnet = cfg.settings.debugTsnet; + }; + in + "${getExe cfg.package} ${args}"; + Restart = "always"; + RestartSec = "15"; + + DynamicUser = true; + StateDirectory = "tsidp"; + WorkingDirectory = "/var/lib/tsidp"; + ReadWritePaths = mkIf (cfg.settings.useLocalTailscaled) [ + "/var/run/tailscale" # needed due to `ProtectSystem = "strict";` + "/var/lib/tailscale" + ]; + BindPaths = mkIf (cfg.settings.useLocalTailscaled) [ + "/var/run/tailscale:/var/run/tailscale" + ]; + + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateNetwork = false; # provides the service through network + PrivateTmp = true; + PrivateUsers = true; + PrivateDevices = true; + ProtectHome = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ProtectHostname = true; + ProtectProc = "invisible"; + ProcSubset = "all"; # tsidp needs access to /proc/net/route + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" + ]; + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + }; + }; + }; + + meta.maintainers = with maintainers; [ + akotro + mikeodr + yethal + ]; +} From 82163ea48ab46c443573a908091c82f7a8d33284 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sun, 12 Oct 2025 15:03:43 +0000 Subject: [PATCH 54/68] ArchiSteamFarm: 6.2.0.5 -> 6.2.2.3 Signed-off-by: Ludovico Piero --- .../misc/ArchiSteamFarm/default.nix | 8 +- .../misc/ArchiSteamFarm/deps.json | 132 +++++++++--------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 3ffdbe7cc269..8951afb663bd 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -6,6 +6,7 @@ libkrb5, zlib, openssl, + stdenv, callPackage, }: @@ -20,13 +21,13 @@ in buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.2.0.5"; + version = "6.2.2.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-CNnSsFBeO3BHUbom0eytfz02Q7QBv8JEmHbgPSL7I3Y="; + hash = "sha256-FV9dYp3E8MHra5pyrh8dqZ/85TDwNbdiLV/XdAWiJsg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; @@ -61,7 +62,8 @@ buildDotnetModule rec { openssl ]; - doCheck = true; + # times out when trying to connect to something even with relaxed sandbox + doCheck = stdenv.hostPlatform.isLinux; preInstall = '' dotnetProjectFiles=(ArchiSteamFarm) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index 6ead391ae25d..226a09233c96 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -271,13 +271,13 @@ }, { "pname": "JetBrains.Annotations.Sources", - "version": "2025.2.0", - "hash": "sha256-5mbTLcs1x0JtVeuN66t+0jvokYbMqFk6Bkhk+WOHlg4=" + "version": "2025.2.2", + "hash": "sha256-9Aui689O6j0E34FSwTLGEwar5etuswWg3FU7+mIzpdU=" }, { "pname": "Markdig.Signed", - "version": "0.41.3", - "hash": "sha256-r4DrP47vgky0+AbNBFso7AwwzAHgrioK2B08UIxEaNI=" + "version": "0.42.0", + "hash": "sha256-VE3mwvcaGUfx5MKu2ewSN1dgeJmSyc85YZj6j9kH/EE=" }, { "pname": "Microsoft.ApplicationInsights", @@ -286,8 +286,8 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.7", - "hash": "sha256-6W8haECWwvPnnUMlceAvSMuGzT7o5Nyz2478XXBjpoc=" + "version": "9.0.9", + "hash": "sha256-HUkOmPH+lCOqmP+fz3Ezree8cSmxkm5C/qhmZwEukJw=" }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", @@ -416,23 +416,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.13.0", - "hash": "sha256-B5PshNfnDfB36QjEOf0S3FQaC+9K7MR+y5KUiQDHfhg=" + "version": "8.14.0", + "hash": "sha256-bkCuz1Wj56N+LHWLvHKLcCtIRqBK+3k5vD2qfB7xXKk=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.13.0", - "hash": "sha256-i9CvrXUvYvtmuAQNHU9IvjItFh6x2/O8CAuEjeOOYyg=" + "version": "8.14.0", + "hash": "sha256-YBXaSWnLgxIQxv+Lwt2aRC20miFguNZbbuTc2Jjq+Ys=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.13.0", - "hash": "sha256-wg6jCW8tiXfwrKs/Hxo0M0Cyi2EPRlIa6+vfnVxsQ+M=" + "version": "8.14.0", + "hash": "sha256-QvCJplLvTGTXZKGbRMccW2hld6oWUhHkneZd+msn9aE=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.13.0", - "hash": "sha256-M1NZQyQt8q10MLai4BooKtzJebRVwHeQuq/UQiJl28c=" + "version": "8.14.0", + "hash": "sha256-ALeMe3AjEy4dazHTBeR1JHMtzm+sqS3RbrjQWoNbuno=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -456,23 +456,23 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.7.3", - "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg=" + "version": "1.8.4", + "hash": "sha256-0x/+WMoKlfXfua3LS5PNStTVwYFN5oEYq/oGhDjIP9I=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport", - "version": "1.7.3", - "hash": "sha256-QX6Oo6uI9XWRbgrjdHxzROIhTHm12ai6wIDtDuqDJwA=" + "version": "1.8.4", + "hash": "sha256-J6JYuhnaB8BcI2hrKXKGlmD6Ekfmlbfxkeb+Nttvw5Q=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.7.3", - "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw=" + "version": "1.8.4", + "hash": "sha256-eCpLSg3IsASsGsx02dfwWDTqUT4GGOxZ9qnxPT4NC64=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.7.3", - "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM=" + "version": "1.8.4", + "hash": "sha256-gcTAh0VFbPlZPdlUvd0nS9sWjXXI3oAWVqXfCDjZQsw=" }, { "pname": "Microsoft.Testing.Platform", @@ -481,13 +481,13 @@ }, { "pname": "Microsoft.Testing.Platform", - "version": "1.7.3", - "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA=" + "version": "1.8.4", + "hash": "sha256-UFddnBCKuD4MLOhCNYu1afbBZpyTX3V62faiDyqKzzg=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.7.3", - "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM=" + "version": "1.8.4", + "hash": "sha256-YalMy/SeYFXS1XinHsCq/LPOYFzlXhY+KZNuby137KU=" }, { "pname": "Microsoft.TestPlatform.AdapterUtilities", @@ -511,23 +511,23 @@ }, { "pname": "MSTest", - "version": "3.9.3", - "hash": "sha256-sfvkUW4AZEmFduiSZYh3ZuXgE8/boC7gYMMleP4nkUA=" + "version": "3.10.4", + "hash": "sha256-68Qkn+uz6DwRmjuNYubcCvCZr8H5SPpyRDBaLNebYec=" }, { "pname": "MSTest.Analyzers", - "version": "3.9.3", - "hash": "sha256-uD74gJNVNSQNsxyzf/5kxCBFbgIY7pYdUrKZihAyLi4=" + "version": "3.10.4", + "hash": "sha256-+1ik4k79B5hJEoPHrerTT+34QBsmogtmkpksqduttQA=" }, { "pname": "MSTest.TestAdapter", - "version": "3.9.3", - "hash": "sha256-0krWgHpALFJMX707/SMN7b5ryEgm7taCoxtC4WBaglM=" + "version": "3.10.4", + "hash": "sha256-mFq6h9IBQI/V39SsATOhOGum3R9l4UNq3xGNoI/kcRQ=" }, { "pname": "MSTest.TestFramework", - "version": "3.9.3", - "hash": "sha256-kkW155gzuv0xjiucutNs4RjF9g2NEIZ39+nruRun4As=" + "version": "3.10.4", + "hash": "sha256-JFczGh52OdMmsSyIGnLtTzAZXp4E8sh095JFvnfxoMY=" }, { "pname": "Newtonsoft.Json", @@ -556,18 +556,18 @@ }, { "pname": "NLog", - "version": "6.0.2", - "hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ=" + "version": "6.0.4", + "hash": "sha256-OqcabOMq3cnOcmp+VGGLjLz1JpQrAPgg5kzrE5+UUGA=" }, { "pname": "NLog.Extensions.Logging", - "version": "6.0.2", - "hash": "sha256-RqgckCP99RHolPk7dBn97zJzvDVoQobVuuBH4GBEOWk=" + "version": "6.0.4", + "hash": "sha256-2Qh7WkpcZCokWLk9pH79EhoUEpBw8N8fH/3qqdp6Uzw=" }, { "pname": "NLog.Web.AspNetCore", - "version": "6.0.2", - "hash": "sha256-F6NLSfbhHDKZ6ApmObvKGEA6gLl4L3vmiegdYn1Kl2g=" + "version": "6.0.4", + "hash": "sha256-LYiSfgXGczlZPNIPV8haPVzYJ/ERndHQiGZnGJJL8OQ=" }, { "pname": "OpenTelemetry", @@ -611,23 +611,23 @@ }, { "pname": "protobuf-net", - "version": "3.2.52", - "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek=" + "version": "3.2.56", + "hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E=" }, { "pname": "protobuf-net.Core", - "version": "3.2.52", - "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ=" + "version": "3.2.56", + "hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc=" }, { "pname": "Scalar.AspNetCore", - "version": "2.6.4", - "hash": "sha256-OEj72jV42fBN6uFzmPEPA20c/g6eJRYOJvCLv6K54ME=" + "version": "2.8.7", + "hash": "sha256-Swc4U0e7Ko/izW52N+744dnUCJJxxCFHFGNQBqTRhJA=" }, { "pname": "SteamKit2", - "version": "3.3.0", - "hash": "sha256-/NxnVDatdrqIXCjs0P4gRjHq42r/K+wOv3JO5yiAIjU=" + "version": "3.3.1", + "hash": "sha256-f6kc15RKNxCSIlynlVHU8fBqQ7N8nG1xV3DNbBlRmvo=" }, { "pname": "System.Buffers", @@ -646,33 +646,33 @@ }, { "pname": "System.Composition", - "version": "9.0.7", - "hash": "sha256-6Ytzb6Xew7wNHpcCO/IpGag7VJvg9OUZKdA2hANpJUs=" + "version": "9.0.9", + "hash": "sha256-6q/xkCuLT0fnS0qu8tOLWxzHd4YmyiVBPMrIgABdKIc=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.7", - "hash": "sha256-OJrJP8X/RVHEktcOeVCrSO1lKub3/zjeBkLAQ0tKvgc=" + "version": "9.0.9", + "hash": "sha256-OmvRStX2f4UZUXgySUCn1O5l3O8ZKwAkqZvzN6MJEUw=" }, { "pname": "System.Composition.Convention", - "version": "9.0.7", - "hash": "sha256-XK/WUSIiyAZJQUIrzzvJFWuELyYp1F9Fu3VkVmZfvTw=" + "version": "9.0.9", + "hash": "sha256-saaJ9gMhoF+yrJNiUpgPzEb/bEHog5mlzQW+po6YBQM=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.7", - "hash": "sha256-gkaJ+yh97FpWRye4wDvZfkrPw2/hxlodbimhZslHVK4=" + "version": "9.0.9", + "hash": "sha256-YnvjiPtikurLd/sAnXiKk2cj8WajCDYE510bbAWXO0k=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.7", - "hash": "sha256-NbAgMCVEbVdbriLMyBh4lcgj+qhe4FJpXvTbOavPE3A=" + "version": "9.0.9", + "hash": "sha256-GgT/e3pv2itLgkdba2IOVQC1HdFIJP1yyjsKImZGc3s=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.7", - "hash": "sha256-uqJHYn2f9bdGcSO6+NW+sPmU4orqPbapMg3ZeIdlUOQ=" + "version": "9.0.9", + "hash": "sha256-c2rSr8X1uSYTnZghu/H2flVh9eKJMOC0VZ2MJ2bcrUk=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -686,8 +686,8 @@ }, { "pname": "System.IO.Hashing", - "version": "9.0.5", - "hash": "sha256-hMAhIhYl1QhtD21kSitvSnsNd9KgSydIRvjwZ/1iFes=" + "version": "9.0.8", + "hash": "sha256-Jj1XwumBjBa5LJqSVTN2naQJ0FM4wwPvZS8NxGd5Hnw=" }, { "pname": "System.Linq.Async", @@ -721,8 +721,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.7", - "hash": "sha256-e8mo6zKcAOUfh96LYeH60hm7xO/hOJHgHuQkDmW56Ss=" + "version": "9.0.9", + "hash": "sha256-v5+krFqBjMlPnI9xcI9GEw5h43qa1/lk1MuC7+t4eWc=" }, { "pname": "System.Security.Principal.Windows", @@ -741,7 +741,7 @@ }, { "pname": "ZstdSharp.Port", - "version": "0.8.5", - "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI=" + "version": "0.8.6", + "hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8=" } ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 8aeeef13a5e5..c86b35ecf4ed 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "cd42a0272ce9449b38d0654374867a409681a779"; + version = "d3b89fc7c3650c00b08beec82a49e9219ed370f2"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-dQVfgQM1b+UON+UO+sybCbn8OsriJp/tahzInVNwoqw="; + hash = "sha256-EFPtp+mff4qNkwDTaIxT5x6fDa890GLmI9fWQyPmqZk="; }; - npmDepsHash = "sha256-x2jBtpP3sVJNIFzlKvUhtqWX7H8OM4bnBcE70NQwCRA="; + npmDepsHash = "sha256-AA1NOOWfMUhWEEFuK7I3yMmO+1Oy7bq+7CBXPhm6FHA="; installPhase = '' runHook preInstall From 43ae6d8b4686b31867234e1692a1a5f2134080fc Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 13 Oct 2025 10:02:23 -0400 Subject: [PATCH 55/68] kanidm_1_7: 1.7.3 -> 1.7.4 Changelog: https://github.com/kanidm/kanidm/releases/tag/v1.7.4 --- pkgs/servers/kanidm/1_7.nix | 11 +++---- ...718a8a0325a53e0857668b8a0134d371794d.patch | 29 ------------------- pkgs/servers/kanidm/generic.nix | 2 +- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch diff --git a/pkgs/servers/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix index 11eb5796bd70..aa1355aeb93f 100644 --- a/pkgs/servers/kanidm/1_7.nix +++ b/pkgs/servers/kanidm/1_7.nix @@ -1,9 +1,6 @@ import ./generic.nix { - version = "1.7.3"; - hash = "sha256-eptbxhbd3pUvYCncgKprh0qes9CjdvGUl3CsG/sHX7M="; - cargoHash = "sha256-M0TXGvpMkV/4U0MRYVqiWQsA+9AHdeS89noLxE2Llt0="; - patches = [ - # remove 1.7.4 - https://github.com/kanidm/kanidm/issues/3813 - ./a3bc718a8a0325a53e0857668b8a0134d371794d.patch - ]; + version = "1.7.4"; + hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E="; + cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM="; + patches = [ ]; } diff --git a/pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch b/pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch deleted file mode 100644 index 7b07d8ec75ff..000000000000 --- a/pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a3bc718a8a0325a53e0857668b8a0134d371794d Mon Sep 17 00:00:00 2001 -From: Firstyear -Date: Sat, 16 Aug 2025 13:46:23 +1000 -Subject: [PATCH] Fix account recover-disable edge case (#3796) - ---- - server/lib/src/idm/server.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/server/lib/src/idm/server.rs b/server/lib/src/idm/server.rs -index 0fc6d78787..51bfbf6705 100644 ---- a/server/lib/src/idm/server.rs -+++ b/server/lib/src/idm/server.rs -@@ -1900,6 +1900,7 @@ impl IdmServerProxyWriteTransaction<'_> { - let modlist = ModifyList::new_list(vec![ - // Ensure the account is valid from *now*, and that the expiry is unset. - m_purge(Attribute::AccountExpire), -+ m_purge(Attribute::AccountValidFrom), - Modify::Present(Attribute::AccountValidFrom, v_valid_from), - // We need to remove other credentials too. - m_purge(Attribute::PassKeys), -@@ -1934,6 +1935,7 @@ impl IdmServerProxyWriteTransaction<'_> { - let modlist = ModifyList::new_list(vec![ - // Ensure that the account has no validity, and the expiry is now. - m_purge(Attribute::AccountValidFrom), -+ m_purge(Attribute::AccountExpire), - Modify::Present(Attribute::AccountExpire, v_expire), - ]); - diff --git a/pkgs/servers/kanidm/generic.nix b/pkgs/servers/kanidm/generic.nix index 324a5f596517..427388cb5652 100644 --- a/pkgs/servers/kanidm/generic.nix +++ b/pkgs/servers/kanidm/generic.nix @@ -149,7 +149,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "-vr" "v(${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\.[0-9]*)" "--override-filename" - "pkgs/by-name/ka/kanidm/${versionUnderscored finalAttrs}.nix" + "pkgs/servers/kanidm/${versionUnderscored finalAttrs}.nix" ]; }); From a7f9a42cfea66fb61f8c1b5e009bf75fef70b969 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 13 Oct 2025 10:30:01 -0400 Subject: [PATCH 56/68] finit: don't enable modprobe plugin by default --- pkgs/by-name/fi/finit/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fi/finit/package.nix b/pkgs/by-name/fi/finit/package.nix index 0993428521b1..a5cf42193cf3 100644 --- a/pkgs/by-name/fi/finit/package.nix +++ b/pkgs/by-name/fi/finit/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { "--localstatedir=/var" # tweak default plugin list - "--enable-modprobe-plugin=yes" "--enable-modules-load-plugin=yes" "--enable-hotplug-plugin=no" From db45f2b770df9271fb8e2bfab2f867e8f0e4153c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 9 Oct 2025 12:58:59 -0700 Subject: [PATCH 57/68] lib: remove mapAttrsFlatten after a year It was deprecated in b9c51260d0620ffb0ef59d09b85d1f9d7b979b8c. --- doc/release-notes/rl-2511.section.md | 2 ++ lib/default.nix | 1 - lib/deprecated/misc.nix | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 57006bd0e718..5473e5fa28b6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -301,6 +301,8 @@ - `reaction` has been updated to version 2, which includes some breaking changes. For more information, [check the release article](https://blog.ppom.me/en-reaction-v2). +- `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead. + - `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead. - The `buildPythonPackage` and `buildPythonApplication` functions now require diff --git a/lib/default.nix b/lib/default.nix index 3e8fdd1c762d..217885990c20 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -552,7 +552,6 @@ let modifySumArgs innerClosePropagation closePropagation - mapAttrsFlatten nvs setAttr setAttrMerge diff --git a/lib/deprecated/misc.nix b/lib/deprecated/misc.nix index 0abf4e0d080c..7865f0ce760f 100644 --- a/lib/deprecated/misc.nix +++ b/lib/deprecated/misc.nix @@ -29,11 +29,8 @@ let nameValuePair tail toList - warn ; - inherit (lib.attrsets) removeAttrs mapAttrsToList; - # returns default if env var is not set maybeEnv = name: default: @@ -278,9 +275,6 @@ let closePropagation = if builtins ? genericClosure then closePropagationFast else closePropagationSlow; - # calls a function (f attr value ) for each record item. returns a list - mapAttrsFlatten = warn "lib.misc.mapAttrsFlatten is deprecated, please use lib.attrsets.mapAttrsToList instead." mapAttrsToList; - # attribute set containing one attribute nvs = name: value: listToAttrs [ (nameValuePair name value) ]; # adds / replaces an attribute of an attribute set @@ -470,7 +464,6 @@ in innerClosePropagation innerModifySumArgs lazyGenericClosure - mapAttrsFlatten maybeAttr maybeAttrNullable maybeEnv From 184c05b0a76d811c0202423130d856eca7009d7b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 Oct 2025 15:55:50 +0000 Subject: [PATCH 58/68] bacon: 3.18.0 -> 3.19.0 Diff: https://github.com/Canop/bacon/compare/v3.18.0...v3.19.0 Changelog: https://github.com/Canop/bacon/blob/v3.19.0/CHANGELOG.md --- pkgs/by-name/ba/bacon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 4ae74b7d1470..7cfdf8cf4111 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,16 +27,16 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-YdlNJWsKGkXvpcA8un3eNfLVBlU6nalVyO/dhDAQF9k="; + hash = "sha256-SI84InLMolecdewXvHVFsh9aj9ckFFQOq+uzNFI1FBU="; }; - cargoHash = "sha256-vGrWs8OkoqPO/oEiGZXrMxIKVA3u4gsaXgF1QUQT3kw="; + cargoHash = "sha256-q+GpRrkcH0lgbL6JSda5eXUay56q8SMSYJcEi/rePyI="; buildFeatures = lib.optionals withSound [ "sound" From 4a307a00005c1f9a3abb2e800f1e1c507027d5c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 16:01:56 +0000 Subject: [PATCH 59/68] ghostfolio: 2.206.0 -> 2.208.0 --- pkgs/by-name/gh/ghostfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index b9247bb438ae..52620e15ded7 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.206.0"; + version = "2.208.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-tlaCm3Q6Z8/rjFf/ekp5cNlyH1IPCutH1Q9B0fQBzLU="; + hash = "sha256-AZc9STEbM9QOa8vD3VzUkPINeP95B031yLxS8rQ1zvw="; # 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; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-SbASljZ1Bk9bm4ev53qo+xfCz5mUeRn+GPl3pA9MXnA="; + npmDepsHash = "sha256-ayuPQ7uKN9XZe2svr+CBGS/r4RjCOiCvS342AQSe82s="; nativeBuildInputs = [ prisma From d979cacbda2ef5e05af7e6893ecbfa222a6d5fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Oct 2025 09:02:41 -0700 Subject: [PATCH 60/68] libdeltachat: 2.18.0 -> 2.20.0 Diff: https://github.com/chatmail/core/compare/v2.18.0...v2.20.0 Changelog: https://github.com/chatmail/core/blob/v2.20.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index da169392960d..9b5035bba17d 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.18.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-76yojZnsaKtUEZLBNFuU+HTft69aowDLpRm5Nq87F9o="; + hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-FwqPmKlX96oMjnrg7Q6MOWOmZ/72QidTD9vDCaBWx7c="; + hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc="; }; nativeBuildInputs = [ From 99475f13b361a9a65c18a04c1d1847d962a53825 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 16:07:22 +0000 Subject: [PATCH 61/68] home-assistant-custom-components.solax_modbus: 2025.10.1 -> 2025.10.2 --- .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index eb47147bbcb2..1cf93d2e3a0f 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2025.10.1"; + version = "2025.10.2"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-cmSaVg/v/rledIY980BJyGaLN3CQtCGMextN2WzOmXk="; + hash = "sha256-ZwhzvxjzFqB/ENamT2jBUsm/i6dfcKv2YTnuJMCaQNI="; }; dependencies = [ pymodbus ]; From 3aefc14acace994966f44cb45169b3e097e80b47 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 9 Oct 2025 12:10:07 -0700 Subject: [PATCH 62/68] lib.attrsets: remove deprecated names - `lib.attrsets.cartesianProductOfSets` was deprecated in 228621e42dc43 - `lib.attrsets.zip` was deprecated in fcbc4fe9ffe55 (2013!) - `lib.attrsets.zipWithNames` was deprecated in 00127bef3f2d7 (2009!) The time has come. --- doc/release-notes/rl-2511.section.md | 6 ++++++ lib/attrsets.nix | 19 +------------------ lib/default.nix | 3 --- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 5473e5fa28b6..99f2cc2e0f0a 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -303,6 +303,12 @@ - `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead. +- `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead. + +- `lib.attrsets.zip` has been removed, following its deprecation in 2013. Use `lib.attrsets.zipAttrsWith` instead. + +- `lib.attrsets.zipWithNames` has been removed, following its deprecation in 2009. Use `lib.attrsets.zipAttrsWithNames` instead. + - `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead. - The `buildPythonPackage` and `buildPythonApplication` functions now require diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 59e4518b0ddc..564625050b6a 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -6,12 +6,7 @@ let inherit (builtins) head length typeOf; inherit (lib.asserts) assertMsg; - inherit (lib.trivial) - oldestSupportedReleaseIsAtLeast - mergeAttrs - warn - warnIf - ; + inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs; inherit (lib.strings) concatStringsSep concatMapStringsSep @@ -2234,16 +2229,4 @@ rec { ) intersection; in (x // y) // mask; - - # DEPRECATED - zipWithNames = warn "lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames; - - # DEPRECATED - zip = warn "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith; - - # DEPRECATED - cartesianProductOfSets = - warnIf (oldestSupportedReleaseIsAtLeast 2405) - "lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct." - cartesianProduct; } diff --git a/lib/default.nix b/lib/default.nix index 217885990c20..cbb58e302504 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -232,12 +232,9 @@ let getInclude getMan chooseDevOutputs - zipWithNames - zip recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct - cartesianProductOfSets mapCartesianProduct updateManyAttrsByPath listToAttrs From cbed9e665f6b8e75c1032822f7200a32aeb38c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 16:27:40 +0000 Subject: [PATCH 63/68] rattler-build: 0.48.0 -> 0.48.1 --- pkgs/by-name/ra/rattler-build/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index d6c20e3564e1..1a8c31cb9e8f 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.48.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z3FRPk7FGqOraATtrdrrhwMr1mVC4lStDp3seCrKPGw="; + hash = "sha256-Aa4hAcWPwRTFVWrtb7ddGkx8Zm4WZn+q+S8a/1qyrV0="; }; - cargoHash = "sha256-tzW3za0cn8qMsqEs+U10ud/tvU+eFxtolmyJDpf6WoY="; + cargoHash = "sha256-XSwOB75N+xawyXeHrSPvEDMw2awZLCR0CaCZg4gdeFA="; doCheck = false; # test requires network access From 335ee0ff7bfe289c767b49537607a9c764ba8879 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Oct 2025 18:22:17 +0200 Subject: [PATCH 64/68] haskellPackages: regenerate package set based on current config (generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh) --- pkgs/development/haskell-modules/hackage-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f055e85f69f..e806894c7baa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -400804,7 +400804,10 @@ self: { description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; mainProgram = "kmonad"; - maintainers = [ lib.maintainers.slotThe ]; + maintainers = [ + lib.maintainers.auscyber + lib.maintainers.slotThe + ]; } ) { }; From 5260d68085b8f76ade477f310a01b8d2236391f5 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Oct 2025 18:19:32 +0200 Subject: [PATCH 65/68] haskellPackages.mason: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 816222eed545..d6bd8bc4302a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -544,6 +544,10 @@ with haskellLib; # https://github.com/essandess/adblock2privoxy/pull/43 adblock2privoxy = doJailbreak super.adblock2privoxy; + # 2025-07-15: Relax version constraints (network < 3.2) + # Fixed upstream, but unreleased: https://github.com/fumieval/mason/pull/14 + mason = (warnAfterVersion "0.2.6") (doJailbreak super.mason); + # Missing test file https://gitlab.com/dpwiz/hs-jpeg-turbo/-/issues/1 jpeg-turbo = dontCheck super.jpeg-turbo; JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 858fdec167ff..eda038782976 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3914,7 +3914,6 @@ broken-packages: - marshal-contt # failure in job https://hydra.nixos.org/build/233231755 at 2023-09-02 - marvin-interpolate # failure in job https://hydra.nixos.org/build/233201000 at 2023-09-02 - MASMGen # failure in job https://hydra.nixos.org/build/233213454 at 2023-09-02 - - mason # failure in job https://hydra.nixos.org/build/295095242 at 2025-04-22 - massiv-scheduler # failure in job https://hydra.nixos.org/build/233196778 at 2023-09-02 - massiv-serialise # failure in job https://hydra.nixos.org/build/233242284 at 2023-09-02 - master-plan # failure in job https://hydra.nixos.org/build/233208718 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e806894c7baa..258b2c2343f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -437632,8 +437632,6 @@ self: { ]; description = "Fast and extensible bytestring builder"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; From 8cffeac108fe8a4cf35f34dd9029679db6d15240 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:39:20 +0200 Subject: [PATCH 66/68] python3Packages.scancode-toolkit: make use of writableTmpDirAsHomeHook --- .../python-modules/scancode-toolkit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index bd89b5a31047..089c4af137e1 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -55,6 +55,7 @@ typecode, typecode-libmagic, urlpy, + writableTmpDirAsHomeHook, xmltodict, zipp, }: @@ -130,12 +131,13 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.9") [ zipp ]; + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + nativeCheckInputs = [ pytestCheckHook ]; - # Importing scancode needs a writeable home, and preCheck happens in between - # pythonImportsCheckPhase and pytestCheckPhase. postInstall = '' - export HOME=$(mktemp -d) ''; pythonImportsCheck = [ "scancode" ]; From 9b60b131514809822a64279e7f0abd6b7a93e27f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:39:52 +0200 Subject: [PATCH 67/68] python3Packages.scancode-toolkit: pre-generate index file this is needed to run the scancode cli to scan a codebase otherwise it complains about a non-writable file. --- pkgs/development/python-modules/scancode-toolkit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 089c4af137e1..26280e0a3d70 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -137,7 +137,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Pre-genrating license index postInstall = '' + $out/bin/scancode-reindex-licenses ''; pythonImportsCheck = [ "scancode" ]; From 869c176220a1dcc639c1e7fe6cbb5863acd8e844 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:40:06 +0200 Subject: [PATCH 68/68] python3Packages.scancode-toolkit: renable tests --- .../development/python-modules/scancode-toolkit/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 26280e0a3d70..42fd4f6c258d 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -144,12 +144,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "scancode" ]; - disabledTestPaths = [ - # Tests are outdated - "src/formattedcode/output_spdx.py" - "src/scancode/cli.py" - ]; - # Takes a long time and doesn't appear to do anything dontStrip = true;