From 10e92c1832132e1a52735508ccdcdd8728f21884 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sat, 14 Dec 2024 22:24:02 +0100 Subject: [PATCH 001/105] part-db: init at 1.14.5 Co-authored-by: Sandro <7258858+supersandro2000@users.noreply.github.com> Co-authored-by: Tert0 <62036464+tert0@users.noreply.github.com> --- .../pa/part-db/fix-composer-validate.diff | 24 +++++ pkgs/by-name/pa/part-db/package.nix | 90 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 pkgs/by-name/pa/part-db/fix-composer-validate.diff create mode 100644 pkgs/by-name/pa/part-db/package.nix diff --git a/pkgs/by-name/pa/part-db/fix-composer-validate.diff b/pkgs/by-name/pa/part-db/fix-composer-validate.diff new file mode 100644 index 000000000000..73060f3e0591 --- /dev/null +++ b/pkgs/by-name/pa/part-db/fix-composer-validate.diff @@ -0,0 +1,24 @@ +diff --git a/composer.json b/composer.json +index 0659f2ee..5a2dee70 100644 +--- a/composer.json ++++ b/composer.json +@@ -1,4 +1,6 @@ + { ++ "name": "part-db/part-db-server", ++ "description": "Part-DB is an Open source inventory management system for your electronic components", + "type": "project", + "license": "AGPL-3.0-or-later", + "require": { +diff --git a/composer.lock b/composer.lock +index 614a35f7..e0c949eb 100644 +--- a/composer.lock ++++ b/composer.lock +@@ -4,7 +4,7 @@ + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], +- "content-hash": "465fa2ab7f9f8dad2b8cfbeaa640c136", ++ "content-hash": "cec123f8cbf51820ba08c5c69ec2ded4", + "packages": [ + { + "name": "amphp/amp", diff --git a/pkgs/by-name/pa/part-db/package.nix b/pkgs/by-name/pa/part-db/package.nix new file mode 100644 index 000000000000..1d00c12f4228 --- /dev/null +++ b/pkgs/by-name/pa/part-db/package.nix @@ -0,0 +1,90 @@ +{ + stdenv, + php, + lib, + fetchFromGitHub, + fetchYarnDeps, + nodejs, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + envLocalPath ? "/var/lib/part-db/env.local", + cachePath ? "/var/cache/part-db/", + logPath ? "/var/log/part-db/", +}: +let + pname = "part-db"; + version = "1.14.5"; + + srcWithVendor = php.buildComposerProject ({ + inherit pname version; + + src = fetchFromGitHub { + owner = "Part-DB"; + repo = "Part-DB-server"; + tag = "v${version}"; + hash = "sha256-KtNWog4aSnmgJsFckDuBrlnd9cj1f8kmSFi+nv2cZOg="; + }; + + patches = [ + ./fix-composer-validate.diff + ]; + + php = php.buildEnv { + extensions = ( + { enabled, all }: + enabled + ++ (with all; [ + xsl + ]) + ); + }; + + vendorHash = "sha256-PJtm/3Vdm2zomUklVMKlDAe/vziJN4e+JNNf/u8N3B4="; + + composerNoPlugins = false; + + postInstall = '' + mv "$out"/share/php/part-db/* $out/ + mv "$out"/share/php/part-db/.* $out/ + cd $out/ + php -d memory_limit=256M bin/console cache:warmup + ''; + }); +in +stdenv.mkDerivation (finalAttrs: { + inherit pname version; + + src = srcWithVendor; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-Mjss2UUHVUdJ4UAI3GkG6HB6g7LbJTqvgrIXFhZmw1Q="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; + + installPhase = '' + rm -r node_modules + mkdir $out + mv * .* $out/ + + rm -rf $out/var/{cache,log} + ln -s ${envLocalPath} $out/.env.local + ln -s ${logPath} $out/var/log + ln -s ${cachePath} $out/var/cache + ''; + + meta = { + description = "Open source inventory management system for your electronic components"; + homepage = "https://docs.part-db.de/"; + changelog = "https://github.com/Part-DB/Part-DB-server/releases/tag/v${version}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ felbinger ]; + platforms = lib.platforms.linux; + }; +}) From f2ac05ced6e912ca74d72f69f10897ce89ea4c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 7 Feb 2025 19:08:54 +0100 Subject: [PATCH 002/105] 1password-cli: define nativeBuildInputs properly This is required when strictDeps = true --- pkgs/by-name/_1/_1password-cli/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 6bc67fb04d6a..718f414bec9f 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -45,15 +45,16 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; - nativeBuildInputs = [ - installShellFiles - versionCheckHook - ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - xar - cpio - ]; + nativeBuildInputs = + [ + installShellFiles + versionCheckHook + ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isDarwin [ + xar + cpio + ]; unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src From c782c8cd03b900c1b707b4ea8dada3df717965bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 15 Feb 2025 08:13:41 +0100 Subject: [PATCH 003/105] python3Packages.logbook: add missing pytest-rerunfailures dep --- pkgs/development/python-modules/logbook/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index b7b8e242a530..004ff4e383af 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -7,6 +7,7 @@ fetchFromGitHub, jinja2, pytestCheckHook, + pytest-rerunfailures, pythonOlder, pyzmq, redis, @@ -52,6 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-rerunfailures ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Some of the tests use localhost networking. From d5051fcc52bab18ddfdee668651cf040adc45bed Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 19 Feb 2025 21:50:45 +0800 Subject: [PATCH 004/105] ghostfolio: init at 2.139.1 --- pkgs/by-name/gh/ghostfolio/package.nix | 89 ++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 pkgs/by-name/gh/ghostfolio/package.nix diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix new file mode 100644 index 000000000000..d473c5e4e38e --- /dev/null +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -0,0 +1,89 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, + faketty, + openssl, + prisma, + prisma-engines, +}: + +buildNpmPackage rec { + pname = "ghostfolio"; + version = "2.139.1"; + + src = fetchFromGitHub { + owner = "ghostfolio"; + repo = "ghostfolio"; + tag = version; + hash = "sha256-0NOcmqgHHTUKOZ+l4FBzWO9qxK3vlxrr5dVpbMUNVDo="; + # 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; + postFetch = '' + date -u -d "@$(git -C $out log -1 --pretty=%ct)" +%s%3N > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + npmDepsHash = "sha256-/2bGyWf/FBQzgwU5PFLDHtzaDVKqyfkS9naOsL6RQSU="; + + nativeBuildInputs = [ + prisma + faketty + ]; + + # Disallow cypress from downloading binaries in sandbox + env.CYPRESS_INSTALL_BINARY = "0"; + + buildPhase = '' + runHook preBuild + + prisma generate + + substituteInPlace replace.build.mjs \ + --replace-fail 'new Date()' "new Date(''$( Date: Fri, 21 Feb 2025 00:24:48 +0800 Subject: [PATCH 005/105] python3Packages.peacasso: init at 0.0.19a0 --- .../python-modules/peacasso/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/peacasso/default.nix diff --git a/pkgs/development/python-modules/peacasso/default.nix b/pkgs/development/python-modules/peacasso/default.nix new file mode 100644 index 000000000000..2d4d5c0564a9 --- /dev/null +++ b/pkgs/development/python-modules/peacasso/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-scm, + accelerate, + diffusers, + fastapi, + ftfy, + pydantic, + scipy, + torch, + transformers, + typer, + uvicorn, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "peacasso"; + version = "0.0.19a0"; + pyproject = true; + + # No releases or tags are available in https://github.com/victordibia/peacasso + src = fetchPypi { + inherit pname version; + hash = "sha256-qBoG9FAJs0oZrQ0jShtPZfZPmyUZD30MGXDUfMl5bQk="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + accelerate + diffusers + fastapi + ftfy + pydantic + scipy + torch + transformers + typer + uvicorn + ]; + + pythonRelaxDeps = [ "diffusers" ]; + + pythonImportsCheck = [ + "peacasso" + ]; + + # No tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "UI tool to help you generate art (and experiment) with multimodal (text, image) AI models (stable diffusion)"; + homepage = "https://github.com/victordibia/peacasso"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "peacasso"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed176858c674..64b0b00c8a7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10303,6 +10303,8 @@ self: super: with self; { pdoc3 = callPackage ../development/python-modules/pdoc3 { }; + peacasso = callPackage ../development/python-modules/peacasso { }; + peaqevcore = callPackage ../development/python-modules/peaqevcore { }; pegen = callPackage ../development/python-modules/pegen { }; From ffdce2bf4b5b73c65a8de2cb3f5ddb7b5f577604 Mon Sep 17 00:00:00 2001 From: Kent Smith Date: Mon, 24 Feb 2025 16:43:51 -0800 Subject: [PATCH 006/105] maintainers: add coat --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe00f03a8a3a..da275d1ed0c1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4515,6 +4515,12 @@ github = "CnTeng"; githubId = 56501688; }; + coat = { + email = "kentsmith@gmail.com"; + name = "Kent Smith"; + github = "coat"; + githubId = 1661; + }; cobalt = { email = "cobalt@cobalt.rocks"; github = "Chaostheorie"; From d084c2cfa4c85fe3eb0a3f888d6c9c9c57f80362 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 25 Feb 2025 21:25:20 -0400 Subject: [PATCH 007/105] dotnet-{sdk,runtime,aspnetcore}_10: init at 10.0.0-preview.1.25080.5 --- pkgs/development/compilers/dotnet/default.nix | 6 + .../compilers/dotnet/versions/10.0.nix | 526 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 535 insertions(+) create mode 100644 pkgs/development/compilers/dotnet/versions/10.0.nix diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 6b6d9391f45d..672aed40501f 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -41,6 +41,7 @@ let ./versions/7.0.nix ./versions/8.0.nix ./versions/9.0.nix + ./versions/10.0.nix ] ); @@ -157,6 +158,7 @@ pkgs # use binary SDK here to avoid downgrading feature band sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + sdk_10_0_1xx = pkgs.sdk_10_0_1xx-bin; # source-built SDK only exists for _1xx feature band # https://github.com/dotnet/source-build/issues/3667 sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin; @@ -164,10 +166,14 @@ pkgs sdk_9_0_2xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_2xx-bin; sdk_8_0 = sdk_8_0_4xx; sdk_9_0 = sdk_9_0_2xx; + sdk_10_0 = sdk_10_0_1xx; sdk_8_0-source = sdk_8_0_1xx; sdk_9_0-source = sdk_9_0_1xx; + sdk_10_0-source = sdk_10_0_1xx; runtime_8_0 = sdk_8_0.runtime; runtime_9_0 = sdk_9_0.runtime; + runtime_10_0 = sdk_10_0.runtime; aspnetcore_8_0 = sdk_8_0.aspnetcore; aspnetcore_9_0 = sdk_9_0.aspnetcore; + aspnetcore_10_0 = sdk_10_0.aspnetcore; } diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix new file mode 100644 index 000000000000..1c5b9d85a271 --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/10.0.nix @@ -0,0 +1,526 @@ +{ + buildAspNetCore, + buildNetRuntime, + buildNetSdk, + fetchNupkg, +}: + +# v10.0 (preview) + +let + commonPackages = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Ref"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + }) + (fetchNupkg { + pname = "Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + }) + (fetchNupkg { + pname = "Microsoft.NET.ILLink.Tasks"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + }) + ]; + linux-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + }) + ]; + linux-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + }) + ]; + linux-musl-arm = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + }) + ]; + linux-musl-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + }) + ]; + osx-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + }) + ]; + osx-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + }) + ]; + win-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + }) + (fetchNupkg { + pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + }) + ]; + win-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + }) + (fetchNupkg { + pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + }) + ]; + win-x86 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + }) + ]; + linux-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + }) + ]; + linux-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + }) + ]; + linux-musl-arm = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + }) + ]; + linux-musl-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + }) + ]; + osx-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + }) + ]; + osx-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + }) + ]; + win-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + }) + (fetchNupkg { + pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + }) + ]; + win-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + }) + (fetchNupkg { + pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + }) + ]; + win-x86 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + }) + (fetchNupkg { + pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + }) + ]; + }; + +in +rec { + release_10_0 = "10.0.0-preview.1"; + + aspnetcore_10_0 = buildAspNetCore { + version = "10.0.0-preview.1.25120.3"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; + hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; + hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; + hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; + hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; + hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; + hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; + hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; + hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + }; + }; + }; + + runtime_10_0 = buildNetRuntime { + version = "10.0.0-preview.1.25080.5"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; + hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; + hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; + hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; + hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; + hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; + hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; + hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; + hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + }; + }; + }; + + sdk_10_0_1xx = buildNetSdk { + version = "10.0.100-preview.1.25120.13"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; + hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; + hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; + hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; + hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; + hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; + hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; + hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; + hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + runtime = runtime_10_0; + aspnetcore = aspnetcore_10_0; + }; + + sdk_10_0 = sdk_10_0_1xx; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6262d930dfb4..ba4d9a3aadd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -412,16 +412,19 @@ with pkgs; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0-bin; dotnet-sdk_8 = dotnetCorePackages.sdk_8_0; dotnet-sdk_9 = dotnetCorePackages.sdk_9_0; + dotnet-sdk_10 = dotnetCorePackages.sdk_10_0; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0-bin; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0-bin; dotnet-runtime_8 = dotnetCorePackages.runtime_8_0; dotnet-runtime_9 = dotnetCorePackages.runtime_9_0; + dotnet-runtime_10 = dotnetCorePackages.runtime_10_0; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0-bin; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0-bin; dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; dotnet-aspnetcore_9 = dotnetCorePackages.aspnetcore_9_0; + dotnet-aspnetcore_10 = dotnetCorePackages.aspnetcore_10_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; From a714ae7de4eace6dfdda6d9507423c9a4fa3908b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 26 Feb 2025 22:29:14 +0100 Subject: [PATCH 008/105] ayatana-indicator-sound: 24.5.1 -> 24.5.2 --- pkgs/by-name/ay/ayatana-indicator-sound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 75b51ff64a0c..983ec1833ed1 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-sound"; - version = "24.5.1"; + version = "24.5.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-sound"; tag = finalAttrs.version; - hash = "sha256-icHX/uZQIkS08RByjvlcX7whXtUYc+osBMbqngKqmGU="; + hash = "sha256-qdvte+Mm64O/JhI0luJAGAWoCgukKCbPrp5k8SIDuwM="; }; postPatch = '' From 0d5abeec5486cd4e89ba187a86d2daf96d183e7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Feb 2025 02:20:02 +0000 Subject: [PATCH 009/105] quill-log: 8.1.1 -> 8.2.0 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 07c62d568a3d..d29a4ef21c7d 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-7+yJRhTdYyGiOrsWnzagTPtxH2Gqqd4VNw/2i2C6Mak="; + hash = "sha256-q61TdttCVZG5MZVhokugMGhB4ZJOhK4iFgirUonocJg="; }; nativeBuildInputs = [ cmake ]; From bdef187f69eb213c784b2b72228d64e120a7a56d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 27 Feb 2025 13:42:44 -0800 Subject: [PATCH 010/105] checkpolicy: remove meta.name and add main program --- pkgs/by-name/ch/checkpolicy/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/checkpolicy/package.nix b/pkgs/by-name/ch/checkpolicy/package.nix index 1703e5db68ce..60b924a9da00 100644 --- a/pkgs/by-name/ch/checkpolicy/package.nix +++ b/pkgs/by-name/ch/checkpolicy/package.nix @@ -28,7 +28,13 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; - meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { - description = "SELinux policy compiler"; - }; + meta = + removeAttrs libsepol.meta [ + "outputsToInstall" + "name" + ] + // { + description = "SELinux policy compiler"; + mainProgram = "checkpolicy"; + }; } From e09d65064fbacb5f6279da465d48bd6f77c18300 Mon Sep 17 00:00:00 2001 From: Leon van Kammen Date: Fri, 28 Feb 2025 10:25:54 +0100 Subject: [PATCH 011/105] maintainers: add coderofsalvation --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dedf71ae8518..ad50a7bd3c91 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4575,6 +4575,11 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + coderofsalvation = { + github = "coderofsalvation"; + githubId = 180068; + name = "Leon van Kammen"; + }; codgician = { email = "codgician@outlook.com"; github = "codgician"; From 151350089ae61deae3d79537338215d0dc2e3e87 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 28 Feb 2025 18:01:23 +0000 Subject: [PATCH 012/105] doc: fix grammar in explanation of duneVersion in buildDunePackage --- doc/languages-frameworks/ocaml.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index acefddc7c2f2..7f2c2a63a00b 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,12 +38,12 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- It also accept `duneVersion` parameter (valid value are `"1"`, `"2"`, and - `"3"`). The recommended practice it to set only if you don't want the default +- It also accepts a `duneVersion` parameter (valid values are `"1"`, `"2"`, and + `"3"`). The recommended practice is to set it only if you don't want the default value and/or it depends on something else like package version. You might see a not-supported argument `useDune2`. The behavior was `useDune2 = true;` => `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = "1";`. It was - used at the time when dune3 didn't existed. + used at the time when dune3 didn't exist. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is From 50696930b4bab85bd91b286d4e9baf84a4ce1af6 Mon Sep 17 00:00:00 2001 From: Kent Smith Date: Mon, 24 Feb 2025 16:44:43 -0800 Subject: [PATCH 013/105] rails-new: init at 0.5.0 --- pkgs/by-name/ra/rails-new/package.nix | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ra/rails-new/package.nix diff --git a/pkgs/by-name/ra/rails-new/package.nix b/pkgs/by-name/ra/rails-new/package.nix new file mode 100644 index 000000000000..8cae1865bdf5 --- /dev/null +++ b/pkgs/by-name/ra/rails-new/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "rails-new"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "rails"; + repo = "rails-new"; + tag = "v${version}"; + hash = "sha256-7hEdLu9Koi2K2EFIl530yA+BGZmATFCcBMe3htYb0rs="; + }; + + useFetchCargoVendor = true; + + cargoHash = "sha256-FrndtE9hjP1WswfOYJM4LW1UsE8S9QXthYO7P3nzs2I="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generate new Rails applications without having to install Ruby"; + homepage = "https://github.com/rails/rails-new"; + license = lib.licenses.mit; + mainProgram = "rails-new"; + maintainers = with lib.maintainers; [ coat ]; + }; +} From 1ab5bf7f6c1d2e7c1b1d259a150e4e8e1e8f2960 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 21 Feb 2025 07:49:32 +0800 Subject: [PATCH 014/105] wails: 2.9.2 -> 2.10.1 --- pkgs/development/tools/wails/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index acbf96a08583..946b4f3a1dcb 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -15,18 +15,18 @@ buildGoModule rec { pname = "wails"; - version = "2.9.2"; + version = "2.10.1"; src = fetchFromGitHub { owner = "wailsapp"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Ta7PLxy6ElJwR0yz7oMbmwYyPwduYfoSFWhvsPAJTYs="; + repo = "wails"; + tag = "v${version}"; + hash = "sha256-PLlr2iBvYwJBvozQGvM68Xp3ts7Pt75hGhNZmMhNqbI="; } + "/v2"; - vendorHash = "sha256-nnc9+iGVJDcRstEEL9O5UU07NcG9yEQ6kMECDTS9LO8="; + vendorHash = "sha256-7f7QJv2PM7/CG30bWSDP4+wuhi5Aa9rXT5voHm+QivE="; proxyVendor = true; From eb317d0ce3c90a0bc1e295fe733e9d8cde3e17f5 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 27 Feb 2025 09:36:53 +0800 Subject: [PATCH 015/105] scalafmt: 3.7.17 -> 3.9.2 --- pkgs/by-name/sc/scalafmt/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index 108b93e5cb62..5f495696480b 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -9,7 +9,7 @@ let baseName = "scalafmt"; - version = "3.7.17"; + version = "3.9.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-8gK+fOnqwPFBbSWltNKInzXRJQ3WZxPlLqpvuTxF4fk="; + outputHash = "sha256-IACG6fiunbLP5wLPMePpk0QQnDS18ale+Lppri4jBmU="; }; in stdenv.mkDerivation { @@ -47,11 +47,11 @@ stdenv.mkDerivation { $out/bin/${baseName} --version | grep -q "${version}" ''; - meta = with lib; { + meta = { description = "Opinionated code formatter for Scala"; homepage = "http://scalameta.org/scalafmt"; - license = licenses.asl20; - maintainers = [ maintainers.markus1189 ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.markus1189 ]; mainProgram = "scalafmt"; }; } From 3010c36f3e132116c563f3f514277428028dbf20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Mar 2025 11:27:15 +0000 Subject: [PATCH 016/105] shot-scraper: 1.6 -> 1.7 --- pkgs/by-name/sh/shot-scraper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix index be4771b3c171..e749743109ed 100644 --- a/pkgs/by-name/sh/shot-scraper/package.nix +++ b/pkgs/by-name/sh/shot-scraper/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "shot-scraper"; - version = "1.6"; + version = "1.7"; format = "setuptools"; disabled = python3.pkgs.pythonOlder "3.6"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "simonw"; repo = "shot-scraper"; tag = version; - hash = "sha256-3FU9UH0dQcRgYydtyo+p0fPBPtW47YFIKh13dJiQwfA="; + hash = "sha256-MEPixHDiOc5NaPuIKUueGXV5A9K7SFj/WEKb4gen0lI="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line utility for taking automated screenshots of websites"; homepage = "https://github.com/simonw/shot-scraper"; - changelog = "https://github.com/simonw/shot-scraper/releases/tag/${version}"; + changelog = "https://github.com/simonw/shot-scraper/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick ]; mainProgram = "shot-scraper"; From 3d00b60a343ba0c961c064a4c83d01dba8d3e582 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Mar 2025 09:11:51 +0000 Subject: [PATCH 017/105] codeium: 1.38.0 -> 1.40.1 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 9ac22c06b928..8377ddfd2f7b 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-AwUOA9U8Bdm+eyxt77i6qW6XXbWkZ7Gvf8IpCXT0/MY="; - aarch64-linux = "sha256-og6sHzUsh8zo5r5TBAp1prTN9YeldV3jQVlEwVqfTCQ="; - x86_64-darwin = "sha256-aaa/CVXFb8iE8oKABwJOzSBA1aV8X7camfXsHNonh6M="; - aarch64-darwin = "sha256-oDOhtTb0TdHFXOsJD/XPO4aso6Gk1ngvBWKKkNy21RE="; + x86_64-linux = "sha256-7GJMEL6rERjLTBUbSNqBIMB+92dEbeWUIApcbYYRNgE="; + aarch64-linux = "sha256-ArsDoj3G4/oBSv152wa46URWZhCaQgk5gSgVeSjPtZg="; + x86_64-darwin = "sha256-7yrW8+bpY/Suo1xeUNcwzLctjdn4yJrmLOETdV6f2lY="; + aarch64-darwin = "sha256-0c5wvo+4+UMEDPL6hSw9w120DU+Du53S8NHJWkrcyKc="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.38.0"; + version = "1.40.1"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From e08eecb8c4557d17828a140d126389bdff6c5c10 Mon Sep 17 00:00:00 2001 From: jthulhu Date: Mon, 3 Mar 2025 14:22:20 +0100 Subject: [PATCH 018/105] lean4: 4.16.0 -> 4.17.0 Release notes: https://github.com/leanprover/lean4/releases/tag/v4.17.0 --- pkgs/by-name/le/lean4/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index e4d0c940e949..34c035759cc5 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -6,6 +6,7 @@ git, gmp, cadical, + pkg-config, libuv, perl, testers, @@ -13,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.16.0"; + version = "4.17.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; tag = "v${finalAttrs.version}"; - hash = "sha256-RdFTxLk0Yahwhu/oQeTappvWnUtnim63dxN7gmU8Jt8="; + hash = "sha256-6oteAbCKhel0pRyFGqSDG03oDPQU5Y9dsPcujSG6sjo="; }; postPatch = '' @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ]; buildInputs = [ From 91ea1cdcd1a1bab0b74972cf8a5b8ff6c9f49e18 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 11 Dec 2024 15:45:03 +0800 Subject: [PATCH 019/105] nezha: 0.20.3 -> 1.9.5 Diff: https://github.com/nezhahq/nezha/compare/refs/tags/v0.20.3...v1.9.5 BREAKING CHANGE: Incompatible Configuration Changes - The upgrade includes significant architectural changes, resulting in a complete incompatibility with previous configurations. - Users will need to reconfigure their setups as the old configuration is no longer supported. - Please review the updated documentation for the new configuration format and features. Docs: https://nezha.wiki --- pkgs/by-name/ne/nezha/package.nix | 103 ++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index bd3ccd452275..920e2107c4d4 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -1,26 +1,83 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, + go-swag, versionCheckHook, dbip-country-lite, + formats, nix-update-script, + nezha-theme-admin, + nezha-theme-user, + withThemes ? [ ], }: -buildGoModule rec { +let pname = "nezha"; - version = "0.20.13"; + version = "1.9.5"; + + frontendName = lib.removePrefix "nezha-theme-"; + + frontend-templates = + let + mkTemplate = theme: { + path = "${frontendName theme.pname}-dist"; + name = frontendName theme.pname; + repository = theme.meta.homepage; + author = theme.src.owner; + version = theme.version; + isofficial = false; + isadmin = false; + }; + in + (formats.yaml { }).generate "frontend-templates.yaml" ( + [ + ( + mkTemplate nezha-theme-admin + // { + name = "OfficialAdmin"; + isadmin = true; + isofficial = true; + } + ) + ( + mkTemplate nezha-theme-user + // { + name = "Official"; + isofficial = true; + } + ) + ] + ++ map mkTemplate withThemes + ); +in +buildGo124Module { + inherit pname version; src = fetchFromGitHub { - owner = "naiba"; + owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-fJvL2cESQoiW93aj2RHPyZXvP8246Mf8hIRiP/DSRRY="; + hash = "sha256-06x/M3Np8223ovMVj1K6e7WyoI5+QZohEIHNs/9+bJ0="; }; - postPatch = '' - cp ${dbip-country-lite.mmdb} pkg/geoip/geoip.db - ''; + proxyVendor = true; + + prePatch = + '' + rm -rf cmd/dashboard/*-dist + + cp ${frontend-templates} service/singleton/frontend-templates.yaml + '' + + lib.concatStringsSep "\n" ( + map (theme: "cp -r ${theme} cmd/dashboard/${frontendName theme.pname}-dist") ( + [ + nezha-theme-admin + nezha-theme-user + ] + ++ withThemes + ) + ); patches = [ # Nezha originally used ipinfo.mmdb to provide geoip query feature. @@ -29,12 +86,22 @@ buildGoModule rec { ./dbip.patch ]; - vendorHash = "sha256-SYefkgc0CsAEdkL7rxu9fpz7dpBnx1LwabIadUeOKco="; + postPatch = '' + cp ${dbip-country-lite.mmdb} pkg/geoip/geoip.db + ''; + + nativeBuildInputs = [ go-swag ]; + + # Generate code for Swagger documentation endpoints (see cmd/dashboard/docs). + preBuild = '' + GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false + ''; + + vendorHash = "sha256-q9/P6xSoGtMExhdwl5UuyvXTAaI+mD7MfIAidRz0rxw="; ldflags = [ "-s" - "-w" - "-X github.com/naiba/nezha/service/singleton.Version=${version}" + "-X github.com/nezhahq/nezha/service/singleton.Version=${version}" ]; checkFlags = "-skip=^TestSplitDomainSOA$"; @@ -43,18 +110,18 @@ buildGoModule rec { mv $out/bin/dashboard $out/bin/nezha ''; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "-v" ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Self-hosted, lightweight server and website monitoring and O&M tool"; - homepage = "https://github.com/naiba/nezha"; - changelog = "https://github.com/naiba/nezha/releases/tag/v${version}"; + homepage = "https://github.com/nezhahq/nezha"; + changelog = "https://github.com/nezhahq/nezha/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "nezha"; From 6b79819539eb3e5e7f48641df76a014720161274 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 11 Dec 2024 15:45:57 +0800 Subject: [PATCH 020/105] nezha-agent: 0.20.5 -> 1.9.2 Diff: https://github.com/nezhahq/agent/compare/refs/tags/v0.20.5...v1.9.2 BREAKING CHANGE: Incompatible Configuration Changes - The upgrade includes significant architectural changes, resulting in a complete incompatibility with previous configurations. - Users will need to reconfigure their setups as the old configuration is no longer supported. - Please review the updated documentation for the new configuration format and features. Docs: https://nezha.wiki --- pkgs/by-name/ne/nezha-agent/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index b6ed4e9f3850..70d9187a50f5 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -8,24 +8,27 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.20.5"; + version = "1.9.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; tag = "v${version}"; - hash = "sha256-CVE1c0LLheGlH8oMWQWs6fox7mlHc5Y2O9XQ6kqXAwI="; + hash = "sha256-bXzTZ8GCD3gNQsJzvXGlcufKxbX2aTq51toy5P02BxY="; }; - vendorHash = "sha256-ytFsTHl6kVwmqCabaMDxxijszY3jzWWUIZKBCebPMkI="; + vendorHash = "sha256-klwWNTKR7Vdqg3BDDMTyfnVfC+XZ+sFV/17pq7YdJTs="; ldflags = [ "-s" - "-w" - "-X main.version=${version}" + "-X github.com/nezhahq/agent/pkg/monitor.Version=${version}" "-X main.arch=${stdenv.hostPlatform.system}" ]; + preBuild = '' + go generate ./... + ''; + checkFlags = let # Skip tests that require network access From 1235bed1b5018082f11f7d68eb5a0f50438de212 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 11 Dec 2024 15:46:55 +0800 Subject: [PATCH 021/105] nixos/nezha-agent: refactor --- .../services/monitoring/nezha-agent.nix | 372 ++++++++++++------ 1 file changed, 258 insertions(+), 114 deletions(-) diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix index 035485a939b8..87ecbfdde710 100644 --- a/nixos/modules/services/monitoring/nezha-agent.nix +++ b/nixos/modules/services/monitoring/nezha-agent.nix @@ -6,6 +6,11 @@ }: let cfg = config.services.nezha-agent; + + # nezha-agent uses yaml as the configuration file format. + # Since we need to use jq to update the content, so here we generate json + settingsFormat = pkgs.formats.json { }; + configFile = settingsFormat.generate "config.json" cfg.settings; in { meta = { @@ -16,141 +21,280 @@ in enable = lib.mkEnableOption "Agent of Nezha Monitoring"; package = lib.mkPackageOption pkgs "nezha-agent" { }; + debug = lib.mkEnableOption "verbose log"; - tls = lib.mkOption { + + settings = lib.mkOption { + description = '' + Generate to {file}`config.json` as a Nix attribute set. + Check the [guide](https://nezha.wiki/en_US/guide/agent.html) + for possible options. + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + disable_command_execute = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Disable executing the command from dashboard. + ''; + }; + disable_nat = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Disable NAT penetration. + ''; + }; + disable_send_query = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Disable sending TCP/ICMP/HTTP requests. + ''; + }; + gpu = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable GPU monitoring. + ''; + }; + tls = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable SSL/TLS encryption. + ''; + }; + temperature = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable temperature monitoring. + ''; + }; + use_ipv6_country_code = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use ipv6 countrycode to report location. + ''; + }; + skip_connection_count = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Do not monitor the number of connections. + ''; + }; + skip_procs_count = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Do not monitor the number of processes. + ''; + }; + report_delay = lib.mkOption { + type = lib.types.enum [ + 1 + 2 + 3 + 4 + ]; + default = 3; + description = '' + The interval between system status reportings. + The value must be an integer from 1 to 4. + ''; + }; + server = lib.mkOption { + type = lib.types.str; + example = "127.0.0.1:8008"; + description = '' + Address to the dashboard. + ''; + }; + uuid = lib.mkOption { + type = with lib.types; nullOr str; + # pre-defined uuid of Dns in RFC 4122 + example = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; + default = null; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `util-linux` package. + + Set {option}`services.nezha-agent.genUuid` to true to generate uuid + from {option}`networking.fqdn` automatically. + ''; + }; + }; + }; + }; + + genUuid = lib.mkOption { type = lib.types.bool; default = false; description = '' - Enable SSL/TLS encryption. + Whether to generate uuid from fqdn automatically. + Please note that changes in hostname/domain will result in different uuid. ''; }; - gpu = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Enable GPU monitoring. - ''; - }; - temperature = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Enable temperature monitoring. - ''; - }; - useIPv6CountryCode = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Use ipv6 countrycode to report location. - ''; - }; - disableCommandExecute = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Disable executing the command from dashboard. - ''; - }; - disableNat = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Disable NAT penetration. - ''; - }; - disableSendQuery = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Disable sending TCP/ICMP/HTTP requests. - ''; - }; - skipConnection = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Do not monitor the number of connections. - ''; - }; - skipProcess = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Do not monitor the number of processes. - ''; - }; - reportDelay = lib.mkOption { - type = lib.types.enum [ - 1 - 2 - 3 - 4 - ]; - default = 1; - description = '' - The interval between system status reportings. - The value must be an integer from 1 to 4 - ''; - }; - passwordFile = lib.mkOption { - type = with lib.types; nullOr str; + + clientSecretFile = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' - Path to the file contained the password from dashboard. - ''; - }; - server = lib.mkOption { - type = lib.types.str; - description = '' - Address to the dashboard - ''; - }; - extraFlags = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - example = [ "--gpu" ]; - description = '' - Extra command-line flags passed to nezha-agent. + Path to the file contained the client_secret of the dashboard. ''; }; }; }; + imports = with lib; [ + (mkRenamedOptionModule + [ "services" "nezha-agent" "disableCommandExecute" ] + [ "services" "nezha-agent" "settings" "disable_command_execute" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "disableNat" ] + [ "services" "nezha-agent" "settings" "disable_nat" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "disableSendQuery" ] + [ "services" "nezha-agent" "settings" "disable_send_query" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "gpu" ] + [ "services" "nezha-agent" "settings" "gpu" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "tls" ] + [ "services" "nezha-agent" "settings" "tls" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "temperature" ] + [ "services" "nezha-agent" "settings" "temperature" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "useIPv6CountryCode" ] + [ "services" "nezha-agent" "settings" "use_ipv6_country_code" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "skipConnection" ] + [ "services" "nezha-agent" "settings" "skip_connection_count" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "skipProcess" ] + [ "services" "nezha-agent" "settings" "skip_procs_count" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "reportDelay" ] + [ "services" "nezha-agent" "settings" "report_delay" ] + ) + (mkRenamedOptionModule + [ "services" "nezha-agent" "server" ] + [ "services" "nezha-agent" "settings" "server" ] + ) + (lib.mkRemovedOptionModule [ "services" "nezha-agent" "extraFlags" ] '' + Use `services.nezha-agent.settings` instead. + + Nezha-agent v1 is no longer configured via command line flags. + '') + (lib.mkRemovedOptionModule [ "services" "nezha-agent" "passwordFile" ] '' + Use `services.nezha-agent.clientSecretFile` instead. + + Nezha-agent v1 uses the client secret from the dashboard to connect. + '') + ]; + config = lib.mkIf cfg.enable { - systemd.packages = [ cfg.package ]; + assertions = [ + { + assertion = cfg.settings.uuid == null -> cfg.genUuid; + message = "Please set `service.nezha-agent.settings.uuid` while `genUuid` is false."; + } + { + assertion = cfg.settings.uuid != null -> !cfg.genUuid; + message = "When `service.nezha-agent.genUuid = true`, `settings.uuid` cannot be set."; + } + ]; + + services.nezha-agent.settings = { + debug = cfg.debug; + # Automatic updates should never be enabled in NixOS. + disable_auto_update = true; + disable_force_update = true; + }; systemd.services.nezha-agent = { serviceConfig = { - ProtectSystem = "full"; - PrivateDevices = "yes"; - PrivateTmp = "yes"; + Restart = "on-failure"; + StateDirectory = "nezha-agent"; + RuntimeDirectory = "nezha-agent"; + WorkingDirectory = "/var/lib/nezha-agent"; + ReadWritePaths = "/var/lib/nezha-agent"; + + LoadCredential = lib.optionalString ( + cfg.clientSecretFile != null + ) "client-secret:${cfg.clientSecretFile}"; + + # Hardening + ProcSubset = "all"; # Needed to get host information + DynamicUser = true; + RemoveIPC = true; + LockPersonality = true; + ProtectClock = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + ProtectHostname = true; + RestrictSUIDSGID = true; + AmbientCapabilities = [ ]; + CapabilityBoundingSet = ""; NoNewPrivileges = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + UMask = "0066"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + PrivateDevices = "yes"; }; - path = [ cfg.package ]; + environment.HOME = "/var/lib/nezha-agent"; + enableStrictShellChecks = true; startLimitIntervalSec = 10; startLimitBurst = 3; - script = lib.concatStringsSep " " ( - [ - "${lib.getExe cfg.package}" - "--disable-auto-update" - "--disable-force-update" - "--password $(cat ${cfg.passwordFile})" - ] - ++ lib.optional cfg.debug "--debug" - ++ lib.optional cfg.disableCommandExecute "--disable-command-execute" - ++ lib.optional cfg.disableNat "--disable-nat" - ++ lib.optional cfg.disableSendQuery "--disable-send-query" - ++ lib.optional (cfg.reportDelay != null) "--report-delay ${toString cfg.reportDelay}" - ++ lib.optional (cfg.server != null) "--server ${cfg.server}" - ++ lib.optional cfg.skipConnection "--skip-conn" - ++ lib.optional cfg.skipProcess "--skip-procs" - ++ lib.optional cfg.tls "--tls" - ++ lib.optional cfg.gpu "--gpu" - ++ lib.optional cfg.temperature "--temperature" - ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode" - ++ cfg.extraFlags - ); + script = '' + cp "${configFile}" "''${RUNTIME_DIRECTORY}"/config.json + ${lib.optionalString (cfg.clientSecretFile != null) '' + ${lib.getExe pkgs.jq} --arg client_secret "$(<"''${CREDENTIALS_DIRECTORY}"/client-secret)" \ + '. + { client_secret: $client_secret }' < "''${RUNTIME_DIRECTORY}"/config.json > "''${RUNTIME_DIRECTORY}"/config.json.tmp + mv "''${RUNTIME_DIRECTORY}"/config.json.tmp "''${RUNTIME_DIRECTORY}"/config.json + ''} + ${lib.optionalString cfg.genUuid '' + ${lib.getExe pkgs.jq} --arg uuid "$(${lib.getExe' pkgs.util-linux "uuidgen"} --md5 -n @dns -N "${config.networking.fqdn}")" \ + '. + { uuid: $uuid }' < "''${RUNTIME_DIRECTORY}"/config.json > "''${RUNTIME_DIRECTORY}"/config.json.tmp + mv "''${RUNTIME_DIRECTORY}"/config.json.tmp "''${RUNTIME_DIRECTORY}"/config.json + ''} + ${lib.getExe cfg.package} --config "''${RUNTIME_DIRECTORY}"/config.json + ''; wantedBy = [ "multi-user.target" ]; }; }; From 1df119a49c62e5d8412b635f17e0f94662db85bd Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 20 Dec 2024 13:01:54 +0800 Subject: [PATCH 022/105] nixos/doc/rl-2505: mention Nezha update --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f6578de089f2..dce0bf143bf2 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -221,6 +221,8 @@ - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package and `withGstreamer`/`withVlc` override options have been removed due to this. +- `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details. + - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI - [](#opt-services.nextcloud.config.dbtype) is unset by default, the previous default was `sqlite`. From b2d1179245a959a5059a1345a9dc8be4f17f93ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Mar 2025 21:21:28 +0100 Subject: [PATCH 023/105] golangci-lint: 1.64.5 -> 1.64.6 Diff: https://github.com/golangci/golangci-lint/compare/v1.64.5...v1.64.6 Changelog: https://github.com/golangci/golangci-lint/blob/v1.64.6/CHANGELOG.md --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index d832363d56fc..f3348efcf181 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "1.64.5"; + version = "1.64.6"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-PRI82Ia2R2GH9xV/UZvfXTmCrfsxvHfysXuAek/4a+0="; + hash = "sha256-uJKZRJx+hUCXrLrLq1UcBknRSR/o+R9trfacgg27MLs="; }; - vendorHash = "sha256-oCaVXjflmOMUDEDynbnUwA9KOPNDcEwI4WqOi2KoCG4="; + vendorHash = "sha256-6vL6lYZcpi9roRa+sFbQPq4Ysd8TM3j40wg68B5VbX0="; subPackages = [ "cmd/golangci-lint" ]; From 3035099d790b20e7e4f83447876171456b124f9e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 25 Feb 2025 22:57:06 -0400 Subject: [PATCH 024/105] dotnetCorePackages.dotnet_10.vmr: init at 10.0.0-preview.1 --- .../compilers/dotnet/10/bootstrap-sdk.nix | 528 ++++++++++++++++++ .../compilers/dotnet/10/default.nix | 12 + .../development/compilers/dotnet/10/deps.json | 50 ++ .../compilers/dotnet/10/release-info.json | 5 + .../compilers/dotnet/10/release.json | 10 + .../compilers/dotnet/build-dotnet.nix | 2 +- pkgs/development/compilers/dotnet/default.nix | 4 +- .../development/compilers/dotnet/packages.nix | 5 + pkgs/development/compilers/dotnet/stage0.nix | 7 + pkgs/development/compilers/dotnet/vmr.nix | 51 +- 10 files changed, 658 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix create mode 100644 pkgs/development/compilers/dotnet/10/default.nix create mode 100644 pkgs/development/compilers/dotnet/10/deps.json create mode 100644 pkgs/development/compilers/dotnet/10/release-info.json create mode 100644 pkgs/development/compilers/dotnet/10/release.json diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix new file mode 100644 index 000000000000..29cf6c6be691 --- /dev/null +++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix @@ -0,0 +1,528 @@ +{ + buildAspNetCore, + buildNetRuntime, + buildNetSdk, + fetchNupkg, +}: + +# v10.0 (preview) + +let + commonPackages = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Ref"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + }) + (fetchNupkg { + pname = "Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + }) + (fetchNupkg { + pname = "Microsoft.NET.ILLink.Tasks"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + }) + ]; + linux-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + }) + ]; + linux-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + }) + ]; + linux-musl-arm = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + }) + ]; + linux-musl-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + }) + ]; + osx-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + }) + ]; + osx-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + }) + ]; + win-arm64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + }) + (fetchNupkg { + pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + }) + ]; + win-x64 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + }) + (fetchNupkg { + pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + }) + ]; + win-x86 = [ + (fetchNupkg { + pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + }) + ]; + linux-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + }) + ]; + linux-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + }) + ]; + linux-musl-arm = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + }) + ]; + linux-musl-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + }) + (fetchNupkg { + pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + }) + ]; + osx-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + }) + ]; + osx-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + }) + ]; + win-arm64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-arm64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + }) + (fetchNupkg { + pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + }) + ]; + win-x64 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-x64"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + }) + (fetchNupkg { + pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + }) + ]; + win-x86 = [ + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; + version = "10.0.0-preview.1.25120.3"; + hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Host.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.win-x86"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + }) + (fetchNupkg { + pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; + version = "10.0.0-preview.1.25080.5"; + hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + }) + ]; + }; + +in +rec { + release_10_0 = "10.0.0-preview.1"; + + aspnetcore_10_0 = buildAspNetCore { + version = "10.0.0-preview.1.25120.3"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; + hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; + hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; + hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; + hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; + hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; + hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; + hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; + hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + }; + }; + }; + + runtime_10_0 = buildNetRuntime { + version = "10.0.0-preview.1.25080.5"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; + hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; + hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; + hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; + hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; + hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; + hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; + hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; + hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + }; + }; + }; + + sdk_10_0_1xx = buildNetSdk { + version = "10.0.100-preview.1.25120.13"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; + hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; + hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; + hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; + hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; + hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; + hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; + hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; + hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + runtime = runtime_10_0; + aspnetcore = aspnetcore_10_0; + }; + + sdk = sdk_10_0; + + sdk_10_0 = sdk_10_0_1xx; +} diff --git a/pkgs/development/compilers/dotnet/10/default.nix b/pkgs/development/compilers/dotnet/10/default.nix new file mode 100644 index 000000000000..4ddfa0489237 --- /dev/null +++ b/pkgs/development/compilers/dotnet/10/default.nix @@ -0,0 +1,12 @@ +{ + callPackage, + dotnetCorePackages, +}: +callPackage ../dotnet.nix { + releaseManifestFile = ./release.json; + releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; + allowPrerelease = true; + depsFile = ./deps.json; + fallbackTargetPackages = dotnetCorePackages.sdk_10_0-bin.targetPackages; +} diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json new file mode 100644 index 000000000000..119379ca0e80 --- /dev/null +++ b/pkgs/development/compilers/dotnet/10/deps.json @@ -0,0 +1,50 @@ +[ + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", + "sha256": "d38531cbaa10ee29e2d7fdcbfdb3475ab98656cf61eb7e8cac7776b591f14087", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", + "sha256": "723a02d68af031016f2f714614a6c2fb71bd11213a8b47748c2d35a61a5b62c0", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "hash": "sha256-E7StxfoPJuDc5I7z/QKuiqHT4kthGQ2EvI2o408NhHw=", + "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "hash": "sha256-U3FiCdmLIJxvd7dy2A2Tn2XVjOE/ZfUt88VavrfGoqY=", + "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", + "sha256": "11c7151ad97cb1af9b3f4ea0f19424090b9c52eae70cc6f4f2a89e456c060753", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", + "sha256": "6b61e2867d03df14c7093cdbe96b059f4fb6384678d75244cb0107d5f6a8dc90", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", + "sha256": "f3e226d57403e870edd98516dbed0f540a9a1b7d9442edc2059245a7ef00ffdc", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", + "sha256": "712c9f21199f1707a890a190b30dfb5e7e24a918751209d45f4ce2ca80b0d7c6", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", + "version": "10.0.0-alpha.1.25073.13" + } +] diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json new file mode 100644 index 000000000000..cbd52e03f7fd --- /dev/null +++ b/pkgs/development/compilers/dotnet/10/release-info.json @@ -0,0 +1,5 @@ +{ + "tarballHash": "sha256-JJMGyXFJPJYOD9c+V6M8ZkHXjvbBgfeUSqRatuMhhWQ=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.1.25078.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-q8wMaUmbcDbvCKjm1oliz7/HGqf5X4rnympuG18HzgE=" +} diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json new file mode 100644 index 000000000000..a76ab39b388c --- /dev/null +++ b/pkgs/development/compilers/dotnet/10/release.json @@ -0,0 +1,10 @@ +{ + "release": "10.0.0-preview.1", + "channel": "10.0", + "tag": "v10.0.0-preview.1.25080.5", + "sdkVersion": "10.0.100-preview.1.25121.1", + "runtimeVersion": "10.0.0-preview.1.25080.5", + "aspNetCoreVersion": "10.0.0-preview.1.25120.3", + "sourceRepository": "https://github.com/dotnet/dotnet", + "sourceVersion": "cd6837f843092ac26057787149a098851e8dc9c9" +} diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 5a7418709aec..224d849e18a4 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -137,7 +137,7 @@ mkWrapper type ( -i \$prev -t attr -n Project -v "${extraTargets}" \ sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder version "10") '' codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} '' ) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 672aed40501f..923c31a7fcec 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -88,6 +88,7 @@ let dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + dotnet_10 = recurseIntoAttrs (callPackage ./10 { }); } ); }; @@ -158,7 +159,8 @@ pkgs # use binary SDK here to avoid downgrading feature band sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; - sdk_10_0_1xx = pkgs.sdk_10_0_1xx-bin; + sdk_10_0_1xx = + if !pkgs.dotnet_10.vmr.meta.broken then pkgs.dotnet_10.sdk else pkgs.sdk_10_0_1xx-bin; # source-built SDK only exists for _1xx feature band # https://github.com/dotnet/source-build/issues/3667 sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin; diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index aca1af07c603..f2af52622a13 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -162,6 +162,11 @@ let runHook postInstall ''; + ${if stdenvNoCC.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = '' + mkdir -p "$out"/nix-support + cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps + ''; + passthru = { inherit (vmr) icu targetRid hasILCompiler; diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 4f439c0a4285..acc28a0025c9 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -12,6 +12,7 @@ xmlstarlet, patchNupkgs, symlinkJoin, + openssl, baseName ? "dotnet", releaseManifestFile, @@ -83,6 +84,12 @@ let "-p:SkipErrorOnPrebuilts=true" ]; + # https://github.com/dotnet/source-build/issues/4920 + ${if stdenv.isLinux && lib.versionAtLeast old.version "10" then "postFixup" else null} = '' + find $out \( -name crossgen2 -or -name ilc \) -type f -print0 | + xargs -0 patchelf --add-needed libssl.so --add-rpath "${lib.makeLibraryPath [ openssl ]}" + ''; + passthru = old.passthru or { } // { fetch-deps = let diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 80c1ddfeaa71..30923aa65d34 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -24,6 +24,7 @@ python3, xmlstarlet, nodejs, + cpio, callPackage, unzip, yq, @@ -90,6 +91,9 @@ stdenv.mkDerivation rec { ++ lib.optionals (lib.versionAtLeast version "9") [ nodejs ] + ++ lib.optionals (lib.versionAtLeast version "10") [ + cpio + ] ++ lib.optionals isDarwin [ getconf ]; @@ -143,7 +147,7 @@ stdenv.mkDerivation rec { ''; patches = - lib.optionals (lib.versionAtLeast version "9") [ + lib.optionals (lib.versionAtLeast version "9" && lib.versionOlder version "10") [ ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch ] ++ lib.optionals (lib.versionOlder version "9") [ @@ -283,7 +287,10 @@ stdenv.mkDerivation rec { substituteInPlace \ src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ - src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + '' + + lib.optionalString (lib.versionAtLeast version "10") " src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Codesign.cs \\\n" + + lib.optionalString (lib.versionOlder version "10") " src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \\\n" + + '' --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' # fix: strip: error: unknown argument '-n' @@ -297,6 +304,15 @@ stdenv.mkDerivation rec { -s //Project -t elem -n PropertyGroup \ -s \$prev -t elem -n SkipInstallerBuild -v true \ src/runtime/Directory.Build.props + '' + + lib.optionalString (lib.versionAtLeast version "10") '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n SkipInstallerBuild -v true \ + src/aspnetcore/Directory.Build.props + '' + + '' # stop passing -sdk without a path # stop using xcrun @@ -308,19 +324,21 @@ stdenv.mkDerivation rec { --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" + + lib.optionalString (lib.versionAtLeast version "9") ( + '' + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + src/runtime/src/native/managed/native-library.targets \ + --replace-fail ' -no_code_signature_warning' "" - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ - --replace-fail 'Include="-ld_classic"' "" - '' + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + '' + + lib.optionalString (lib.versionOlder version "10") " src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n" + + " --replace-fail 'Include=\"-ld_classic\"' \"\"\n" + ) + lib.optionalString (lib.versionOlder version "9") '' # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll @@ -450,6 +468,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + ${if stdenv.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = '' + mkdir -p "$out"/nix-support + echo ${sigtool} > "$out"/nix-support/manual-sdk-deps + ''; + # dotnet cli is in the root, so we need to strip from there # TODO: should we install in $out/share/dotnet? stripDebugList = [ "." ]; From c597c809b30f1fb41eab550c9e3b6bce3e211874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 21:30:59 +0000 Subject: [PATCH 025/105] timer: 1.4.5 -> 1.4.6 --- pkgs/by-name/ti/timer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/timer/package.nix b/pkgs/by-name/ti/timer/package.nix index c5b78c80b3f0..c19a23e153ad 100644 --- a/pkgs/by-name/ti/timer/package.nix +++ b/pkgs/by-name/ti/timer/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "timer"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "caarlos0"; repo = "timer"; rev = "v${version}"; - hash = "sha256-nHQPTinrSXMeZeiZC16drliFf0ib9+gjxJr9oViZqOc="; + hash = "sha256-Y4goNURzWl3DGeR14jEB87IJSNhSRqoF+/7zjGQ+19E="; }; - vendorHash = "sha256-mE/C4S2gqcFGfnmCeMS/VpQwXHrI8SXos0M1+rV3hPo="; + vendorHash = "sha256-RMVlCWPezi0mCq3hsJrEHK5pw7dN/wnLHFYvmxaNCBM="; ldflags = [ "-s" From b560cfb45652bbcb29181a0053c17f5255fc851e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 12:19:39 +0100 Subject: [PATCH 026/105] tint2: fix build Apparently this subproject was missing an explicit dependency on libm Fixes ``` > /nix/store/9g4gsby96w4cx1i338kplaap0x37apdf-binutils-2.43.1/bin/ld: CMakeFiles/tint2conf.dir/__/util/common.c.o: undefined reference to symbol 'log10@@GLIBC_2.2.5' > /nix/store/9g4gsby96w4cx1i338kplaap0x37apdf-binutils-2.43.1/bin/ld: /nix/store/6q2mknq81cyscjmkv72fpcsvan56qhmg-glibc-2.40-66/lib/libm.so.6: error adding symbols: DSO missing from command line > collect2: error: ld returned 1 exit status ``` --- pkgs/by-name/ti/tint2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index 1c55cb009fe6..af215d59c430 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -78,6 +78,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Add missing dependency on libm + substituteInPlace src/tint2conf/CMakeLists.txt \ + --replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)" + for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c do From 573b14b450ca81c085640dc0ccd11a4b20f7df5d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 22:49:15 +0100 Subject: [PATCH 027/105] tint2: minor cleanup --- pkgs/by-name/ti/tint2/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index af215d59c430..d5fc7052444a 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -82,11 +82,8 @@ stdenv.mkDerivation rec { substituteInPlace src/tint2conf/CMakeLists.txt \ --replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)" - for f in ./src/launcher/apps-common.c \ - ./src/launcher/icon-theme-common.c - do - substituteInPlace $f --replace-fail /usr/share/ /run/current-system/sw/share/ - done + substituteInPlace src/launcher/apps-common.c src/launcher/icon-theme-common.c \ + --replace-fail /usr/share/ /run/current-system/sw/share/ ''; meta = with lib; { From 7c9c34241901cc629bcff7c2d795bd6895409401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Mar 2025 22:54:34 +0100 Subject: [PATCH 028/105] nixos/restic: suggest to cleanup cache --- nixos/modules/services/backup/restic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index aaddc5d16589..d8e617b6afb2 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -195,6 +195,7 @@ in Extra arguments passed to restic backup. ''; example = [ + "--cleanup-cache" "--exclude-file=/etc/nixos/restic-ignore" ]; }; From 138abab480251e74ab0214a867f365b1be69f814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Mar 2025 22:54:42 +0100 Subject: [PATCH 029/105] nixos/restic: unlock database before doing pruning This is safe to do because only stale locks are removed. See https://github.com/restic/restic/issues/2736 and https://github.com/restic/restic/blob/master/internal/restic/lock.go By default only locks older than 30 minutes or when the pid is no longer found on the same machine, are removed. Locks are refreshed every 5 minutes when doing operations. --- nixos/modules/services/backup/restic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index d8e617b6afb2..ce8bcc3994b8 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -353,6 +353,7 @@ in filesFromTmpFile = "/run/restic-backups-${name}/includes"; doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != [ ]); pruneCmd = lib.optionals (builtins.length backup.pruneOpts > 0) [ + (resticCmd + " unlock") (resticCmd + " forget --prune " + (lib.concatStringsSep " " backup.pruneOpts)) ]; checkCmd = lib.optionals backup.runCheck [ From a76d0ea42eb6a7d6e75d3d157b78f86ee163decc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 22:55:30 +0100 Subject: [PATCH 030/105] tint2: add versionCheckHook --- pkgs/by-name/ti/tint2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index d5fc7052444a..b00d34b131e8 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -22,6 +22,7 @@ libXdmcp, libstartup_notification, wrapGAppsHook3, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -86,6 +87,9 @@ stdenv.mkDerivation rec { --replace-fail /usr/share/ /run/current-system/sw/share/ ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = with lib; { homepage = "https://gitlab.com/nick87720z/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; From c1ad7af57479914b90edde5b2ac277610d809a31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 22:13:10 +0000 Subject: [PATCH 031/105] airwindows: 0-unstable-2025-02-16 -> 0-unstable-2025-03-02 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index b65b357de558..f2b324e50411 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-02-16"; + version = "0-unstable-2025-03-02"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "6a9e1e2913c85edc21f4554b49089668f19cc924"; - hash = "sha256-Lb7IawTn/JKm/UF8ArwYalJGzX0yZwhKden5e2TlBeI="; + rev = "f172389273a0ab35f703a6ab267c737d28ab7ec5"; + hash = "sha256-YmtH5KtPeTDR8imQkTriJx5sD9cS5Tqp6Yjri/I+q3Y="; }; # we patch helpers because honestly im spooked out by where those variables From d1edd1d7e7cffd03ece2062053cfe637fb1251f1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 4 Mar 2025 18:50:35 -0500 Subject: [PATCH 032/105] gitea: 1.23.4 -> 1.23.5 Diff: https://github.com/go-gitea/gitea/compare/refs/tags/v1.23.4...v1.23.5 --- pkgs/by-name/gi/gitea/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 3da303afab20..a2101ac62fa4 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,18 +35,18 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.23.4"; + version = "1.23.5"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-gcz3R3AcOOujpI++oF8MBGGnCjDbl5mXuvGpVNHS92g="; + hash = "sha256-SWLkrZTZXXy7x3kszagR0hjrmLhtYvGRf05YU5Mtbl4="; }; proxyVendor = true; - vendorHash = "sha256-nkg9uHAUqPJWWap0cTmDokcl2L2hT/b9I1+rNnA8bD0="; + vendorHash = "sha256-Iiw302HDGf6ECw2cGqwZCwAqQ21eQVaEab/cuhD1dJ4="; outputs = [ "out" From d295ab9fc6da19292242e34d1e64b5e61183d533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Mar 2025 15:25:14 -0800 Subject: [PATCH 033/105] python313Packages.ha-mqtt-discoverable: 0.16.4 -> 0.18.0 Diff: https://github.com/unixorn/ha-mqtt-discoverable/compare/refs/tags/v0.16.4...v0.18.0 Changelog: https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v0.18.0 --- .../ha-mqtt-discoverable/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 4e2275dba2d1..d977634f39e7 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -8,12 +8,11 @@ pyaml, pydantic, pythonOlder, - thelogrus, }: buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.16.4"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,10 +21,14 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; tag = "v${version}"; - hash = "sha256-9JRgg2A/tcZyAkuddQ/v3Dhxe60O47Y4VZY3Yb6/49g="; + hash = "sha256-CO2XVYYQql8w+YYCxffDdqiKs0Aqc3rYtRM79IYmkzY="; }; - pythonRelaxDeps = [ "pyaml" ]; + pythonRelaxDeps = [ + "paho-mqtt" + "pyaml" + "pydantic" + ]; build-system = [ poetry-core ]; @@ -34,7 +37,6 @@ buildPythonPackage rec { paho-mqtt pyaml pydantic - thelogrus ]; # Test require a running Mosquitto instance @@ -43,8 +45,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ha_mqtt_discoverable" ]; meta = with lib; { - # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 - broken = lib.versionAtLeast paho-mqtt.version "2"; description = "Python module to create MQTT entities that are automatically discovered by Home Assistant"; homepage = "https://github.com/unixorn/ha-mqtt-discoverable"; changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; From 3ed153068431ffa50cf53679ce81fa4e0ee8cdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Mar 2025 15:23:33 -0800 Subject: [PATCH 034/105] ha-mqtt-discoverable-cli: 0.16.4.1 -> 0.18.0 Diff: https://github.com/unixorn/ha-mqtt-discoverable-cli/compare/refs/tags/v0.16.4.1...v0.18.0 Changelog: https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v0.18.0 --- .../ha/ha-mqtt-discoverable-cli/package.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index 8007859bf840..c727bcde08c9 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -4,32 +4,26 @@ python3, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - # https://github.com/unixorn/ha-mqtt-discoverable/pull/310 - paho-mqtt = self.paho-mqtt_1; - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.16.4.1"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; tag = "v${version}"; - hash = "sha256-VjHsiF4HxGscG1pysxegPyM+Y18CWW06D3WezD+BLss="; + hash = "sha256-bPgVPj/ZfHznY0cY1ac0TlhCCdw3ZssL/E8yo0gACgQ="; }; pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; - build-system = with python.pkgs; [ poetry-core ]; + build-system = with python3.pkgs; [ poetry-core ]; - dependencies = with python.pkgs; [ ha-mqtt-discoverable ]; + dependencies = with python3.pkgs; [ + gitlike-commands + ha-mqtt-discoverable + ]; # Project has no real tests doCheck = false; From 67973c62e5005410654bfd11e0ab8dd0ec6a2242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Mar 2025 05:04:04 +0000 Subject: [PATCH 035/105] namespace-cli: 0.0.403 -> 0.0.405 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index ef7c115ffddd..7814426077f1 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.403"; + version = "0.0.405"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-J9TR9jk9Tp4lIDGfxibapA6BX18APkN1p8XH9C11W1Y="; + hash = "sha256-a81ToAFJAay9KpVigVNknaaGbZeKN7FKYQ6XG1tzv+s="; }; vendorHash = "sha256-PoJy/tpjkUkxHiJZNFzl2UXj29iojwL9g6YrAEkSvKk="; From 3563c058f4c366efbf945716738ed1e97f46aa2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:05:32 +0100 Subject: [PATCH 036/105] cfripper: 1.16.0 -> 1.17.0 Diff: https://github.com/Skyscanner/cfripper/compare/refs/tags/v1.16.0...v1.17.0 Changelog: https://github.com/Skyscanner/cfripper/releases/tag/v1.17.0 --- pkgs/by-name/cf/cfripper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index f06f13e966e4..0826b2919953 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${version}"; - hash = "sha256-2yOATSCXqv28OE+GdF9F9Dhi3AIkxSe/YJ9ILLnd/nw="; + hash = "sha256-xmCI+rM8Ijj66Df6H5WFpxTDkKqW5CPwXh+w/Qaqooc="; }; pythonRelaxDeps = [ From 6413e50dfe946782ee376a24989ba1db97a017dc Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 5 Mar 2025 08:06:29 +0100 Subject: [PATCH 037/105] go_1_24: 1.24.0 -> 1.24.1 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 4afafbdbc747..377320ec3fe6 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; + hash = "sha256-gkTr9GxlYH2xAiK1gGrrMcH8+JecG2sS9gxnfpo8BlY="; }; strictDeps = true; From 96d417a49fe30431b1f52bcc6159303097fcc1b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:13:06 +0100 Subject: [PATCH 038/105] cnspec: 11.43.0 -> 11.44.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.43.0...v11.44.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.44.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index b870643ef6bb..c11a587fe2ec 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.43.0"; + version = "11.44.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-Wuatp9X5V6PxYVLZQkVJUfgZ/ImmL9geH3IQDKpnsk8="; + hash = "sha256-EPnFGCVzblRqW5v3QWn1WqTd0QxnYrMyTkj0i9SotUE="; }; proxyVendor = true; - vendorHash = "sha256-CdEv7ytOGB9pAKGi+l5RY2zBtfvBwW6OI4Od6oKVY9o="; + vendorHash = "sha256-5KetEhFLKieNF7+jvdS5H2lZaDrMlmJABQINWVyj7tA="; subPackages = [ "apps/cnspec" ]; From 492ad4f39790ba9e604438b30e34c9cd29e29955 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:15:50 +0100 Subject: [PATCH 039/105] ggshield: 1.36.0 -> 1.37.0 Diff: https://github.com/GitGuardian/ggshield/compare/refs/tags/v1.36.0...v1.37.0 Changelog: https://github.com/GitGuardian/ggshield/blob/1.37.0/CHANGELOG.md --- pkgs/tools/security/ggshield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index f4e0b286a31a..250ac8c1211c 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${version}"; - hash = "sha256-qHGReoIRgqpolQvtzysXtcFJGzavdG6osh4u1ctvHuo="; + hash = "sha256-5Fh0wLsI3syfrk/TE5P08gsmMdZ427agQ2/yilW0Sx8="; }; pythonRelaxDeps = true; From d5fb48e63fa3bdf9eb7d7d0031de14266909bb56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:17:08 +0100 Subject: [PATCH 040/105] python313Packages.discogs-client: 2.7.1 -> 2.8 Diff: https://github.com/joalla/discogs_client/compare/refs/tags/v2.7.1...v2.8 Changelog: https://github.com/joalla/discogs_client/releases/tag/v2.8 --- pkgs/development/python-modules/discogs-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index 7e8b1ab76baf..c4b57a0209ca 100644 --- a/pkgs/development/python-modules/discogs-client/default.nix +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.7.1"; + version = "2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; tag = "v${version}"; - hash = "sha256-3MwGuYh4Jp/T7LNd5QjajHScdJJOa+VRXmKwFVqfURU="; + hash = "sha256-2mMBfOM5sOJsuoxrT3Ku99zDQ8wDw12zRloRLHRDRL0="; }; propagatedBuildInputs = [ From 905905fffef5dbd7f0a094d25b6b107ae73e960e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:18:17 +0100 Subject: [PATCH 041/105] python313Packages.deebot-client: 12.2.0 -> 12.3.1 Diff: https://github.com/DeebotUniverse/client.py/compare/refs/tags/12.2.0...12.3.1 Changelog: https://github.com/DeebotUniverse/client.py/releases/tag/12.3.1 --- pkgs/development/python-modules/deebot-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index a85d010147c5..0eb3f5f8e8c6 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "12.2.0"; + version = "12.3.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,12 +32,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-g3BoNZA6p8vDnw1jUIsgCxO/X38VUc3XYedxJazJzlI="; + hash = "sha256-2ZdWe9fVmQq7YGKzBut6hec3OeR9iXDkoDmYFYHX90A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-gHmEO5f2cqHW4EwftUMvW4xYmwjNDuSDe2R0JI0ahpc="; + hash = "sha256-PrHm85Tzfd3jS5ofKKpECkWhL44yKBc8Hvrh0zbl7lw="; }; pythonRelaxDeps = [ From bf56ca9a8e6238a4378a85939a2a41b740df50a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:19:06 +0100 Subject: [PATCH 042/105] python313Packages.asn1: 2.8.0 -> 3.0.0 Diff: https://github.com/andrivet/python-asn1/compare/refs/tags/v2.8.0...v3.0.0 Changelog: https://github.com/andrivet/python-asn1/blob/v3.0.0/CHANGELOG.rst --- pkgs/development/python-modules/asn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 3cec48bb7e4c..640e10ba4c4e 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.8.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; tag = "v${version}"; - hash = "sha256-DLKfdQzYLhfaIEPPymTzRqj3+L/fsm5Jh8kqud/ezfw="; + hash = "sha256-OVDhA5ClnwJJwZw0oinAUUDBN/s2ECgHXEww+8hB/fQ="; }; build-system = [ setuptools ]; From 0c62d387cf312177df1ff183b719c9df8a0eebd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:19:48 +0100 Subject: [PATCH 043/105] python313Packages.asyncwhois: 1.1.9 -> 1.1.10 Diff: https://github.com/pogzyb/asyncwhois/compare/refs/tags/v1.1.9...v1.1.10 Changelog: https://github.com/pogzyb/asyncwhois/releases/tag/v1.1.10 --- pkgs/development/python-modules/asyncwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 07344784ab67..70549885168b 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.9"; + version = "1.1.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; tag = "v${version}"; - hash = "sha256-Eb7De2AMxZi0Wu8dYA5wlX84BbF62L24vIuBEnvfxBU="; + hash = "sha256-vNXz8a0tXMxgcJ3xGKyJFgxQuIxpBg/xUeeG1TPXB0E="; }; build-system = [ hatchling ]; From 41d075375d9add2e6941bea6c77f76e45ef6d99a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:20:22 +0100 Subject: [PATCH 044/105] python313Packages.pybrowsers: 0.6.0 -> 0.7.0 Diff: https://github.com/roniemartinez/browsers/compare/refs/tags/0.6.0...0.7.0 Changelog: https://github.com/roniemartinez/browsers/releases/tag/0.7.0 --- pkgs/development/python-modules/pybrowsers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix index 652bd01a91c5..3b853a3c25ba 100644 --- a/pkgs/development/python-modules/pybrowsers/default.nix +++ b/pkgs/development/python-modules/pybrowsers/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pybrowsers"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "roniemartinez"; repo = "browsers"; tag = version; - hash = "sha256-hjaQUfH7pNwC6+6liOUQQZU6NdhxLmtabvDD7JnQ3GU="; + hash = "sha256-x8sVWRT9KaKQ6obf7aFcnQFiG8FJAzu93yCzX3hnhFo="; }; postPatch = '' From 748fdcf7ee56f75b2594ece5ed51588936d48b92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:20:56 +0100 Subject: [PATCH 045/105] python313Packages.kasa-crypt: 0.5.0 -> 0.6.1 Diff: https://github.com/bdraco/kasa-crypt/compare/refs/tags/v0.5.0...v0.6.1 Changelog: https://github.com/bdraco/kasa-crypt/blob/v0.6.1/CHANGELOG.md --- pkgs/development/python-modules/kasa-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index fad39f395cc2..5d78453d41af 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; tag = "v${version}"; - hash = "sha256-pkUB2RTCTZW9NhZlxBA9YC+8yWx+6yrNXk8OGAfGto4="; + hash = "sha256-eP8GgogyvmrPbsXGWq9RqkinezNGVlDXC/BfgO+dUJ0="; }; postPatch = '' From bddcd79a8f61173c8605fe3421dadfbd95ec3fd7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:44:46 +0100 Subject: [PATCH 046/105] python312Packages.mypy-boto3-elasticache: 1.37.0 -> 1.37.6 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ad6041dba785..09a83dd798b1 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -478,8 +478,8 @@ rec { "sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.37.0" - "sha256-27ayjkuTkHSiWUvV+YiA4OU4yufrFFM+atENNrp6sSY="; + buildMypyBoto3Package "elasticache" "1.37.6" + "sha256-qLRD+/08rWFA4cocIKyjXR8FQaX/Ho2nPHySbQEvu6Q="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.37.0" From c86c3a9ae0a2657b3faf43e33148b041d43fcde6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:44:59 +0100 Subject: [PATCH 047/105] python312Packages.mypy-boto3-iotsitewise: 1.37.0 -> 1.37.6 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 09a83dd798b1..79f2c4424c1c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -682,8 +682,8 @@ rec { "sha256-cbEk1zLlN9p39j2ieLX0cnbazR/pp/tcBB2lDM80c04="; mypy-boto3-iotsitewise = - buildMypyBoto3Package "iotsitewise" "1.37.0" - "sha256-x+Ca4JkuisX6kKFyZn+QAAx08Yk6UgH9ek0Zhgx1o+Q="; + buildMypyBoto3Package "iotsitewise" "1.37.6" + "sha256-orP5EctM9M8hGTIMNcFjKlWLm4CNKR9KjQo3yUqPTlY="; mypy-boto3-iotthingsgraph = buildMypyBoto3Package "iotthingsgraph" "1.37.0" From fd884b71de3471966aa3614defc8cf3f22c9195e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:45:23 +0100 Subject: [PATCH 048/105] python312Packages.mypy-boto3-rds: 1.37.0 -> 1.37.6 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 79f2c4424c1c..1f194c5edb70 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-csr3DYjsomhq4T+97ZEQdjt0RfsXbo8kBFGrB6cUUmM="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.37.0" - "sha256-58klRnnw/x4pMIWyJpgbf5n+QPAo7EfFeluMvZi+aU8="; + buildMypyBoto3Package "rds" "1.37.6" + "sha256-IoXZZE9YwtHROZYy3A/nmSfhkpCpt6GE+AyF2KTmXlg="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.37.0" From 18aace6d4a9f8bc9928e4858b721178531e331ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:45:49 +0100 Subject: [PATCH 049/105] python313Packages.boto3-stubs: 1.37.5 -> 1.37.6 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 57eae487aeda..bf870cc58377 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.5"; + version = "1.37.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-EdOovc4OMFlRFBdi4vhh7ttTr347BN8Qr0TJztGWGIM="; + hash = "sha256-YzdZqBtRgMAbbQHDWkqWt/UjXzHBWtiTYVPsaDcGiQw="; }; build-system = [ setuptools ]; From a6f4ddb593b18d80ba6d3f97637ec2f49daecbb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 08:59:22 +0100 Subject: [PATCH 050/105] python313Packages.schema-salad: 8.8.20241206093842 -> 8.8.20250205075315 Diff: https://github.com/common-workflow-language/schema_salad/compare/refs/tags/8.8.20241206093842...8.8.20250205075315 Changelog: https://github.com/common-workflow-language/schema_salad/releases/tag/8.8.20250205075315 --- pkgs/development/python-modules/schema-salad/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 736c77f9c133..019a86f9a05e 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.8.20241206093842"; + version = "8.8.20250205075315"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,12 +31,14 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = "schema_salad"; tag = version; - hash = "sha256-DUBrKBFphOa5hbEtsLVSI186TrhCkiNPtqlA61MENx0="; + hash = "sha256-Lev5daC3RCuXN1GJjOwplTx9PB3HTNZdNNzusn2dBaI="; }; + pythonRelaxDeps = [ "mistune" ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "mypy[mypyc]==1.13.0" "mypy" + --replace-fail "mypy[mypyc]==1.15.0" "mypy" ''; build-system = [ setuptools-scm ]; @@ -65,6 +67,7 @@ buildPythonPackage rec { disabledTests = [ "test_load_by_yaml_metaschema" + "test_detect_changes_in_html" # Setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" From 2b254336c216b5ef0e7d1d42891a851d2092856c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:01:59 +0100 Subject: [PATCH 051/105] python313Packages.cwl-utils: 0.36 -> 0.37 Diff: https://github.com/common-workflow-language/cwl-utils/compare/refs/tags/v0.36...v0.37 Changelog: https://github.com/common-workflow-language/cwl-utils/releases/tag/v0.37 --- pkgs/development/python-modules/cwl-utils/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index bc8ee3baf3e5..7fe9475b469e 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -4,6 +4,7 @@ cwl-upgrader, cwlformat, fetchFromGitHub, + jsonschema, packaging, pytest-mock, pytest-xdist, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.36"; + version = "0.37"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = "cwl-utils"; tag = "v${version}"; - hash = "sha256-ZSRwkZkBZ2cM0ZBvyI628xjbiho2FuFJnCYDZl3IrHs="; + hash = "sha256-OD8Nz8SIqB0Ie3S5663sQg3GjlCkC+qBvOXM9HZNuQU="; }; build-system = [ setuptools ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cwlformat + jsonschema pytest-mock pytest-xdist pytestCheckHook @@ -60,6 +62,7 @@ buildPythonPackage rec { # Don't run tests which require network access "test_remote_packing" "test_remote_packing_github_soft_links" + "test_cwl_inputs_to_jsonschema" ]; meta = with lib; { From 7a801c5f3e388d5b69e1f31bd5c58240a6ab585c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:14:01 +0100 Subject: [PATCH 052/105] python312Packages.llama-index-core: 0.12.17.post2 -> 0.12.22.post1 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.12.17.post2...v0.12.22.post1 Changelog: https://github.com/run-llama/llama_index/blob/v0.12.22.post1/CHANGELOG.md --- pkgs/development/python-modules/llama-index-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index e72812df2163..ea8ef079f7b2 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.17.post2"; + version = "0.12.22.post1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-lAjaW/Kx7tYdsiyWnv6VLQG6lPkVyliD1KPJA/Or0YA="; + hash = "sha256-pvFhFkFrJd/0Y660KW03PymkfyEM+QDFRgyJoT46Dd8="; }; sourceRoot = "${src.name}/${pname}"; From bbe36bf5b8e3e9f55f378707c3089011bc8e58f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:14:25 +0100 Subject: [PATCH 053/105] python312Packages.llama-index-agent-openai: 0.4.3 -> 0.4.6 --- .../python-modules/llama-index-agent-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index a369d90efba0..30c2c669e290 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.4.3"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-/x9KE7pBfLS5z7wv+p8WK9vdqbh9ZkXVEsveIGH1VBI="; + hash = "sha256-T2bBcxg2q2bEtEElWpXzOlF0PkmTuKqdr0MMsxqn1I4="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; From 08c1549a5e82bd3e86423e252be09d2620538a66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:14:42 +0100 Subject: [PATCH 054/105] python312Packages.llama-index-cli: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index f590810b4b91..e7080e0754dc 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-1qsgE1mWKoo0Norto6Sbu+Z+ngCcWb2SXE+yvkrOOQY="; + hash = "sha256-P5fx+PX0Ad+1trxxcHF8F23NmBU4AXQwBz7xL/3L3fo="; }; build-system = [ poetry-core ]; From 3eeaef10affdcbdecfae30b491496a71af186546 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:14:58 +0100 Subject: [PATCH 055/105] python312Packages.llama-index-indices-managed-llama-cloud: 0.6.4 -> 0.6.8 --- .../llama-index-indices-managed-llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 0ab026a499e5..f31b6b165229 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.6.4"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-C0WXPLLclwISIAYBm/tVbcq7oxsL33mvx7N2yoFD3wM="; + hash = "sha256-ZYGhpOlmyA0QhwaIDcOaEuOGNO3f+ehZ8swNS7EcZIM="; }; build-system = [ poetry-core ]; From df6e66512e9fc25d3b66cc4299ece354d0b42339 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:15:11 +0100 Subject: [PATCH 056/105] python312Packages.llama-index-llms-openai: 0.3.20 -> 0.3.25 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 8478c7265439..66a12bf34c3d 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.3.20"; + version = "0.3.25"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-IfGcdqckEyHlRvjFZaHMvUA16/s56N5snYPXBSgmGdQ="; + hash = "sha256-Hk/R0Wa7Y1ynwD8EhsBNgJeJSMW42JyLRprl0ChSz0s="; }; pythonRemoveDeps = [ From 94a8c4a69594525c79ce026c8f4c01d1d3ba7a44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:15:34 +0100 Subject: [PATCH 057/105] python312Packages.llama-index-llms-openai-like: 0.3.3 -> 0.3.4 --- .../python-modules/llama-index-llms-openai-like/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index d39731a4434f..7d37e2b4e729 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-vqBCAXKR2TOsk6DEh8jarSWnDm9r8qVEAVD2wYskbfY="; + hash = "sha256-bLjVdNicRrC9oH5/l0e2Qo9wpzNWBpIrQxh9qZ2WdR0="; }; build-system = [ poetry-core ]; From 757acf824f291d69261d7d9207884c096a165a83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:15:46 +0100 Subject: [PATCH 058/105] python312Packages.llama-index-multi-modal-llms-openai: 0.4.3 -> 0.5.0 --- .../llama-index-multi-modal-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 579f262de1bd..41b0172b4bdf 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-XmylQGnT0YwvX3yjTzcg+6HRuRJkgq04/rDIWPT+tjs="; + hash = "sha256-tv0SaEKrjDQobWtkENK2lfuZbOa/htUA2SS12kTfC0E="; }; build-system = [ poetry-core ]; From 4c607a0624608cc9d02ce5292db2b55ce50c5531 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:16:05 +0100 Subject: [PATCH 059/105] python312Packages.llama-index-readers-file: 0.4.5 -> 0.4.6 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 5f092dee3231..1f048da4af11 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-POXIrX8oW7f/goxbLiAIiFasZc+WZAKH7Kdwtpoh34g="; + hash = "sha256-UBGf3/t/WqRjjdoiJ8ea1qXzJrnFWn5GBU35n0anCeA="; }; pythonRelaxDeps = [ From 9ae8c25fb46985e22821103ab9f678a10bd586bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:26:41 +0100 Subject: [PATCH 060/105] python313Packages.whispers: adjust inputs --- .../python-modules/whispers/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index a79695c41603..01a41c651830 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -1,22 +1,24 @@ { lib, - astroid, beautifulsoup4, buildPythonPackage, crossplane, fetchFromGitHub, jellyfish, jproperties, + jsonschema-specifications, + jsonschema, luhn, lxml, pytest-mock, pytestCheckHook, pythonOlder, pyyaml, - wrapt, semgrep, setuptools, six, + soupsieve, + wrapt, }: buildPythonPackage rec { @@ -24,7 +26,7 @@ buildPythonPackage rec { version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.1"; src = fetchFromGitHub { owner = "adeptex"; @@ -38,28 +40,23 @@ buildPythonPackage rec { --replace-fail '"pytest-runner"' "" ''; - pythonRelaxDeps = [ - "jellyfish" - "lxml" - "pyyaml" - "semgrep" - "six" - "wrapt" - ]; + pythonRelaxDeps = true; build-system = [ setuptools ]; dependencies = [ - astroid beautifulsoup4 crossplane jellyfish jproperties + jsonschema + jsonschema-specifications luhn lxml pyyaml semgrep six + soupsieve wrapt ]; @@ -69,14 +66,14 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # pinning tests highly sensitive to semgrep version + # Pinning tests highly sensitive to semgrep version "tests/unit/plugins/test_semgrep.py" ]; preCheck = '' - # pinning test highly sensitive to semgrep version + # Pinning test highly sensitive to semgrep version substituteInPlace tests/unit/test_main.py \ - --replace-fail '("--ast", 421),' "" + --replace-fail '("--ast", 434),' "" # Some tests need the binary available in PATH export PATH=$out/bin:$PATH @@ -88,7 +85,7 @@ buildPythonPackage rec { description = "Tool to identify hardcoded secrets in static structured text"; homepage = "https://github.com/adeptex/whispers"; changelog = "https://github.com/adeptex/whispers/releases/tag/${src.tag}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "whispers"; }; From 2ad000b54039913901f37488f49045fb4298c9b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:29:37 +0100 Subject: [PATCH 061/105] cwltool: 3.1.20241217163858 -> 3.1.20250110105449 Diff: https://github.com/common-workflow-language/cwltool/compare/refs/tags/3.1.20241217163858...3.1.20250110105449 Changelog: https://github.com/common-workflow-language/cwltool/releases/tag/3.1.20250110105449 --- pkgs/by-name/cw/cwltool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index 15f387b7e131..57cf3be6963c 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -25,14 +25,14 @@ with py.pkgs; py.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20241217163858"; + version = "3.1.20250110105449"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; tag = version; - hash = "sha256-46x/7ewnt1eTu+1GdmPUExpiFfYE3mN8N8VFMM4r1Vk="; + hash = "sha256-V0CQiNkIw81s6e9224qcfbsOqBvMo34q+lRURpRetKs="; }; postPatch = '' From fa376cf5a574ac37c8c66bba3555c4f9ec99b23b Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 21 Jan 2025 19:02:40 +0100 Subject: [PATCH 062/105] rustdesk 1.3.1 -> 1.3.8 --- pkgs/by-name/ru/rustdesk/Cargo.lock | 136 +++++++++++------- .../ru/rustdesk/make-build-reproducible.patch | 13 ++ pkgs/by-name/ru/rustdesk/package.nix | 31 ++-- 3 files changed, 114 insertions(+), 66 deletions(-) create mode 100644 pkgs/by-name/ru/rustdesk/make-build-reproducible.patch diff --git a/pkgs/by-name/ru/rustdesk/Cargo.lock b/pkgs/by-name/ru/rustdesk/Cargo.lock index 406c1525a8f8..8719962f8d96 100644 --- a/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" +source = "git+https://github.com/rustdesk-org/arboard#4e16bad260ea05dd7dcdb68cc7549dad3920b940" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -234,6 +234,7 @@ dependencies = [ "objc2-app-kit", "objc2-foundation", "parking_lot", + "percent-encoding", "serde 1.0.203", "serde_derive", "windows-sys 0.48.0", @@ -723,9 +724,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" [[package]] name = "byteorder" @@ -735,9 +736,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde 1.0.203", ] @@ -893,6 +894,20 @@ dependencies = [ "regex", ] +[[package]] +name = "cidre" +version = "0.4.0" +source = "git+https://github.com/yury/cidre.git?rev=f05c428#f05c4288f9870c9fab53272ddafd6ec01c7b2dbf" +dependencies = [ + "cidre-macros", + "parking_lot", +] + +[[package]] +name = "cidre-macros" +version = "0.1.0" +source = "git+https://github.com/yury/cidre.git?rev=f05c428#f05c4288f9870c9fab53272ddafd6ec01c7b2dbf" + [[package]] name = "cipher" version = "0.4.4" @@ -1164,7 +1179,7 @@ name = "core-foundation" version = "0.9.3" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "libc", ] @@ -1268,10 +1283,10 @@ dependencies = [ [[package]] name = "cpal" version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +source = "git+https://github.com/rustdesk-org/cpal?branch=osx-screencapturekit#6b374bcaed076750ca8fce6da518ab39b882e14a" dependencies = [ "alsa", + "cidre", "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs", "dasp_sample", @@ -1559,6 +1574,16 @@ dependencies = [ "windows 0.32.0", ] +[[package]] +name = "default_net" +version = "0.1.0" +source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e" +dependencies = [ + "anyhow", + "regex", + "winapi 0.3.9", +] + [[package]] name = "deranged" version = "0.3.11" @@ -2199,17 +2224,17 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fuser" -version = "0.13.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21370f84640642c8ea36dfb2a6bfc4c55941f476fcf431f6fef25a5ddcf0169b" +checksum = "53274f494609e77794b627b1a3cddfe45d675a6b2e9ba9c0fdc8d8eee2184369" dependencies = [ "libc", "log", "memchr", + "nix 0.29.0", "page_size", - "pkg-config", "smallvec", - "zerocopy 0.6.6", + "zerocopy 0.8.14", ] [[package]] @@ -2229,9 +2254,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2239,9 +2264,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -2256,9 +2281,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2290,9 +2315,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -2301,21 +2326,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2879,6 +2904,7 @@ dependencies = [ "bytes", "chrono", "confy", + "default_net", "directories-next", "dirs-next", "dlopen", @@ -2903,6 +2929,7 @@ dependencies = [ "serde 1.0.203", "serde_derive", "serde_json 1.0.118", + "sha2", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -3042,8 +3069,8 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" +version = "0.7.1" +source = "git+https://github.com/rustdesk-org/hwcodec#0ea7e709d3c48bb6446e33a9cc8fd0e0da5709b9" dependencies = [ "bindgen 0.59.2", "cc", @@ -4360,9 +4387,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -4392,9 +4419,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -4474,9 +4501,9 @@ dependencies = [ [[package]] name = "page_size" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" dependencies = [ "libc", "winapi 0.3.9", @@ -5197,7 +5224,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" +source = "git+https://github.com/rustdesk-org/rdev#f9b60b1dd0f3300a1b797d7a74c116683cd232c8" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", @@ -5444,7 +5471,7 @@ dependencies = [ [[package]] name = "rust-pulsectl" version = "0.2.12" -source = "git+https://github.com/open-trade/pulsectl#5e68f4c2b7c644fa321984688602d71e8ad0bba3" +source = "git+https://github.com/rustdesk-org/pulsectl#aa34dde499aa912a3abc5289cc0b547bd07dd6e2" dependencies = [ "libpulse-binding", ] @@ -5472,7 +5499,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.1" +version = "1.3.8" dependencies = [ "android-wakelock", "android_logger", @@ -5572,7 +5599,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.1" +version = "1.3.8" dependencies = [ "brotli", "dirs 5.0.1", @@ -5791,7 +5818,7 @@ dependencies = [ [[package]] name = "sciter-rs" version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" +source = "git+https://github.com/rustdesk-org/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" dependencies = [ "lazy_static", "libc", @@ -6437,7 +6464,7 @@ dependencies = [ [[package]] name = "tfc" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#78bb80a8e596e4c14ae57c8448f5fca75f91f2b0" dependencies = [ "anyhow", "core-graphics 0.23.2", @@ -8040,16 +8067,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zerocopy" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" -dependencies = [ - "byteorder", - "zerocopy-derive 0.6.6", -] - [[package]] name = "zerocopy" version = "0.7.34" @@ -8060,10 +8077,19 @@ dependencies = [ ] [[package]] -name = "zerocopy-derive" -version = "0.6.6" +name = "zerocopy" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive 0.8.14", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -8072,9 +8098,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", diff --git a/pkgs/by-name/ru/rustdesk/make-build-reproducible.patch b/pkgs/by-name/ru/rustdesk/make-build-reproducible.patch new file mode 100644 index 000000000000..15cde84b25f7 --- /dev/null +++ b/pkgs/by-name/ru/rustdesk/make-build-reproducible.patch @@ -0,0 +1,13 @@ +diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs +index 15ef310..f3ac940 100644 +--- a/libs/hbb_common/src/lib.rs ++++ b/libs/hbb_common/src/lib.rs +@@ -218,7 +218,7 @@ pub fn gen_version() { + } + } + // generate build date +- let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M")); ++ let build_date = "1970-01-01 00:00"; + file.write_all( + format!("#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{build_date}\";\n").as_bytes(), + ) diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index a1f5b2491020..fcb851e8748b 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -35,28 +35,32 @@ copyDesktopItems, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rustdesk"; - version = "1.3.1"; + version = "1.3.8"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; - rev = version; - hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; + tag = "${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-m1bFljZL8vNaugepVs8u1EWNpDLtxgSSZqKGQmgrmsA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; + "arboard-3.4.0" = "sha256-BJI3+Wz2xwnOfIz5O2NlPKKWfF8t/QrS8kxJK1RqbLw="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; + "cidre-0.4.0" = "sha256-FSpMC/kpTH10ncqRcJ+XJJ1yjgAc2U+mxLH9NTfLM3o="; "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; + "cpal-0.15.3" = "sha256-2Oo4igwjx9oZjikYEBfiVCD1Wl+D0LXgvVIHvYLQM+o="; + "default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; + "hwcodec-0.7.1" = "sha256-WxAa0DD8eVk6QyuIHuPDyFHGz8yj7I0qpRrJAc0iFpk="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -64,13 +68,13 @@ rustPlatform.buildRustPackage rec { "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; + "rdev-0.5.0-2" = "sha256-+1XsGhGcAz2YWENi+Ho614dhzjrwcY/gggq1YQ36fak="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; + "tfc-0.7.0" = "sha256-wJs+OhDZVO9iU+J7rLWIlV1VULtKyzizeXMbBCjRY90="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; @@ -80,6 +84,10 @@ rustPlatform.buildRustPackage rec { }; }; + patches = [ + ./make-build-reproducible.patch + ]; + postPatch = '' # Overwrite cargo.lock because the one in the upstream repo has duplicates entries. # It should probably be removed in the next rustdesk update (if they fix their cargoLock) @@ -89,10 +97,10 @@ rustPlatform.buildRustPackage rec { desktopItems = [ (makeDesktopItem { name = "rustdesk"; - exec = meta.mainProgram; + exec = finalAttrs.meta.mainProgram; icon = "rustdesk"; desktopName = "RustDesk"; - comment = meta.description; + comment = finalAttrs.meta.description; genericName = "Remote Desktop"; categories = [ "Network" ]; mimeTypes = [ "x-scheme-handler/rustdesk" ]; @@ -183,6 +191,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative"; homepage = "https://rustdesk.com"; + changelog = "https://github.com/rustdesk/rustdesk/releases/tag/${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ ocfox @@ -191,4 +200,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "rustdesk"; badPlatforms = lib.platforms.darwin; }; -} +}) From 9dd5d4cc68fdc7685d43bb56d3673448968b9d03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:37:31 +0100 Subject: [PATCH 063/105] python312Packages.llama-index: relax llama-index-multi-modal-llms-openai --- pkgs/development/python-modules/llama-index/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index e8bc753eb273..73cbb09fdcc3 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -26,6 +26,7 @@ buildPythonPackage { pythonRelaxDeps = [ "llama-index-core" + "llama-index-multi-modal-llms-openai" ]; dependencies = [ From ceb13880d32737269ab66f6e7d730db6d484e1a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 09:50:21 +0100 Subject: [PATCH 064/105] cero: disable tests --- pkgs/by-name/ce/cero/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ce/cero/package.nix b/pkgs/by-name/ce/cero/package.nix index 4784df65e839..77c88389a9c2 100644 --- a/pkgs/by-name/ce/cero/package.nix +++ b/pkgs/by-name/ce/cero/package.nix @@ -22,6 +22,9 @@ buildGoModule rec { "-w" ]; + # Tests are comparing output + doCheck = false; + meta = with lib; { description = "Scrape domain names from SSL certificates of arbitrary hosts"; homepage = "https://github.com/glebarez/cero"; From 31c96607aa5f164e8de231b37fe64bc3db520d0b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 5 Mar 2025 10:59:56 +0100 Subject: [PATCH 065/105] floorp: 11.23.1 -> 11.24.0 Security release. Release notes: https://blog.ablaze.one/4706/2025-03-21/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.23.1...v11.24.0 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 4eca2c37486a..de8a6b6470a3 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.23.1"; + packageVersion = "11.24.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.8.0"; + version = "128.9.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-oKLpxOXukoTksJag+o4JNwSeNQA0kYP2wUTOWFTCVqk="; + hash = "sha256-3Y34HUtxEqcEr2DC2frOdbCiq59oWcDLIFABl+N5K+Q="; }; extraConfigureFlags = [ From dbcda979079fc6e3ee812b82d8ce654d05f138b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Mar 2025 10:09:33 +0000 Subject: [PATCH 066/105] noto-fonts: 2025.02.01 -> 2025.03.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 9c21fd58744d..276362d5c2cd 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.02.01"; + version = "2025.03.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-IXQmHBG7yvngifLTVLwkL+10lfqofgERtNmgZSvgrt8="; + hash = "sha256-49p4LFGywuA6zNZEw0VmtykmDUBtRkzOKYAb4sG4fK4="; }; outputs = [ From 4f433e90f2888c337f358859962d993533a55717 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 11:21:37 +0100 Subject: [PATCH 067/105] python313Packages.pyfnip: add standard-telnetlib for later Python releases --- pkgs/development/python-modules/pyfnip/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix index fd829efbbd83..edb028858f4c 100644 --- a/pkgs/development/python-modules/pyfnip/default.nix +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, requests, + standard-telnetlib, }: buildPythonPackage rec { @@ -15,7 +17,9 @@ buildPythonPackage rec { sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ] ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; # Project has no tests doCheck = false; From 2cbf1225ed56a5dfd78d859c8c394095fe44638d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 11:23:15 +0100 Subject: [PATCH 068/105] python313Packages.pyfnip: refactor --- pkgs/development/python-modules/pyfnip/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix index edb028858f4c..13e5e2bac940 100644 --- a/pkgs/development/python-modules/pyfnip/default.nix +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -4,31 +4,35 @@ fetchPypi, pythonAtLeast, requests, + setuptools, standard-telnetlib, }: buildPythonPackage rec { pname = "pyfnip"; version = "0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests ] ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pyfnip" ]; meta = with lib; { description = "Python client to get fido account data"; homepage = "https://github.com/juhaniemi/pyfnip"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 175f6007d1764dc54c801ed364238509d0f03763 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 11:24:07 +0100 Subject: [PATCH 069/105] python313Packages.pyfnip: switch to SRI hash --- pkgs/development/python-modules/pyfnip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix index 13e5e2bac940..919ddea552a5 100644 --- a/pkgs/development/python-modules/pyfnip/default.nix +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0q52rb0kshgbligxjqrwz0v7kgqjbv6jahdb66ndxy93mfr0ig3a"; + hash = "sha256-arwIsqsj+d6sMatBJc1eEr95Nvg8Y9lfpOtBPcHKomA="; }; build-system = [ setuptools ]; From 00b3325cc45a0c658b51df363112f33ddfb34af2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Mar 2025 11:28:27 +0100 Subject: [PATCH 070/105] python313Packages.aiohttp-middlewares: relax async-timeout --- pkgs/development/python-modules/aiohttp-middlewares/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp-middlewares/default.nix b/pkgs/development/python-modules/aiohttp-middlewares/default.nix index f762840561a2..b31deb2b3c0d 100644 --- a/pkgs/development/python-modules/aiohttp-middlewares/default.nix +++ b/pkgs/development/python-modules/aiohttp-middlewares/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { hash = "sha256-jUH1XhkytRwR76wUTsGQGu6m8s+SZ/GO114Lz9atwE8="; }; + pythonRelaxDeps = [ "async-timeout" ]; + postPatch = '' sed -i "/addopts/d" pyproject.toml ''; From 75507ec6f8c49677e4eafa1185f993fdb85f812a Mon Sep 17 00:00:00 2001 From: Leon van Kammen Date: Wed, 5 Mar 2025 11:51:21 +0100 Subject: [PATCH 071/105] xrsh: init at 0-unstable-2025-02-28 Co-authored-by: OPNA2608 --- pkgs/by-name/xr/xrsh/package.nix | 65 ++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/xr/xrsh/package.nix diff --git a/pkgs/by-name/xr/xrsh/package.nix b/pkgs/by-name/xr/xrsh/package.nix new file mode 100644 index 000000000000..35c75d034557 --- /dev/null +++ b/pkgs/by-name/xr/xrsh/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitea, + makeWrapper, + unstableGitUpdater, + writeShellApplication, + python3Packages, +}: + +stdenv.mkDerivation { + pname = "xrsh"; + version = "0-unstable-2025-02-28"; + + src = fetchFromGitea { + fetchSubmodules = true; + domain = "codeberg.org"; + owner = "xrsh"; + repo = "xrsh"; + rev = "5d6e9f4615e57f01ba0859000d90f4f162a06653"; + hash = "sha256-9I6c1GkO7XQZ242ZBCxPiPxkZaYYi/UDLoUvS6nE+M0="; + }; + + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = + let + launcher = writeShellApplication { + name = "xrsh"; + runtimeInputs = [ python3Packages.twisted ]; + text = '' + XRSH_ROOT="''${1}" + XRSH_PORT="''${XRSH_PORT-8080}" + + exec twistd -n web --listen "tcp:''${XRSH_PORT}" --path "''${XRSH_ROOT}" + ''; + }; + in + '' + runHook preInstall + + mkdir -p $out/{bin,share/xrsh} + cp -r -t $out/share/xrsh index.html src xrsh.js xrsh.ico xrsh.svg + + makeWrapper ${lib.getExe launcher} $out/bin/xrsh \ + --add-flags "${placeholder "out"}/share/xrsh/src" + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + mainProgram = "xrsh"; + description = "Terminal for WebXR to run REPLs & linux ISO"; + license = lib.licenses.gpl3Plus; + homepage = "https://xrsh.isvery.ninja"; + maintainers = with lib.maintainers; [ coderofsalvation ]; + platforms = lib.platforms.all; + }; +} From 3425cada706281692faf8016827eb9579fe1e027 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 5 Mar 2025 12:00:22 +0100 Subject: [PATCH 072/105] open-webui: 0.5.18 -> 0.5.19 diff: https://github.com/open-webui/open-webui/compare/v0.5.18..v0.5.19 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.5.19 --- pkgs/by-name/op/open-webui/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index cf76a0974036..79c691163b3d 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -8,13 +8,13 @@ }: let pname = "open-webui"; - version = "0.5.18"; + version = "0.5.19"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-SFw5bCzMSBuzIzZmhA+ylXXkouZ+OSsMBfc7QG7OSLU="; + hash = "sha256-RFU8tzi0nT7QOc8C3SAguY73xzuOvUQTea1V2vT5e/o="; }; frontend = buildNpmPackage rec { @@ -22,13 +22,15 @@ let # the backend for run-on-client-browser python execution # must match lock file in open-webui + # TODO: should we automate this? + # TODO: with JQ? "jq -r '.packages["node_modules/pyodide"].version' package-lock.json" pyodideVersion = "0.27.2"; pyodide = fetchurl { hash = "sha256-sZ47IxPiL1e12rmpH3Zv2v6L2+1tz/kIrT4uYbng+Ec="; url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-rEV68SizR7NyYsRzlndg/ulvr8BeiDq3MpiBmaCUn2M="; + npmDepsHash = "sha256-0Ldr780V0AEupLMkxaINe+og6tDDco37vlizFyK8ryg="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -102,6 +104,7 @@ python312.pkgs.buildPythonApplication rec { docx2txt duckduckgo-search einops + elasticsearch extract-msg fake-useragent fastapi From 0a565b4f20d1235fc148609199002f9d23ba453b Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Wed, 5 Mar 2025 11:09:47 +0000 Subject: [PATCH 073/105] rattler-build: 0.36.0 -> 0.37.0 --- 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 684294998ed4..892a7f0ef074 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "rattler-build"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${version}"; - hash = "sha256-q45VS5xGRmDoxYOOO8xt8iJg6zirriekXFjNAkPiqIo="; + hash = "sha256-tPhgijSjs1RlrKY83C/Gb0qyoUjR+Ivmgm8ge5+T9Rc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/Hfkb1teM/CYWizK1/1gIELuaUyTXWZS3YrQWuJzuqQ="; + cargoHash = "sha256-GIfHFbZtNd+WuAhCcwdPYpRSKluFuHLlJLe9hsZA2ek="; doCheck = false; # test requires network access From c388860977bef6f3cd52d89fadd9e0823162d732 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Wed, 5 Mar 2025 06:05:02 -0500 Subject: [PATCH 074/105] nixos-rebuild-ng: only propagate nix's `bin` output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prior to this the `dev` output was also propagated, when it's not actually used ```console $ nix-store --query --references /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 /nix/store/11ciq72n4fdv8rw6wgjgasfv4mjs1jrw-bash-5.2p37 /nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9 /nix/store/xxh7mivp64xmzyw5wir2c2xbhy6cjzjd-nix-2.24.12 /nix/store/8jai5cxdfzgj9nsz4i26fh9sx5zsgilz-nix-2.24.12-dev /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 ``` ```console $ nix why-depends --all --precise /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 /nix/store/8jai5cxdfzgj9nsz4i26fh9sx5zsgilz-nix-2.24.12-dev /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 └───nix-support/propagated-build-inputs: …/nix/store/8jai5cxdfzgj9nsz4i26fh9sx5zsgilz-nix-2.24.12-dev /nix/store/26yi… → /nix/store/8jai5cxdfzgj9nsz4i26fh9sx5zsgilz-nix-2.24.12-dev ``` ```console $ nvd diff /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 /nix/store/fqm81bhggzkqh7033np2z0jr8c0qrpbw-nixos-rebuild-ng-0.0.0 <<< /nix/store/ppw0flx4dbksxsnr84hq1gz4k0s0hpcq-nixos-rebuild-ng-0.0.0 >>> /nix/store/fqm81bhggzkqh7033np2z0jr8c0qrpbw-nixos-rebuild-ng-0.0.0 Version changes: [C.] #1 boehm-gc 8.2.8, 8.2.8-dev -> 8.2.8 [C*] #2 nix 2.24.12, 2.24.12-dev, 2.24.12-man -> 2.24.12, 2.24.12-man Removed packages: [R.] #1 nlohmann_json 3.11.3 Closure size: 66 -> 63 (1 paths added, 4 paths removed, delta -3, disk usage -1.9MiB). ``` --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 5f75a21e2402..7e1841ceb615 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { # would silently downgrade the whole system to be i686 NixOS on the # next reboot. # The binary will be included in the wrapper for Python. - nix + (lib.getBin nix) ]; postPatch = '' From c14ca4ae7f9468ae64bbe57546708830ab7a0ab9 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Wed, 26 Feb 2025 20:41:10 +0000 Subject: [PATCH 075/105] tytools: 0.9.8 -> 0.9.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch-level version bump in upstream includes: - change to a new [mono]repo, - change dep from qt5 to qt6, - change from cmake to a custom build system. It's quite a patch-level version bump. Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> Co-authored-by: Pol Dellaiera --- pkgs/development/embedded/tytools/default.nix | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix index 76ff17c0b6fe..0d18346cf53a 100644 --- a/pkgs/development/embedded/tytools/default.nix +++ b/pkgs/development/embedded/tytools/default.nix @@ -5,34 +5,58 @@ cmake, pkg-config, wrapQtAppsHook, - qtbase, + qt6, }: stdenv.mkDerivation rec { pname = "tytools"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "Koromix"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA="; + repo = "rygel"; + tag = "tytools/${version}"; + hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA="; }; nativeBuildInputs = [ - cmake pkg-config - wrapQtAppsHook - ]; - buildInputs = [ - qtbase + qt6.wrapQtAppsHook ]; - meta = with lib; { + buildInputs = [ + qt6.qtbase + ]; + + buildPhase = '' + runHook preBuild + + ./bootstrap.sh + ./felix -p Fast tyuploader + ./felix -p Fast tycmd + ./felix -p Fast tycommander + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/applications + cp bin/Fast/tyuploader $out/bin/ + cp bin/Fast/tycmd $out/bin/ + cp bin/Fast/tycommander $out/bin/ + cp src/tytools/tycommander/tycommander_linux.desktop $out/share/applications/tycommander.desktop + cp src/tytools/tyuploader/tyuploader_linux.desktop $out/share/applications/tyuploader.desktop + + runHook postInstall + ''; + + meta = { description = "Collection of tools to manage Teensy boards"; homepage = "https://koromix.dev/tytools"; - license = licenses.unlicense; - platforms = platforms.unix; - maintainers = with maintainers; [ ahuzik ]; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ahuzik ]; }; } From c4568961089f5d3448a4348612ae5377e4883a90 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Sat, 14 Dec 2024 22:47:08 +0100 Subject: [PATCH 076/105] nixos/part-db: init module Co-authored-by: Sandro <7258858+supersandro2000@users.noreply.github.com> Co-authored-by: Tert0 <62036464+tert0@users.noreply.github.com> --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/part-db.nix | 247 ++++++++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 nixos/modules/services/web-apps/part-db.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6408c97d222f..06b7abc8fc0f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1493,6 +1493,7 @@ ./services/web-apps/gotify-server.nix ./services/web-apps/gotosocial.nix ./services/web-apps/grocy.nix + ./services/web-apps/part-db.nix ./services/web-apps/pixelfed.nix ./services/web-apps/goatcounter.nix ./services/web-apps/guacamole-client.nix diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix new file mode 100644 index 000000000000..c165969aa620 --- /dev/null +++ b/nixos/modules/services/web-apps/part-db.nix @@ -0,0 +1,247 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.services.part-db; + pkg = cfg.package; + + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + types + mkIf + ; +in +{ + meta.maintainers = with lib.maintainers; [ felbinger ]; + + options.services.part-db = { + enable = mkEnableOption "PartDB"; + + package = mkPackageOption pkgs "part-db" { }; + + phpPackage = mkPackageOption pkgs "php" { } // { + apply = + pkg: + pkg.override { + extraConfig = '' + memory_limit = 256M; + ''; + }; + }; + + enableNginx = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable nginx or not. If enabled, an nginx virtual host will + be created for access to part-db. If not enabled, then you may use + `''${config.services.part-db.package}/public` as your document root in + whichever webserver you wish to setup. + ''; + }; + + enablePostgresql = mkOption { + type = types.bool; + default = true; + description = '' + Whether to configure the postgresql database for part-db. If enabled, + a database and user will be created for part-db. + ''; + }; + + virtualHost = mkOption { + type = types.str; + default = "localhost"; + description = '' + The virtualHost at which you wish part-db to be served. + ''; + }; + + poolConfig = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + lib.types.bool + ] + ); + default = { }; + defaultText = '' + { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + } + ''; + description = '' + Options for the PartDB PHP pool. See the documentation on php-fpm.conf + for details on configuration directives. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for part-db configuration. Refer to + for + details on supported values. All