diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5b45b5e00e28..39262cf203c9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25677,6 +25677,11 @@ github = "skohtv"; githubId = 101289702; }; + skonotopov = { + name = "Sergey Konotopov"; + github = "kinkou"; + githubId = 931329; + }; skovati = { github = "skovati"; githubId = 49844593; @@ -29334,6 +29339,11 @@ githubId = 115360611; name = "Wölfchen"; }; + w1lldu = { + name = "William Du"; + github = "w1lldu"; + githubId = 70287641; + }; waelwindows = { email = "waelwindows9922@gmail.com"; github = "Waelwindows"; @@ -29632,6 +29642,12 @@ githubId = 5185341; name = "Will Cohen"; }; + WillemToorenburgh = { + email = "willemtoorenburgh@gmail.com"; + github = "willemtoorenburgh"; + githubId = 50425141; + name = "Willem Toorenburgh"; + }; willfish = { email = "willfish@pescado.mozmail.com"; github = "willfish"; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 60f69a7d3a07..9ab019171b4c 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -337,11 +337,7 @@ in done # Move the new temporary /etc mount underneath the current /etc mount. - # - # This should eventually use util-linux to perform this move beneath, - # however, this functionality is not yet in util-linux. See this - # tracking issue: https://github.com/util-linux/util-linux/issues/2604 - ${pkgs.move-mount-beneath}/bin/move-mount --move --beneath "$tmpEtcMount" /etc + mount --move --beneath "$tmpEtcMount" /etc # Unmount the top /etc mount to atomically reveal the new mount. umount --lazy --recursive /etc diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/applications/emulators/libretro/cores/atari800.nix index f70bf7cc8411..33e633802a55 100644 --- a/pkgs/applications/emulators/libretro/cores/atari800.nix +++ b/pkgs/applications/emulators/libretro/cores/atari800.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "atari800"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-11"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-atari800"; - rev = "7f3456f16109c34915d0bad7393b6c4df66c3850"; - hash = "sha256-7C/0i7LUGHY8bz5wp9ut+5EtvLrAUasn0xQzslQQ1fM="; + rev = "1851228de23b47cb74fbc8ea589a1c7c5e02ea98"; + hash = "sha256-s7M7yezPWzRokrxpoo8JbgOzi5R18yOQNgmHkTQR7S4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index ff7bf7afadd5..5d05785ecd3a 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2026-05-09"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "c699953afa01bc3f179edbcb14c4cfbeee6107a2"; - hash = "sha256-s009GuPnsufDT70dBmhwfZmYjdf7pYO13FjycYvUF4c="; + rev = "c194d8c7d9cef77b653f688f1293746aa71a928e"; + hash = "sha256-lIvVk0a+lwBF+BtX2KT2MwOUguTGm/pKi8s9IbZqwsU="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 0daaae4873d5..5cff6401bbe1 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2026-05-10"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "4be8a484665fb5684ccb780ed2165018a679c622"; - hash = "sha256-kjQcKdxUMdUc+70OPzEtDeSKy/m2e0FyPDa4XR3nHmM="; + rev = "3e60beb69e557287c704dc310f42286258d68a2b"; + hash = "sha256-Ew3YjR92NnbvGoNFhSZSNNeSrMMWEeUAfnJSp6/tnIY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3a682f64ad9c..3d8e67def081 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -544,13 +544,13 @@ "vendorHash": null }, "hashicorp_cloudinit": { - "hash": "sha256-xDHp2bG0/T4pE3j8L4zTVnaQ9te5MuAbiGmopFedOpk=", + "hash": "sha256-qSPGHjxaeYYhWDerzOf4bh7JKzuX6Cb1TBrERzMlfaI=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.7", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw=" + "vendorHash": "sha256-z/47aZ1u0t6n8FMvdSxzE7tUJe1KHNXhd+UjRTjtaBM=" }, "hashicorp_consul": { "hash": "sha256-iYt4TxyVQIYjrOgVS+olDcDgTddaVmYVy8M/Y9IkTpQ=", @@ -580,13 +580,13 @@ "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" }, "hashicorp_google": { - "hash": "sha256-6cvRvVQmKRi4kyNAo/UAGN00bO+uCJYvf661xYW/QCQ=", + "hash": "sha256-EXE9etM8gPdrWriF2HJmD5QZY9tDU8dgsusqnvupnKI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.31.0", + "rev": "v7.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68=" + "vendorHash": "sha256-xCWhCYD+YKyEB55uMm2p+eCtSlg65nSfGFMlX0qIiMQ=" }, "hashicorp_google-beta": { "hash": "sha256-/HxUOhDATteiUDIeA8zvGI9xQ5rOWJAhLN9PLHiBFfI=", @@ -1130,11 +1130,11 @@ "vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc=" }, "rancher_rancher2": { - "hash": "sha256-T7nX+sD3FOqXgoNzzGJfIKvMvJ5hkYoHCyzR5Sm08IE=", + "hash": "sha256-OFLEDwDDD02FKMldpkRxbj2gRQzhmVb2+3dG3Hq2AG4=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v14.1.0", + "rev": "v14.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, diff --git a/pkgs/by-name/as/asymptote/package.nix b/pkgs/by-name/as/asymptote/package.nix index 58936ed64bb1..9ad6f838736d 100644 --- a/pkgs/by-name/as/asymptote/package.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -33,7 +33,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.10"; + version = "3.11"; pname = "asymptote"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-0nvo/vJQ1dwzhgK/cj4dCejNHoXBmatMgHQwif2M0sc="; + hash = "sha256-U36fImIb+E8J7g1E3EVcTqkboZODDx12JKB9RxDX59E="; }; # override with TeX Live containers to avoid building sty, docs from source diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index b9a85f34bfae..8a544e792380 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -5,7 +5,7 @@ pnpm_10, fetchPnpmDeps, pnpmConfigHook, - nodejs, + nodejs-slim, makeBinaryWrapper, shellcheck, versionCheckHook, @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs + nodejs-slim pnpmConfigHook pnpm_10 makeBinaryWrapper @@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r {node_modules,server} $out/lib/bash-language-server/ # Create the executable, based upon what happens in npmHooks.npmInstallHook - makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ + makeWrapper ${lib.getExe nodejs-slim} $out/bin/bash-language-server \ --suffix PATH : ${lib.makeBinPath [ shellcheck ]} \ --inherit-argv0 \ --add-flags $out/lib/bash-language-server/server/out/cli.js diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index 8ff85d0e2577..ad8674fac8f0 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule (finalAttrs: { pname = "berglas"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "berglas"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4Y53psmHpe1JmTKfvOS5f0VHCp/GuC4kDWiHWl5ty3Q="; + sha256 = "sha256-p+HWZCyFouy+FycCPesKLV7UIeMogz9oKX+mynzBTKw"; }; - vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o="; + vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o"; ldflags = [ "-s" @@ -52,7 +52,12 @@ buildGoModule (finalAttrs: { "-X github.com/GoogleCloudPlatform/berglas/v2/internal/version.version=${finalAttrs.version}" ]; - postPatch = skipTestsCommand; + postPatch = skipTestsCommand + '' + substituteInPlace go.mod \ + --replace-fail \ + "go 1.26.3" \ + "go 1.26" + ''; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix index 4b46277fb7ae..c40a2e9ce116 100644 --- a/pkgs/by-name/bl/blightmud/package.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -11,16 +11,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blightmud"; - version = "5.3.1"; + version = "5.6.1"; src = fetchFromGitHub { owner = "blightmud"; repo = "blightmud"; - rev = "v${finalAttrs.version}"; - hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fwWyQq6rb8qSR7aiQagOodkQRqanUJA2uH5I/Z1XfAA="; }; - cargoHash = "sha256-7cMd7pNWGV5DOSCLRW5fP3L1VnDTEsZZjhVz1AQLEXM="; + cargoHash = "sha256-4JArgwNFjnGwyEnWdjZkUlahloQu+C8qF9QyYo8s1jQ="; + + postPatch = '' + substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' + ''; buildFeatures = lib.optional withTTS "tts"; @@ -39,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_CFLAGS_COMPILE = "-std=gnu17"; }; + __darwinAllowLocalNetworking = true; + checkFlags = let # Most of Blightmud's unit tests pass without trouble in the isolated @@ -58,6 +64,13 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_tls_init_verify_err" "test_tls_init_no_verify" "test_tls_init_verify" + "test_exec" + "test_line_tags" + "test_lua_api" + "test_suggest" + "test_mccp2_decompression" + "test_mccp2_incremental" + "test_mccp2_negotiation" ]; in builtins.map (x: "--skip=" + x) skipList; diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index 7811875b3f81..2e329eeffb43 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -11,18 +11,18 @@ perl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bws"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "sdk"; - rev = "bws-v${version}"; - hash = "sha256-acS4yKppvIBiwBMoa5Ero4G9mUf8OLG/TbrZOolAwuc="; + tag = "bws-v${finalAttrs.version}"; + hash = "sha256-NjnLoa4UjPzTejjEwc5LIrHqeqncXoMICJM2eUesoIM="; }; - cargoHash = "sha256-SJn00C7vkNoghdVPUszep40RSL8fD+/ELUeuf9GBD7c="; + cargoHash = "sha256-lfnCUWf9MM1Yynxza7Fz1qxNyDbPNMOcbVHkvZx32bk="; nativeBuildInputs = [ installShellFiles @@ -55,18 +55,17 @@ rustPlatform.buildRustPackage rec { ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd bws \ - --bash <($out/bin/bws completions bash) \ - --fish <($out/bin/bws completions fish) \ - --zsh <($out/bin/bws completions zsh) + for shell in bash fish zsh; do + installShellCompletion --cmd bws --"$shell" <($out/bin/bws completions "$shell") + done ''; meta = { - changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/crates/bws/CHANGELOG.md"; description = "Bitwarden Secrets Manager CLI"; homepage = "https://bitwarden.com/help/secrets-manager-cli/"; + changelog = "https://github.com/bitwarden/sdk-sm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.unfree; # BITWARDEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "bws"; - maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 97d633ad6797..9df908763dcd 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.6.0"; + version = "7.0.4"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-IJ7KUYUdLkaE8XP53SjSORzQYR7HiNoNgafktutnHzo="; + hash = "sha256-ntI2jWV1kS8ojbkhLaZhxkjK5ZNYOp9MIbzHpnCyEu0="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-PZHynhVBqMqpUD/COro3F3nvaolSC3Eq9z/tUdXpQoA="; + cargoHash = "sha256-tkPMlJqkQzFYItPPYW5kqLiymlNZPkwj0j/2Zj4Ysc8="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 329d10288a25..9574d4b7dcba 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -10,26 +10,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-BTYNvK4UGWL8skJDjFkyBsEjvoUxaxHAlEKtr7gsyhs="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-E2YeEnyAjbGXe1lpcpZnb/NBWNOoQYRkCfuokvkQsaI="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-C+JfqTdhDGTxz3rUWH0a+TdUvQq26wAPQ1qN/U2C/0o="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-WM3Ucu5ia9rlEgXtfNYea6B7ccgmpFJm/p4JpQje+Vs="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-TI74gxQ1VgrSmMvUXXwTQv6ixlALnarYul9DRrU2Arc="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-0/CJxz14JgrCAwhbXeSHXYwnpvh4AnbjUHOUzNxxBJw="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-b1WL8URL+xtVjxOtJI1W3gAWh3i3cIN98f3aeDX5JlM="; + url = "https://downloads.cursor.com/lab/2026.05.16-0338208/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-xVwbcStx3UW89PBCE4zfAWNUSvs4NlneLPgY8yJDLag="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-05-07"; + version = "0-unstable-2026-05-16"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix index 28155d4376bd..2f8b19f7b25d 100644 --- a/pkgs/by-name/em/emboss/package.nix +++ b/pkgs/by-name/em/emboss/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; + env = { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + buildInputs = [ readline perl diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 28b993b717d9..3bf1b9b9fb47 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2026-05-14"; + version = "2026-05-16"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-1Dg2SNdg6gQyacSC6a1Nr8y3VnV8HcQ2Nu6eiYEh3/s="; + hash = "sha256-7cjqHHflxFfWDx9Bfe2+nX549blfZG0rLZDB3li8pkA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ff/ffmpeg-livepeer/package.nix b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix index 9cbd88f92ae4..2545fd2e28f3 100644 --- a/pkgs/by-name/ff/ffmpeg-livepeer/package.nix +++ b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix @@ -17,6 +17,12 @@ (old: { pname = "ffmpeg-livepeer"; + postPatch = (old.postPatch or "") + '' + substituteInPlace libavcodec/tableprint_vlc.h \ + --replace-fail 'define av_mallocz(s) NULL' 'define av_mallocz(s) NULL + #define av_malloc(s) NULL' + ''; + meta = { inherit (old.meta) license diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index c9e1947cf4a3..fed11620627f 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "foundry"; - version = "1.7.0"; + version = "1.7.1"; __structuredAttrs = true; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "foundry-rs"; repo = "foundry"; tag = "v${finalAttrs.version}"; - hash = "sha256-UCaBo4hMStmh79UiyYu7vEO7UtrvwJshe4PTMkqZV0w="; + hash = "sha256-pS0V7AbSVowKXWfmk4TM9HyEVO1GL+FCZgdmpCfGcmM="; }; - cargoHash = "sha256-iAWUEVgOgn2Zw9fINxyH9Bynh+flzCY40YFGoVLgG8k="; + cargoHash = "sha256-Ka751S1YhUQJCJYqD8bgjSm9IZPaBNg50DNDhmROQzs="; strictDeps = true; diff --git a/pkgs/by-name/fu/furmark/package.nix b/pkgs/by-name/fu/furmark/package.nix index c4a4f2b18e62..ef5e9acf6540 100644 --- a/pkgs/by-name/fu/furmark/package.nix +++ b/pkgs/by-name/fu/furmark/package.nix @@ -9,6 +9,7 @@ libxcrypt-legacy, makeDesktopItem, makeWrapper, + p7zip, stdenv, testers, vulkan-loader, @@ -18,25 +19,31 @@ let description = "OpenGL and Vulkan Benchmark and Stress Test"; versions = { - "x86_64-linux" = "2.3.0.0"; - "aarch64-linux" = "2.3.0.0"; + "x86_64-linux" = "2.10.2"; + "aarch64-linux" = "2.10.1"; "i686-linux" = "2.0.16"; }; sources = { "x86_64-linux" = { - url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.x86_64-linux}_linux64.zip"; - hash = "sha256-9xwnOo8gh6XlX2uTwvEorXsx9FafaeCyCPPPJLJGeuE="; + url = "https://gpumagick.com/downloads/files/2025/fm2/2_10_dbc69dd0a08da5ff09169a4fc759ddaa/FurMark_${versions.x86_64-linux}_linux64.7z"; + hash = "sha256-s9AEj9r7kBhPGPU365HgxS9tEyrm7UjLtoxD21pCrts="; }; "aarch64-linux" = { - url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.x86_64-linux}_rpi64.zip"; - hash = "sha256-az4prQbg9I+6rt2y1OTy3t21/VHyZS++57r4Ahe3fcQ="; + url = "https://gpumagick.com/downloads/files/2025/fm2/2_10_dbc69dd0a08da5ff09169a4fc759ddaa/FurMark_${versions.aarch64-linux}_arm64.7z"; + hash = "sha256-XQuK6UgZOjwqpENkHVYsoiG9zyZAbNjR+65hj9dvAY8="; }; "i686-linux" = { url = "https://gpumagick.com/downloads/files/2024/furmark2/FurMark_${versions.i686-linux}_linux32.zip"; hash = "sha256-yXd90FgL3WbTga5x0mXT40BonA2NQtqLzRVzn4s4lLc="; }; }; + + is7z = + (stdenv.hostPlatform.system == "x86_64-linux") || (stdenv.hostPlatform.system == "aarch64-linux"); + + linkLogs = + (stdenv.hostPlatform.system == "x86_64-linux") || (stdenv.hostPlatform.system == "aarch64-linux"); in stdenv.mkDerivation (finalAttrs: { pname = "furmark"; @@ -44,12 +51,13 @@ stdenv.mkDerivation (finalAttrs: { versions.${stdenv.hostPlatform.system} or (throw "Furmark is not available on ${stdenv.hostPlatform.system}"); - src = fetchzip sources.${stdenv.hostPlatform.system}; + src = fetchurl sources.${stdenv.hostPlatform.system}; nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper + p7zip ]; buildInputs = [ @@ -58,12 +66,29 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ]; + unpackPhase = '' + runHook preUnpack + 7z x $src + '' + + lib.optionalString is7z '' + mv FurMark_linux64/* . + rmdir FurMark_linux64 + '' + + '' + runHook postUnpack + ''; + installPhase = '' runHook preInstall mkdir -p $out/share/furmark cp -rp * $out/share/furmark - + '' + + lib.optionalString linkLogs '' + ln -sf /tmp/furmark-geexlab.log $out/share/furmark/_geexlab_log.txt + ln -sf /tmp/furmark-furmark.log $out/share/furmark/_furmark_log.txt + '' + + '' mkdir -p $out/bin for i in $(find $out/share/furmark -maxdepth 1 -type f -executable); do ln -s "$i" "$out/bin/$(basename "$i")" @@ -103,7 +128,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.geeks3d.com/furmark/v2/"; license = lib.licenses.unfree; mainProgram = "FurMark_GUI"; - maintainers = with lib.maintainers; [ surfaceflinger ]; + maintainers = with lib.maintainers; [ + surfaceflinger + w1lldu + ]; platforms = [ "aarch64-linux" "i686-linux" diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix index d09a520137e7..014f8a9c397c 100644 --- a/pkgs/by-name/ge/geph/package.nix +++ b/pkgs/by-name/ge/geph/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, makeBinaryWrapper, @@ -23,18 +24,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "geph5"; - version = "0.2.99"; + version = "0.2.102"; src = fetchFromGitHub { owner = "geph-official"; repo = "geph5"; rev = "geph5-client-v${finalAttrs.version}"; - hash = "sha256-AWdVFpIP+LIZz6zqcx0GJxDs4ZWGR6JgpHDVAg0mHaU="; + hash = "sha256-E3msw4yG5RxKapHBvhGEVlsJiLgysCgjAtOrJ8fGES0="; }; - cargoHash = "sha256-zFCq29vtsbwbo6JBRdX+CziKZVoxwpt6y3BYVlIqZfc="; + cargoHash = "sha256-w+1JLxvflb8PQqNi5MnxoEcWctuaC6Ux3oNYJzB6oaE="; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace binaries/geph5-client/src/vpn/*.sh \ --replace-fail 'PATH=' 'PATH=${binPath}:' @@ -43,6 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/bin/env ' '${lib.getExe' coreutils "env"} ' ''; + postInstall = '' + rm -rf "$out/lib" + ''; + nativeBuildInputs = [ makeBinaryWrapper pkg-config @@ -61,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "aws_lambda" - "windivert" + # "windivert" # Only on Windows ]; checkFlags = [ @@ -74,9 +79,14 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=tests::test_blind_sign" "--skip=tests::test_generate_secret_key" "--skip=tests::ping_pong" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Cannot connect to the internet within the macOS sandbox + "--skip=tests::test_successful_ping" + "--skip=tests::test_failed_ping" ]; - postFixup = '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for program in $out/bin/*; do wrapProgram "$program" --prefix PATH : ${binPath} done @@ -94,7 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/geph-official/geph5"; changelog = "https://github.com/geph-official/geph5/releases/tag/geph5-client-v${finalAttrs.version}"; mainProgram = "geph5-client"; - platforms = lib.platforms.unix; + platforms = lib.platforms.linux ++ lib.platforms.darwin; # VPN mode is not yet available on macOS. license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ penalty1083 diff --git a/pkgs/by-name/ge/gephgui-wry/package.nix b/pkgs/by-name/ge/gephgui-wry/package.nix index d141ff8be816..0e058bac102f 100644 --- a/pkgs/by-name/ge/gephgui-wry/package.nix +++ b/pkgs/by-name/ge/gephgui-wry/package.nix @@ -3,6 +3,7 @@ rustPlatform, webkitgtk_4_1, pkg-config, + openssl, buildNpmPackage, makeDesktopItem, fetchFromGitHub, @@ -12,7 +13,6 @@ glib, copyDesktopItems, wrapGAppsHook4, - nodejs_22, }: let pac-cmd = stdenv.mkDerivation { @@ -28,11 +28,18 @@ let postPatch = '' rm binaries/*/pac - substituteInPlace Makefile --replace-fail 'uname -p' 'uname -m' + substituteInPlace Makefile \ + --replace-fail 'uname -p' 'uname -m' \ + --replace-fail 'ifneq ($(filter arm%,$(UNAME_P)),)' 'ifneq ($(filter aarch64 arm%,$(UNAME_P)),)' ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; + + preBuild = '' + mkdir -p binaries/linux_arm + ''; + installPhase = '' runHook preInstall @@ -52,13 +59,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gephgui-wry"; - version = "5.5.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; tag = "v${finalAttrs.version}"; - hash = "sha256-NxtE26GPG2EvgtMa6eEOZmOcqu4yYr3zioF1CmrxLRk="; + hash = "sha256-f6IC9dRQ3CW3P0TRuOe1mmG3jOAvyMPBpylHJ82AUpM="; fetchSubmodules = true; }; @@ -67,10 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui"; - npmDepsHash = "sha256-dGzmdvzKp/JHCgDf3NJb0oolgW4Y/spagzpeVpMF28w="; - - # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535 - nodejs = nodejs_22; + npmDepsHash = "sha256-GFeHowIv+TiejSNK6kAGAgYcwc2DHu3c4UBEeTScIPk="; installPhase = '' runHook preInstall @@ -83,32 +87,44 @@ rustPlatform.buildRustPackage (finalAttrs: { }; sourceRoot = "${finalAttrs.src.name}/gephgui-wry"; - cargoHash = "sha256-Dh1WuxU1rRDNu2cF9GCo1CIiph1sLc5j0GSPb7b7kJA="; + cargoHash = "sha256-Ekl03CvM32E3Q86YZL8eBFYAzDcpAXq8yVi2Fg3t5yc="; nativeBuildInputs = [ pkg-config perl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems wrapGAppsHook4 ]; - buildInputs = [ webkitgtk_4_1 ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; preBuild = '' cp -r ${finalAttrs.gephgui}/ gephgui/dist/ ''; - postInstall = '' - install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png - ''; + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + cp -a ../macos/template.app "$out/Applications/Geph.app" + chmod -R u+w "$out/Applications/Geph.app" + install -Dm755 "$out/bin/gephgui-wry" "$out/Applications/Geph.app/Contents/MacOS/bin/gephgui-wry" + ln -s "$out/Applications/Geph.app/Contents/MacOS/entrypoint" "$out/bin/Geph" + ''; - preFixup = '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=( --suffix PATH : ${lib.makeBinPath [ pac-cmd ]} ) ''; - desktopItems = [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "Geph"; desktopName = "Geph"; @@ -133,8 +149,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; homepage = "https://github.com/geph-official/gephgui-wry"; - mainProgram = "gephgui-wry"; - platforms = lib.platforms.linux; + mainProgram = if stdenv.hostPlatform.isDarwin then "Geph" else "gephgui-wry"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ penalty1083 diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index b1fe5902ade5..273b2f9123a7 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "go-sendxmpp"; - version = "0.15.6"; + version = "0.15.8"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "mdosch"; repo = "go-sendxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-HoK13rhsH5OyRHLuuCC+zGpcrK1591Zqy0hUinHbhcE="; + hash = "sha256-9p9/3kMW25lfWDdN1EExomVRaNXEytJ6/V8MUA3rABQ="; }; - vendorHash = "sha256-Zy3oewVeoKEIOmh2lxyjBIHNCJX/YtWxuGOk6IM9CXs="; + vendorHash = "sha256-/38b5tMB7ZHMl16ZzB8UJvWfysa1MD9OLRyqX5X0ACY="; passthru = { tests = { inherit (nixosTests) ejabberd prosody; }; diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index bd7085713e53..6366b58731fc 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, testers, hwatch, installShellFiles, @@ -9,24 +10,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hwatch"; - version = "0.3.19"; + version = "0.4.2"; src = fetchFromGitHub { owner = "blacknon"; repo = "hwatch"; tag = finalAttrs.version; - sha256 = "sha256-lMsBzMDMgpHxcQFtfZ4K7r2WRUaVR8Ry/kPvwfzPObI="; + hash = "sha256-ic83D46CGDWRqcNJt/KcMEsnKj6rO/LsTNm247YK/Qs="; }; - cargoHash = "sha256-UnaZZEmX5XoTVFLEFj5JkJXJkjoUBwzJokfffJTPP4M="; + cargoHash = "sha256-xJZpZPhjU81cb00O/FE0QGOsRKY9BG4oGMk2jNy2skw="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installShellCompletion --cmd hwatch \ - --bash $src/completion/bash/hwatch-completion.bash \ - --fish $src/completion/fish/hwatch.fish \ - --zsh $src/completion/zsh/_hwatch + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd hwatch --"$shell" <("$out/bin/hwatch" --completion "$shell") + done ''; passthru.tests.version = testers.testVersion { @@ -34,14 +34,15 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - homepage = "https://github.com/blacknon/hwatch"; description = "Modern alternative to the watch command"; longDescription = '' A modern alternative to the watch command, records the differences in execution results and can check this differences at after. ''; + homepage = "https://github.com/blacknon/hwatch"; + changelog = "https://github.com/blacknon/hwatch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "hwatch"; }; }) diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index e95370728979..b6b311d61878 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.1831"; + version = "0.24.1879"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-ipOlkUz1DK0U01OUI2Kd3gQTF2/MULkk5CVu4EfELmI="; + hash = "sha256-gtDN77TB1AKLfqtvFPoQ3tatXB63Ajax2j1gokgHX4s="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix index 53fd3cffc4ae..c7c20bcfc936 100644 --- a/pkgs/by-name/ka/katana/package.nix +++ b/pkgs/by-name/ka/katana/package.nix @@ -6,21 +6,20 @@ buildGoModule (finalAttrs: { pname = "katana"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "katana"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Q7ZcbiOo7/HHF/1NYfoOxAQk6zUJsrz6n2HJzw9/Ic="; + hash = "sha256-XzJav0YGWBHNSrWiVVFOcHcAIIUjBCIUrbnfUzP9Vco="; }; - vendorHash = "sha256-rq19948HzGgtc6bRx9PYaPoeUk+3evE0UGpgM08i/ZM="; + vendorHash = "sha256-xvMmBQ7am5uRbVQlAr42TqRLyfxMDF/Gygiud5LnewY="; subPackages = [ "cmd/katana" ]; ldflags = [ - "-w" "-s" ]; @@ -29,7 +28,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/projectdiscovery/katana"; changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "katana"; }; }) diff --git a/pkgs/by-name/le/lektor/package.nix b/pkgs/by-name/le/lektor/package.nix index 0934cb382088..bf2d4b7c17ea 100644 --- a/pkgs/by-name/le/lektor/package.nix +++ b/pkgs/by-name/le/lektor/package.nix @@ -1,9 +1,9 @@ { lib, + stdenv, fetchFromGitHub, fetchNpmDeps, fetchPypi, - fetchpatch, nodejs, npmHooks, python3, @@ -26,7 +26,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "lektor"; - version = "3.4.0b12"; + version = "3.4.0b14"; pyproject = true; src = fetchFromGitHub { @@ -37,22 +37,12 @@ python.pkgs.buildPythonApplication rec { postFetch = '' rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt ''; - hash = "sha256-y0/fYuiIB/O5tsYKjzOPnCafOIZCn4Z5OITPMcnHd/M="; + hash = "sha256-Wr3MhUGihqlPyUlWM8KT+sb/FtHH/NfRNDT9QCKJj5k="; }; - patches = [ - # Fixes test_thumbnail.py with Pillow 11.0 - # see lektor/lektor #1202 - (fetchpatch { - name = "lektor-pillow-11.patch"; - url = "https://github.com/lektor/lektor/commit/af99ea4265e05227d7452977949475196a58edfa.patch"; - hash = "sha256-PmSmX9Ku5rAzN2FzLwvXYeUqN683opLRt9J35w56cfg="; - }) - ]; - npmDeps = fetchNpmDeps { src = "${src}/${npmRoot}"; - hash = "sha256-LXe5/u4nAGig8RSu6r8Qsr3p3Od8eoMxukW8Z4HkJ44="; + hash = "sha256-zcvfVVLhHPas4ulyQ9HDG3f5Bofco1A6pDx9TmREOIk="; }; npmRoot = "frontend"; @@ -100,6 +90,17 @@ python.pkgs.buildPythonApplication rec { # Tests require network access "test_path_installed_plugin_is_none" "test_VirtualEnv_run_pip_install" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This is a bit weird, but for some reason fs watch tests fail with sandbox + "test_sees_created_file" + "test_sees_deleted_file" + "test_sees_modified_file" + "test_sees_file_moved_in" + "test_sees_file_moved_out" + "test_sees_deleted_directory" + "test_sees_file_in_directory_moved_in" + "test_sees_directory_moved_out" ]; postCheck = '' diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index ad10b7ef8a1e..8c9451d47023 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "livepeer"; - version = "0.8.8"; + version = "0.8.10"; proxyVendor = true; - vendorHash = "sha256-cEpRLnLR0ia5vvoJ8Fwk/0qgvsnYw7vSpyS9BJQ8UfY="; + vendorHash = "sha256-Cn7GHNrFjGgzKPjSVGnoRE9Q2gd3Ji/ZrdVGB9v+0A8="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; tag = "v${finalAttrs.version}"; - hash = "sha256-DVgB/pE3nq6oHzLi+g/WUMQqrmXvJhPub7bmeLgyEDQ="; + hash = "sha256-jz8lgZItPDzAGKJrAFLiEUJ5nyTdw6kGneP6LtmWDYw="; }; nativeBuildInputs = [ @@ -31,6 +31,10 @@ buildGoModule (finalAttrs: { gnutls ]; + CGO_LDFLAGS = [ + "-lm" + ]; + __darwinAllowLocalNetworking = true; postPatch = '' diff --git a/pkgs/by-name/lo/lockfile-progs/package.nix b/pkgs/by-name/lo/lockfile-progs/package.nix index 2cdf16824d98..f780d8cf77e7 100644 --- a/pkgs/by-name/lo/lockfile-progs/package.nix +++ b/pkgs/by-name/lo/lockfile-progs/package.nix @@ -7,19 +7,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "lockfile-progs"; - version = "0.1.19"; + version = "0.2.0"; src = fetchurl { - url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${finalAttrs.version}.tar.gz"; - sha256 = "sha256-LFcEsByPR0+CkheA5Fkqknsr9qbXYWNUpsXXzVZkhX4="; + url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${finalAttrs.version}.tar.xz"; + sha256 = "sha256-KYj7WotAflLiqmKCzkVJf0Zckh1ZETjBAPSJghWETJA="; }; buildInputs = [ liblockfile ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU (toString [ - # Needed with GCC 12 - "-Wno-error=format-overflow" - ]); + preBuild = '' + patchShebangs . + ''; + + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.cc.isGNU (toString [ + # Needed with GCC 12 + "-Wno-error=format-overflow" + ]) + + lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + "-Wno-error=c23-extensions" + ]); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/me/melonloader-installer/deps.json b/pkgs/by-name/me/melonloader-installer/deps.json new file mode 100644 index 000000000000..7a3870ef4aa5 --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/deps.json @@ -0,0 +1,752 @@ +[ + { + "pname": "Avalonia", + "version": "11.3.13", + "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.3.13", + "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.3.13", + "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.3.13", + "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.3.13", + "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.3.13", + "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" + }, + { + "pname": "Avalonia.Native", + "version": "11.3.13", + "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.13", + "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.3.13", + "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.3.13", + "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.3.13", + "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.3.13", + "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs=" + }, + { + "pname": "Avalonia.X11", + "version": "11.3.13", + "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.2", + "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" + }, + { + "pname": "ELFSharp", + "version": "2.17.3", + "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0=" + }, + { + "pname": "Gameloop.Vdf", + "version": "0.6.2", + "hash": "sha256-z34mcUx7qcaFlVsenGKYuxFNCQNWwOeFZYGecbRT3ZA=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.1", + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.1.1", + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.1.1", + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "5.0.1", + "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.3", + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "10.0.5", + "hash": "sha256-+P58Oxl4W1oXE2a13MSA8dzX4oGm/4Ix9HDT6Z+yHlI=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "Samboy063.Tomlet", + "version": "6.2.0", + "hash": "sha256-kVuz3w25flcNbr4t7eDRQvH9zTIsuVjsRF2K/lkVeH0=" + }, + { + "pname": "Semver", + "version": "3.0.0", + "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.ComponentModel", + "version": "4.3.0", + "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" + }, + { + "pname": "System.ComponentModel.Primitives", + "version": "4.3.0", + "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" + }, + { + "pname": "System.ComponentModel.TypeConverter", + "version": "4.3.0", + "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Drawing.Common", + "version": "10.0.5", + "hash": "sha256-39eTfw3/FAIIJOPmDwgsM6soRJMGvU96MXo6vqbjJJk=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.4", + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.2", + "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime", + "version": "4.3.1", + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.1", + "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + } +] diff --git a/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch b/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch new file mode 100644 index 000000000000..03e73a1ffc8e --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/disable-auto-updates.patch @@ -0,0 +1,17 @@ +Index: MelonLoader.Installer/Updater.cs +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/MelonLoader.Installer/Updater.cs b/MelonLoader.Installer/Updater.cs +--- a/MelonLoader.Installer/Updater.cs (revision 617af4f21813ab4e997effdd6ee78a52ad22b59e) ++++ b/MelonLoader.Installer/Updater.cs (date 1779144321145) +@@ -18,7 +18,7 @@ + return null; + + // Don't auto-update on CI builds +- if (Program.Version.Revision > 0) ++ if (true) + { + State = UpdateState.AlreadyChecked; + return null; diff --git a/pkgs/by-name/me/melonloader-installer/package.nix b/pkgs/by-name/me/melonloader-installer/package.nix new file mode 100644 index 000000000000..418d5437e79b --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + dotnetCorePackages, + buildDotnetModule, + makeDesktopItem, + copyDesktopItems, + lib, +}: +buildDotnetModule rec { + pname = "melonloader-installer"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "LavaGang"; + repo = "MelonLoader.Installer"; + tag = version; + hash = "sha256-6tSbLgr44xBoJsNOGUq62KBirIU6sNCy24fwKROZRPE="; + }; + + patches = [ + ./disable-auto-updates.patch + ]; + + projectFile = "MelonLoader.Installer/MelonLoader.Installer.csproj"; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + nugetDeps = ./deps.json; + selfContainedBuild = true; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ copyDesktopItems ]; + + postInstall = '' + install -Dm644 Resources/ML_Icon.png $out/share/icons/MelonLoader.Installer.Linux.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "MelonLoader Installer"; + exec = meta.mainProgram; + comment = meta.description; + categories = [ + "Game" + "Utility" + ]; + icon = meta.mainProgram; + }) + ]; + + passthru.updateScript = ./update.sh; + + meta = { + homepage = "https://melonwiki.xyz"; + mainProgram = "MelonLoader.Installer.Linux"; + description = "Automated installer for MelonLoader, the universal mod-loader for games built in the Unity Engine"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ WillemToorenburgh ]; + }; +} diff --git a/pkgs/by-name/me/melonloader-installer/update.sh b/pkgs/by-name/me/melonloader-installer/update.sh new file mode 100644 index 000000000000..481a62f604e5 --- /dev/null +++ b/pkgs/by-name/me/melonloader-installer/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +# Implementation lovingly referenced and adapted from cavalier package's update.sh + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/LavaGang/MelonLoader.Installer/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A melonloader-installer.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version melonloader-installer "$version" + +$(nix-build -A melonloader-installer.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.json" diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index f396929480ef..09875f0d22ff 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -170,11 +170,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "148.0.3967.54"; + version = "148.0.3967.70"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-ccMYxwaQ70p+za3LoM0vT+lXiRIlYmoldVDqsHT7I9o="; + hash = "sha256-rwG3zPxMHjC00P591/CZIWRIHb4td4q3Rfz4fvf89k0="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix index 00e3e21eaad8..99df735260a0 100644 --- a/pkgs/by-name/mi/minilibx/package.nix +++ b/pkgs/by-name/mi/minilibx/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "0-unstable-2026-04-16"; + version = "0-unstable-2026-05-15"; src = fetchFromGitHub { owner = "42Paris"; repo = "minilibx-linux"; - rev = "a0ce07ba22460ee66e62b6c56d60b33946aeb13d"; - hash = "sha256-LyFCmuGXAAv7O9jrmfeIVeYoi7d1Mdw6e8u2Z0/yO4s="; + rev = "b8de9b411818f2e56dd2f4f23c5aa9bffc18a612"; + hash = "sha256-LTZeVxa4NdGOai/GIrhPbWwXO7Vj7ct/gexeC81IvDw="; }; outputs = [ diff --git a/pkgs/by-name/mo/move-mount-beneath/package.nix b/pkgs/by-name/mo/move-mount-beneath/package.nix deleted file mode 100644 index 844e37c2978b..000000000000 --- a/pkgs/by-name/mo/move-mount-beneath/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "move-mount-beneath"; - version = "0-unstable-2025-09-24"; - - src = fetchFromGitHub { - owner = "brauner"; - repo = "move-mount-beneath"; - rev = "f8773d1f99f9cfa2f5bf173e1b1d1b21eb1ee446"; - hash = "sha256-C7QiClwFTKBcdmGilwZSCAsaVoEDXTO9384Y/47JrPk="; - }; - - installPhase = '' - runHook preInstall - install -D move-mount $out/bin/move-mount - runHook postInstall - ''; - - meta = { - description = "Toy binary to illustrate adding a mount beneath an existing mount"; - mainProgram = "move-mount"; - homepage = "https://github.com/brauner/move-mount-beneath"; - license = lib.licenses.mit0; - maintainers = with lib.maintainers; [ nikstur ]; - }; -} diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 8b23b859cc72..880940f82117 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "148.0.3967.54"; + version = "148.0.3967.70"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-woGkky1i9so+1D61irtJYjDQ0xoHUeGQsJi/eQ4VGhU="; + hash = "sha256-e0WYaLmuR/ebupSYnS1D4BpTWJldMmiR1TqbTA5Fl0s="; stripRoot = false; }; diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix index b76c35cc08fe..23564c756a7a 100644 --- a/pkgs/by-name/ne/netpeek/package.nix +++ b/pkgs/by-name/ne/netpeek/package.nix @@ -14,14 +14,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "netpeek"; - version = "0.2.6"; + version = "0.2.7"; pyproject = false; src = fetchFromGitHub { owner = "ZingyTomato"; repo = "NetPeek"; tag = "v${finalAttrs.version}"; - hash = "sha256-SFY/bUUS4AOniOGjngH/fUHrYiq+dMWxHYvoSkhfnkA="; + hash = "sha256-Cc8x9diBeKIk1G5fU1WHtgmUwCCbAwIrw8zEQScKlZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 67323d4e2656..86f8b316ab4e 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "5.0"; + version = "5.2"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-O4ry1G7Y55bjr4APrYMSCfrkNy8KrhSgG0Nh1rOGMvU="; + hash = "sha256-AjKcM/JD43htQZhNWcVv6ljhN2T9BPOv9ZdO6uxImOw="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index 1c59a2d98d6f..547184e50a37 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -9,13 +9,13 @@ resholve.mkDerivation (finalAttrs: { pname = "nix-direnv"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = finalAttrs.version; - hash = "sha256-AsWnRH7LAb78iFfE+ZdYyCR5AVuPloT8ZnghDXW6arY="; + hash = "sha256-3qT5mSqHi+0cskdoOGPVbuSzkoWtwOHBVXUOL84dAM8="; }; installPhase = '' diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix index 9a22bd3cf401..060f79e0ff17 100644 --- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix +++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-index"; version = "0.1.10"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "nix-community"; repo = "nix-index"; diff --git a/pkgs/by-name/nq/nqptp/package.nix b/pkgs/by-name/nq/nqptp/package.nix index 932300f87e46..596775f8d33c 100644 --- a/pkgs/by-name/nq/nqptp/package.nix +++ b/pkgs/by-name/nq/nqptp/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.2.7"; + version = "1.2.8"; pname = "nqptp"; src = fetchFromGitHub { owner = "mikebrady"; repo = "nqptp"; tag = finalAttrs.version; - hash = "sha256-A87sIwn8NgfUGiCsCq/iiwcqnkfZtLbE9LrjLiWiiWc="; + hash = "sha256-f8k1MKNVMqt8Nym1+CWLC5bAKUkmPaBZYTer+EoPAgk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 8f2efe9ed76a..2af9b61a87bb 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -67,6 +67,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { # isn't patched for Nix. Disable it at source. substituteInPlace packages/desktop/src/main/constants.ts \ --replace-fail 'app.isPackaged && CHANNEL !== "dev"' 'false' + + # Relax Bun version check to be a warning instead of an error + substituteInPlace packages/script/src/index.ts \ + --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \ + 'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}' ''; configurePhase = '' diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 6a128e88368f..398cba81522d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.15.3"; + version = "1.15.5"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-OKQR76q7trKQTvlMxH8tG2jNnRtBe3YeFfvNw8c3+8I="; + hash = "sha256-HZiqia9QzkJMfRQ6bzFBsiGXNHv1WFLUdwhekE+rXM8="; }; node_modules = stdenvNoCC.mkDerivation { @@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-O6czNd9n6b0TTIsPseZn9qOlxsPzRTrePu3L6gM13oM="; + outputHash = "sha256-lxwxaFTgonMPIe2GweEVZhCMSUN/quBgV1wvV05U5wc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/openscreen/package.nix b/pkgs/by-name/op/openscreen/package.nix index 148efac3e616..87e810e0a033 100644 --- a/pkgs/by-name/op/openscreen/package.nix +++ b/pkgs/by-name/op/openscreen/package.nix @@ -6,33 +6,38 @@ copyDesktopItems, makeWrapper, makeDesktopItem, - electron_39, + xcbuild, + electron_41, nodejs_22, nix-update-script, - - nodejs ? nodejs_22, - electron ? electron_39, }: +let + electron = electron_41; + nodejs = nodejs_22; +in buildNpmPackage (finalAttrs: { inherit nodejs; pname = "openscreen"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "siddharthvaddem"; repo = "openscreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-0L+SGbhKNvSH5IpjHjS5G1uhnoWV5oIaSs2mRSAl/mM="; + hash = "sha256-ZBWDQVYDXJ/IQGhlmscmCOMjpl03kVIdMoJXOW8OjUI="; }; - npmDepsHash = "sha256-pKfOxRzVfMNVHxA9oM9naWz024api8jxiTJwy0+6W9A="; + npmDepsHash = "sha256-SMAYgOwlZg9+/KZBUhVviOxEdMeL3Z2YdC8Hx8Q/ioY="; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build` nativeBuildInputs = [ makeWrapper copyDesktopItems + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + xcbuild ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -60,7 +65,8 @@ buildNpmPackage (finalAttrs: { npm exec electron-builder -- \ --dir \ -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false ''} runHook postBuild diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 7b63b0d96d30..eb12eed318d7 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -22,6 +22,7 @@ fetchzip, lib, stdenv, + bashInteractive, # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the @@ -31,7 +32,7 @@ fuse, gsettings-desktop-schemas, gtk3, - libdbusmenu-gtk2, + libdbusmenu-gtk3, libgbm, libxdamage, nss, @@ -40,13 +41,13 @@ let pname = "pcloud"; - version = "2.0.4"; - code = "XZNttt5ZD5h5yXmbVPHHIIr4nEUwduLH837X"; + version = "2.1.0"; + code = "XZC8VU5ZEmdCknyJULblvtv3890nA80TSUiX"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-VINx6xM8/unPC9xopV2ml64wqU0FdhZdGTnxLUpCiyY="; + hash = "sha256-vdQn1jIc44dGxUgK2xJMbVNObdF3hh8NvZi/YKpf+is="; }; in @@ -72,11 +73,12 @@ stdenv.mkDerivation { dbus-glib fuse gtk3 - libdbusmenu-gtk2 + libdbusmenu-gtk3 libgbm libxdamage nss udev + bashInteractive ]; installPhase = '' @@ -128,6 +130,7 @@ stdenv.mkDerivation { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; changelog = "https://www.pcloud.com/release-notes/linux.html"; + downloadPage = "https://www.pcloud.com/release-notes/linux.html"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ patryk27 ]; diff --git a/pkgs/by-name/pl/plandex-server/package.nix b/pkgs/by-name/pl/plandex-server/package.nix deleted file mode 100644 index 06fb08e5248b..000000000000 --- a/pkgs/by-name/pl/plandex-server/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - makeWrapper, - git, -}: -buildGoModule (finalAttrs: { - pname = "plandex-server"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "plandex-ai"; - repo = "plandex"; - rev = "server/v${finalAttrs.version}"; - hash = "sha256-RVvgnQtb/asOjVpSZ3WndimsJ6foERMWS/YD20sghVE="; - }; - - postPatch = '' - substituteInPlace db/db.go \ - --replace-fail "file://migrations" "file://$out/migrations" - ''; - - postInstall = '' - cp -r migrations $out/migrations - ''; - - postFixup = '' - wrapProgram $out/bin/plandex-server \ - --prefix PATH : ${lib.makeBinPath [ git ]} - ''; - - nativeBuildInputs = [ makeWrapper ]; - - nativeCheckInputs = [ git ]; - - sourceRoot = "${finalAttrs.src.name}/app/server"; - - vendorHash = "sha256-uarTWteOoAjzEHSnbZo+fEPELerpuL7UNA5pdGP5CMY="; - - meta = { - mainProgram = "plandex-server"; - description = "AI driven development in your terminal. Designed for large, real-world tasks. The server part"; - homepage = "https://plandex.ai/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ viraptor ]; - }; -}) diff --git a/pkgs/by-name/pl/plandex/package.nix b/pkgs/by-name/pl/plandex/package.nix deleted file mode 100644 index 693b0c2d6120..000000000000 --- a/pkgs/by-name/pl/plandex/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule (finalAttrs: { - pname = "plandex"; - version = "2.1.2"; - - src = fetchFromGitHub { - owner = "plandex-ai"; - repo = "plandex"; - rev = "cli/v${finalAttrs.version}"; - hash = "sha256-mNNL1K+gNhYDuKpGt3FP/L4JxO/bHyebhABOpFjLLLI="; - }; - - ldflags = [ - "-X plandex-cli/version.Version=${finalAttrs.version}" - ]; - - sourceRoot = "${finalAttrs.src.name}/app/cli"; - - vendorHash = "sha256-0wYlCxg0CPPizdhJ1VfZEEcauy2rJeeTqPiiqsExBu8="; - - meta = { - mainProgram = "plandex"; - description = "AI driven development in your terminal. Designed for large, real-world tasks. The cli part"; - homepage = "https://plandex.ai/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ viraptor ]; - }; -}) diff --git a/pkgs/by-name/qb/qbit-manage/package.nix b/pkgs/by-name/qb/qbit-manage/package.nix index 13cf1324639e..ed704cd2985d 100644 --- a/pkgs/by-name/qb/qbit-manage/package.nix +++ b/pkgs/by-name/qb/qbit-manage/package.nix @@ -8,13 +8,13 @@ }: python3Packages.buildPythonApplication rec { pname = "qbit-manage"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "StuffAnThings"; repo = "qbit_manage"; tag = "v${version}"; - hash = "sha256-cPN4GhB7TuhiGau8Nb9hVNubF6fppyS2tuFGJ+spPaI="; + hash = "sha256-+W28F8vI5OLqFd0S6nlqMW/IxJXB4Vl+bCOZAyLGNXY="; }; pyproject = true; @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "croniter" "fastapi" + "gitpython" "requests" "uvicorn" ]; diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 853f678f4057..95659d90a9dd 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, rustPlatform, cmake, pkg-config, @@ -14,16 +15,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebels-in-the-sky"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ricott1"; repo = "rebels-in-the-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-P0GPdMTOomqNQ6WLfZnASO1FiD7DJTHj/a8eoYzAvAY="; + hash = "sha256-alXqHtaGtv2zPt1OpNyEwHpQ+GKhS8xqOQFa5PvCsqc="; }; - cargoHash = "sha256-Ldy/1Gv1qguWQ2lLk0jiiq7nM9r85LY7pXkXf2nCUA0="; + cargoHash = "sha256-PvSOjuK1cObDuZeAKYEEqwezCuv7RM1W/aimrc4QV28="; + + cargoPatches = [ + (fetchpatch { + # The lock file was updated after the release + url = "https://github.com/ricott1/rebels-in-the-sky/commit/4cd33144b7e2e6297c5e0d6a6a0e46bc976279d0.patch"; + hash = "sha256-HUzABNtpBgts7rtuPB/OCtCTQk+XsLGEOyRRgy3uIdI="; + }) + ]; patches = lib.optionals (!withRadio) [ ./disable-radio.patch diff --git a/pkgs/by-name/re/renoise/package.nix b/pkgs/by-name/re/renoise/package.nix index 7121f1e8d676..513edb13dfa4 100644 --- a/pkgs/by-name/re/renoise/package.nix +++ b/pkgs/by-name/re/renoise/package.nix @@ -25,18 +25,18 @@ let platforms = { x86_64-linux = { archSuffix = "x86_64"; - hash = "sha256-UxhGe22W50cqjNMoAdxHnyFmTmiysYd8EkASRFrpuYs="; + hash = "sha256-RfOhcllmwX3Cy6ywIYjIC+kUX6rXkd+PM9wKj+fCuts="; }; aarch64-linux = { archSuffix = "arm64"; - hash = "sha256-itWnH1JiG+AhYZtNtrJtW9p7LlRF/ab5+npFODiKznY="; + hash = "sha256-1bo7/srdQ5M5mzXpL76Bkt1Gt9EhbW8ktLLPvOcFu5U="; }; }; in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.5.1"; + version = "3.5.4"; src = if releasePath != null then diff --git a/pkgs/by-name/re/restman/package.nix b/pkgs/by-name/re/restman/package.nix index 7512dbe64165..fc45cf744e9f 100644 --- a/pkgs/by-name/re/restman/package.nix +++ b/pkgs/by-name/re/restman/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildGoModule, testers, restman, @@ -8,16 +9,24 @@ buildGoModule (finalAttrs: { pname = "restman"; - version = "0.3.0"; + version = "0.4.9"; src = fetchFromGitHub { repo = "restman"; owner = "jackMort"; rev = "v${finalAttrs.version}"; - hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA="; + hash = "sha256-advp7w9SbMKcuvQhR7pF95VV4J6hUl8rV+9Uu4EaGpc="; }; - vendorHash = "sha256-hXd7E6yowuY3+ZpGyCzlcqwFqFrQzXBWYRMjsrxBlwI="; + patches = [ + (fetchpatch { + # fix for tests committed shortly after 0.4.9 + url = "https://github.com/jackMort/Restman/commit/2d5edd4e4faa0499bf93741fed250f8f13efa9c3.patch"; + hash = "sha256-Mv7+eAKczR4YZDdevK60I1WZrmEumqsXhXMQVwu1zLo="; + }) + ]; + + vendorHash = "sha256-+qjJhDQvZi+SstE2uo+2hsoG2MTRdI6d79Vga3/7gTY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 45f838507e00..d252431056a9 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -9,35 +9,27 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "rich-cli"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; + hash = "sha256-z1Ea8f8QNgy2CWGyQWgY2Y/tpg269R5n9Qrs1YhCHa8="; }; - patches = [ - # Update dependencies, https://github.com/Textualize/rich-cli/pull/94 - (fetchpatch { - name = "update-dependencies.patch"; - url = "https://github.com/Textualize/rich-cli/pull/94/commits/1e9a11af7c1c78a5a44a207b1e0dce4c4b3c39f0.patch"; - hash = "sha256-cU+s/LK2GDVWXLZob0n5J6sLjflCr8w10hRLgeWN5Vg="; - }) - (fetchpatch { - name = "markdown.patch"; - url = "https://github.com/Textualize/rich-cli/pull/94/commits/0a8e77d724ace88ce88ee9d68a46b1dc8464fe0b.patch"; - hash = "sha256-KXvRG36Qj5kCj1RiAJsNkoJY7t41zUfJFgHeCtc0O4w="; - }) - ]; - pythonRelaxDeps = [ "rich" "textual" + "rich-rst" ]; + postPatch = '' + substituteInPlace src/rich_cli/__main__.py \ + --replace-fail 'VERSION = "1.8.0"' 'VERSION = "1.8.1"' + ''; + build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 83bfa9fc21ea..e83195e4022a 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2026-05-05"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "1410f03e6dc98f0135cad0b458381179bdddec59"; - hash = "sha256-l+GPfi6u2wYEWLtTowdjG3hRLM1QSDpRaw/BL74S6I8="; + rev = "9d3790f73cc0a0131fe38378157f5e464d2e08ee"; + hash = "sha256-G3Lnmjzeqfwe6rmo+2PQ2NKYeKcTu/L+RTqft7UdCrg="; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-jRfY9w84DdGkuUXAxcdKOhNEjJU5o0t8qJqtr7FXmZw="; + hash = "sha256-IRqBTLdl2XC+dql7CqOfYxy+ej1UXItY932L3tWHd/s="; pnpm = pnpm_10; }; diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 2947decb1614..41b3b9329ae4 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.1.91"; + version = "0.1.94"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-hn9YHFG8wbU8cY96MUT1fsRTzMqkCdJKnQsBgRNRVjo="; + hash = "sha256-Q5Dbw1BaDrNcg+xtCog7rWwweZi6qtDsjtq19vJWZck="; }; - cargoHash = "sha256-OUzZ2CLda5VqNLFX6hzd4+MPXcUPsTWerWravZDJJfU="; + cargoHash = "sha256-s2/8z/v+bQISwaQdl6nOocMK0M173eSVw1yC3mCzp9k="; cargoBuildFlags = [ "--bin=rumdl" diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix index b463d9baa418..8c1c00dd141d 100644 --- a/pkgs/by-name/sa/sandbox-runtime/package.nix +++ b/pkgs/by-name/sa/sandbox-runtime/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { pname = "sandbox-runtime"; - version = "0.0.51"; + version = "0.0.52"; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { owner = "anthropic-experimental"; repo = "sandbox-runtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-/bvSbkW3cEopq6YHPS36uHEN53dVO5rhUoXt/nWdsRs="; + hash = "sha256-EcRnx4j8YdBvhCNgWdfzvgP6SgvXQfqu8aNBjeM1YQM="; }; postPatch = @@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: { strictDeps = true; - npmDepsHash = "sha256-L/BJ0KCBYHAA6BaYZbzNFVPHJZHGnDnpZFo9XepKc4s="; + npmDepsHash = "sha256-IFf65G1v3JtjjH7o8gS68VongLIP3WuKmD/om41yRts="; postFixup = let diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index b3f2324fb0b9..63dc3cecd667 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -10,16 +10,20 @@ buildGo125Module (finalAttrs: { pname = "scip"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; tag = "v${finalAttrs.version}"; - hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU="; + hash = "sha256-lpzGrTvWUXUFfmyn5z4rsqJEcAOA8D1qfN1assRAdn4="; }; - vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A="; + vendorHash = "sha256-ARfsSW/d2bb4Lp6hedSmMerr3LrkuTfUCi569hI6eYY="; + + subPackages = [ "cmd/scip" ]; + + env.GOWORK = "off"; ldflags = [ "-s" @@ -28,15 +32,6 @@ buildGo125Module (finalAttrs: { nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; - checkFlags = - let - skippedTests = [ - "TestParseCompat" # could not locate sample indexes directory starting from parents of working directory - "TestParseSymbol_ZeroAllocationsIfMemoryAvailable" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - __darwinAllowLocalNetworking = true; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/se/selfci/Cargo.toml.patch b/pkgs/by-name/se/selfci/Cargo.toml.patch deleted file mode 100644 index ab385872ce7a..000000000000 --- a/pkgs/by-name/se/selfci/Cargo.toml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 8f7a1e2..e2062c4 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,7 +10,7 @@ readme = "README.md" - keywords = ["ci"] - categories = ["development-tools"] - authors = ["dpc "] --rust-version = "1.92" -+rust-version = "1.91" - - [[bin]] - name = "selfci" diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix index 05a17777fded..2ebeebb79f19 100644 --- a/pkgs/by-name/se/selfci/package.nix +++ b/pkgs/by-name/se/selfci/package.nix @@ -1,6 +1,6 @@ { lib, - fetchgit, + fetchFromRadicle, nix-update-script, rustPlatform, git, @@ -9,24 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "selfci"; - version = "0-unstable-2026-01-17"; + version = "0.5.0"; - src = fetchgit { - url = "https://radicle.dpc.pw/z2tDzYbAXxTQEKTGFVwiJPajkbeDU.git"; - rev = "83e693dada851ce0da32713869d3da02c52ed257"; - hash = "sha256-f0BfHvIQnhhiPie3a+9MeEGzZ+/KcgrbKBneu8Jo+xs="; + src = fetchFromRadicle { + seed = "radicle.dpc.pw"; + repo = "z2tDzYbAXxTQEKTGFVwiJPajkbeDU"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6Q9Enq02uJbcpr7pohh+uiGNus++TkUxCvO4KwX8fkk="; }; - cargoHash = "sha256-Z3f35HIZiNeKeDNFPUVkFvL2OpMWzqRvxOL5/hUEzJw="; + cargoHash = "sha256-zgDbf0po0YJCRo4GyVce2YSzoFjBTWsKX86/aH3uZlY="; nativeBuildInputs = [ makeWrapper ]; - patches = [ - ./Cargo.toml.patch - ]; - doCheck = false; postInstall = '' diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 8bd7d1369f58..9a0d4bd53935 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -11,12 +11,12 @@ buildGoModule (finalAttrs: { pname = "shopware-cli"; - version = "0.6.22"; + version = "0.14.8"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; tag = finalAttrs.version; - hash = "sha256-u5hFjDLGBXVvAp4WYWBb3HCzGDjkg9jj251LaV1zA8I="; + hash = "sha256-yN6yuGnZv6BsXoERUdA3aBGEmri1hqmPsbIYsX7HE5Q="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { dart-sass ]; - vendorHash = "sha256-Ckn6+DzHPX+UG5YxYqvkdaio/elRQssbDSR+zAfxzdE="; + vendorHash = "sha256-itrSY18wZnY0j4wq2mJ+2ugM0A2SKORENJ0iwWg+s+U="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd shopware-cli \ diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index b2ddfa6af0ff..e08b664a902a 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -5,15 +5,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-M4YvPsiCimbxHZoPO4+aIdwmYa4o5By+qnSl7FeAD5k="; + hash = "sha256-1FDqbV+t9JF93aTgy7Hnwe4lCJZHooHw0J3zOsCZWDA="; }; - npmDepsHash = "sha256-BE8B7yALOi5WLWHAvSPC2lUCgAFjUCOUMc4Ru2RBdJM="; + npmDepsHash = "sha256-jDySPn354gh1gFI8I2apGmXDxOz4d4STfJX+iFVFhdg="; dontNpmBuild = true; @@ -36,6 +36,6 @@ buildNpmPackage (finalAttrs: { homepage = "https://docs.sillytavern.app/"; mainProgram = "sillytavern"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.wrvsrx ]; + maintainers = [ lib.maintainers.Notarin ]; }; }) diff --git a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch b/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch deleted file mode 100644 index b62f655618d9..000000000000 --- a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 0194c34ed2..0d58655f70 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1419,14 +1419,14 @@ dependencies = [ - - [[package]] - name = "crossbeam-epoch" --version = "0.9.5" --source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" -+version = "0.9.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" - dependencies = [ -+ "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", -- "lazy_static", -- "memoffset 0.6.4", -- "scopeguard", -+ "memoffset 0.9.0", - ] - - [[package]] -@@ -3118,15 +3118,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "memoffset" --version = "0.6.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" --dependencies = [ -- "autocfg", --] -- - [[package]] - name = "memoffset" - version = "0.7.1" -diff --git a/Cargo.toml b/Cargo.toml -index 2ff2094d67..a3ace4459a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -665,4 +665,4 @@ - [patch.crates-io] - # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf --crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } -+# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } diff --git a/pkgs/by-name/so/solana-agave/package.nix b/pkgs/by-name/so/solana-agave/package.nix index 7e22eda533c2..d3eb6798699a 100644 --- a/pkgs/by-name/so/solana-agave/package.nix +++ b/pkgs/by-name/so/solana-agave/package.nix @@ -22,23 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "solana-agave"; - version = "2.3.12"; + version = "3.1.14"; src = fetchFromGitHub { owner = "anza-xyz"; repo = "agave"; tag = "v${finalAttrs.version}"; - hash = "sha256-25UgiC5jAnlNE8Z7WrQRIviCuFp4zg57ddYA4h0qJ6U="; + hash = "sha256-yi71jUtFJhv6gvWQC9YrEqhe4cB6QU+hokn3hTLww30="; }; - cargoHash = "sha256-SVngabz9mrYNn7DlL7Rh7llvO4GmJdt5vpXVcjwqtNg="; - - # For the same reason as discussed in solana-cli derivation (crossbeam softlink), the no_atomic file is missing - # and either must somehow be rendered unneeded (using an upstream package) or replaced. A cleaner, non-behavior-changing, - # solution would be to commit the file to the repo fork (replacing the softlink). - cargoPatches = [ - ./crossbeam-epoch.patch - ]; + cargoHash = "sha256-klcpQRrPvCVgfbhnK/MsZB3m4u2rg7qIq7YeBL3+ajw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix index acbc8615f3eb..f05db0512451 100644 --- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix +++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix @@ -42,7 +42,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "stable-diffusion-cpp"; - version = "master-558-8afbeb6"; + version = "master-625-f683c88"; outputs = [ "out" @@ -52,8 +52,8 @@ effectiveStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "leejet"; repo = "stable-diffusion.cpp"; - rev = "master-558-8afbeb6"; - hash = "sha256-YRgOBvTk/+AfXeZIzkhCBNsLTzoLZ35+0eqtw7TP5ME="; + rev = "master-625-f683c88"; + hash = "sha256-eqVPgETCIwxvmpVwRUGx8hwqX9wV6ynER5uWxoctUw4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 92b10f2647f1..ea7986f959b6 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "statix"; - version = "0-unstable-2026-05-09"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "molybdenumsoftware"; repo = "statix"; - rev = "f61bc82c0c90569de508f0c71a6ba7f4aba9cca7"; - hash = "sha256-4LtWT+BFSPaq5DXQPlZ+xVrW/osS9yhG5T0tEfSdczs="; + rev = "f0d256d60d9b9736b274a0edc0492be472318166"; + hash = "sha256-dylteN19qQ/MclInQ+x4vf+rBGNIsaKWJ+WgiS0ZBjI="; }; cargoHash = "sha256-lODAnIGw8MncMT5xicWORSbCChn2HQXENsOStJYHepQ="; diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix index 6ea3a0ba875e..92d90ac3d9c2 100644 --- a/pkgs/by-name/ti/tinygltf/package.nix +++ b/pkgs/by-name/ti/tinygltf/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinygltf"; - version = "2.9.7"; + version = "3.0.0"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; tag = "v${finalAttrs.version}"; - hash = "sha256-tG9hrR2rsfgS8zCBNdcplig2vyiIcNspSVKop03Zx9A="; + hash = "sha256-qs/7O/nPXpMbn31smMfdd3V9zRbyhAnDyjZwlduseKU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix index 22c065c33a60..bf1133275743 100644 --- a/pkgs/by-name/un/unvanquished/package.nix +++ b/pkgs/by-name/un/unvanquished/package.nix @@ -34,7 +34,7 @@ }: let - version = "0.56.1"; + version = "0.56.2"; binary-deps-version = "11"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "Unvanquished"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-MIsHW56RYkh5xtidHpBOEwQQSsvGMEdAdGt5fQvqXxQ="; + hash = "sha256-+3y9UJAMfMDIO4feHTyb5IWIelRSsH6KF6WAtx7rric="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -121,7 +121,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-HnWdOvi7fcKmktLVbdUfMnB8v3iHb1t7jEERUcYcxNg="; + outputHash = "sha256-lXhzrA30wiNtCvpl4xxrIyl5Vcd4TvSQAuBK73vZXHs="; outputHashMode = "recursive"; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index c112bc5a59ff..cc74de7dcc75 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,28 +7,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmi"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { - owner = "paritytech"; + owner = "wasmi-labs"; repo = "wasmi"; tag = "v${finalAttrs.version}"; - hash = "sha256-+hzvJ0Jq2tFxbCBSSjnUHgZDRb7q0+OGEzMtjZU20Fg="; + hash = "sha256-eFQ0dBOFE/vpRXfAYYZNncAVKMlaGf8jHvBT/a5UQRo="; fetchSubmodules = true; }; - cargoHash = "sha256-8RVKZYMB5ieAnwHpjFloEmswUT8BbSRaSmduaoOa+io="; + cargoHash = "sha256-Vo5MGp3I/8sMDchNQORzlXS8z9Bp6cILnK4aYot9/FE="; passthru.updateScript = nix-update-script { }; meta = { - description = "Efficient WebAssembly interpreter"; - homepage = "https://github.com/paritytech/wasmi"; - changelog = "https://github.com/paritytech/wasmi/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "Efficient and versatile WebAssembly interpreter for embedded systems"; + homepage = "https://github.com/wasmi-labs/wasmi"; + changelog = "https://github.com/wasmi-labs/wasmi/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "wasmi_cli"; - maintainers = [ ]; }; }) diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 6badec6a8e10..7f385a5b9c74 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "watchlog"; - version = "1.257.0"; + version = "1.259.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${finalAttrs.version}"; - hash = "sha256-KesYMimT6GMo5HK7rsasgfylM0F98bZcqCEsJdNPgaM="; + hash = "sha256-MjuQ1k38ZS1d6kJitEH9DTCUWzvUNhm3mto/QAWxE5k="; }; - cargoHash = "sha256-y0U+AQ8a7SEyUl6LtGzD61ArJUx3GU19dnk6KHVaXxM="; + cargoHash = "sha256-Mukw9DLIaPI0/CQws7AQwHmGmX/T4KuoX/2KTAUZXx4="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix index 4ddfa8db0296..e879d843d13c 100644 --- a/pkgs/by-name/wa/wayscriber/package.nix +++ b/pkgs/by-name/wa/wayscriber/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wayscriber"; - version = "0.9.17"; + version = "0.9.19"; src = fetchFromGitHub { owner = "devmobasa"; repo = "wayscriber"; tag = "v${finalAttrs.version}"; - hash = "sha256-ylvZ+U8et9McvZrHsJFLoWWAtruQnKMk/5lg4uCw/rg="; + hash = "sha256-QvIE4A6i5tz1Emsd1p3vHkQAsm+msSEUsTIM5hEKUi4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango libxkbcommon ]; - cargoHash = "sha256-/q4ux2MXDfrqbUfO1M2lykpDl03MTnVS4ottxSgDFEQ="; + cargoHash = "sha256-ysInAJhjO9nC4O/Q2mffby33faOO0ooJXdrjWmka2kg="; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix index 63f40d5d400d..553ef65033c1 100644 --- a/pkgs/by-name/wo/worker-build/package.nix +++ b/pkgs/by-name/wo/worker-build/package.nix @@ -2,21 +2,25 @@ lib, fetchFromGitHub, rustPlatform, + pkg-config, + openssl, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "worker-build"; - version = "0.7.4"; + version = "0.8.3"; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-LeW0CHYBaib81AqftYpW38FFR3P7q7OJE2NmrK9oi9Q="; + hash = "sha256-sRKQALNYUmzxaqYJCWR8b3yvqg8e4EHe1Cm7vqRx8hU="; fetchSubmodules = true; }; - cargoHash = "sha256-W1m7W7LepgZ3WPjmZ7qXlu3WnvZkpGO35sHryOFqhfk="; + cargoHash = "sha256-enePrsTLpiTDxqnFFD38N4amOKY5oHHctPl9RFj2eRo="; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 4601ddacc909..0dddb9344de1 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xcp"; - version = "0.24.2"; + version = "0.24.8"; src = fetchFromGitHub { owner = "tarka"; repo = "xcp"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ojk2khNLKhnAbWlBG2QEhcVrXz5wuC92IOEG3o58E3A="; + tag = "xcp-v${finalAttrs.version}"; + hash = "sha256-OuwzgtMQMQcWhQnwD1Ow2fsT0yhl+DVGkqoebe2osf8="; }; - cargoHash = "sha256-uJVm9nxXXfn4ZEIYoX2XMhZN7Oduwi1D8wZmv64mx60="; + cargoHash = "sha256-8WRiHHMvYwwx7AxuovGjnn83AxIAJK0T86b2WCOtGuw="; nativeBuildInputs = [ installShellFiles ]; @@ -57,6 +57,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # thread 'test_sockets_dir::test_with_parallel_file_driver' panicked at tests/common.rs:1178:5: # assertion failed: to.exists() "--skip=test_sockets_dir::test_with_parallel_file_driver" + + # failing in sandbox + "--skip=dir_copy_deref_symlinks::test_with_parallel_file_driver" ]; postInstall = '' diff --git a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff index 977eaa538302..082975d721f9 100644 --- a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff +++ b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff @@ -1,25 +1,22 @@ -diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile ---- ytree-2.06-old/Makefile 2023-11-26 06:15:34.000000000 -0300 -+++ ytree-2.06-new/Makefile 2023-12-01 12:25:36.641958285 -0300 -@@ -11,13 +11,13 @@ - # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys - # - --DESTDIR = /usr -+PREFIX = /usr - +diff -Naur ytree-2.12-old/Makefile ytree-2.12-new/Makefile +--- ytree-2.12-old/Makefile 2026-04-20 18:00:22.000000000 +0000 ++++ ytree-2.12-new/Makefile 2026-05-17 12:00:00.000000000 +0000 +@@ -14,10 +14,11 @@ + ADD_CFLAGS = # -DVI_KEYS - + +-DESTDIR = /usr -BINDIR = $(DESTDIR)/bin -MANDIR = $(DESTDIR)/share/man/man1 --MANESDIR = $(DESTDIR)/share/man/es/man1 ++PREFIX = /usr + +BINDIR = $(DESTDIR)$(PREFIX)/bin +MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 +MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1 - - + # Uncomment the lines for your system (default is linux) -@@ -221,7 +221,7 @@ + +@@ -218,7 +219,7 @@ install: $(MAIN) if [ ! -e $(BINDIR) ]; then mkdir -p $(BINDIR); fi install $(MAIN) $(BINDIR) diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix index 965e5f2fc358..cdb953a46a03 100644 --- a/pkgs/by-name/yt/ytree/package.nix +++ b/pkgs/by-name/yt/ytree/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ytree"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz"; - hash = "sha256-O7u9MvVoza4+A/xzWxeD2MumBaLKYFbRuXEUPX3dUX0="; + hash = "sha256-I2bS1fwfZERgMjhj5b6ZdFhLybLWbXJHFlqP8aCZERQ="; }; patches = [ diff --git a/pkgs/development/interpreters/python/editable.nix b/pkgs/development/interpreters/python/editable.nix index 2a492e54c301..102a31ac1d4c 100644 --- a/pkgs/development/interpreters/python/editable.nix +++ b/pkgs/development/interpreters/python/editable.nix @@ -39,7 +39,7 @@ let # In editable mode build-system's are considered to be runtime dependencies. dependencies' = dependencies ++ build-system; - pyproject = { + pyprojectContents = { # PEP-621 project table project = { name = pname; @@ -81,7 +81,7 @@ buildPythonPackage ( pyproject = true; unpackPhase = '' - python -c "import json, tomli_w; print(tomli_w.dumps(json.load(open('$pyprojectContentsPath'))))" > pyproject.toml + python -c "import json, os, tomli_w; attrs = json.load(open(os.environ['NIX_ATTRS_JSON_FILE'], 'r')); print(tomli_w.dumps(attrs['pyprojectContents']))" > pyproject.toml echo 'import os.path, sys; sys.path.insert(0, os.path.expandvars("${root}"))' > _${pname}.pth ''; @@ -92,8 +92,8 @@ buildPythonPackage ( # Note: Using formats.toml generates another intermediary derivation that needs to be built. # We inline the same functionality for better UX. nativeBuildInputs = (derivationArgs.nativeBuildInputs or [ ]) ++ [ tomli-w ]; - pyprojectContents = builtins.toJSON pyproject; - passAsFile = [ "pyprojectContents" ]; + inherit pyprojectContents; preferLocalBuild = true; + __structuredAttrs = true; } ) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index fa50aef21339..5dc0d5ac7ebd 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -46,22 +46,16 @@ assert useSDL -> sdl2-compat != null; stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.10.1"; + version = "5.2.11.3"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo="; + hash = "sha256-Nyab9ytqMZT9no2MT0vDe9tDVxXc6dwScHZ1uMVh+nE="; }; - patches = [ - (fetchpatch2 { - name = "Bump-CMake-minimum-version-to-3.5"; - url = "https://github.com/liballeg/allegro5/commit/6e93fcaabaafd81701f4cd1b74f4b69dd598bc9b.patch?full_index=1"; - hash = "sha256-IEnn66bS2m6MVFCNf341yLtd7jTl2gflL5EFJFmbEt4="; - }) - ]; + patches = [ ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index e2cc58b95a9c..03194c9310fc 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -24,8 +24,8 @@ let in { icu78 = make-icu { - version = "78.2"; - hash = "sha256-Pploe1xDXUsgljDi0uu3mQbJhGheeGNQeLZy4DyJ3zU="; + version = "78.3"; + hash = "sha256-Oi56R2BLpwLzRYeDCOb+/sphLuiVz0pfIi55Vfq/4MA="; }; icu77 = make-icu { version = "77.1"; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 43c49639dc2f..f2b3eef531f5 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system numpy, @@ -15,8 +14,10 @@ cvxopt, highspy, osqp, + qdldl, scipy, scs, + sparsediffpy, # tests hypothesis, @@ -27,7 +28,7 @@ buildPythonPackage (finalAttrs: { pname = "cvxpy"; - version = "1.8.2"; + version = "1.9.0"; pyproject = true; __structuredAttrs = true; @@ -35,18 +36,9 @@ buildPythonPackage (finalAttrs: { owner = "cvxpy"; repo = "cvxpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-MDKTuiePzqdIJlTRxbCOxoaEAisGx368iWbwKEB97QU="; + hash = "sha256-48tczmRdNExerlVTNMuRNi1dC5XhUSXNBwIGbJ9vFnU="; }; - patches = [ - # Upstream PR: https://github.com/cvxpy/cvxpy/pull/3290 - (fetchpatch { - name = "highs-1.14.0.patch"; - url = "https://github.com/cvxpy/cvxpy/commit/89f8d337d927457c2e308de8295dd83f274e40e7.patch"; - hash = "sha256-BO878Kz5ZH5FHkxZugzT+n6wjsoOReqCZWM2HDvFqAw="; - }) - ]; - postPatch = # too tight tolerance in tests (AssertionError) '' @@ -68,8 +60,10 @@ buildPythonPackage (finalAttrs: { highspy numpy osqp + qdldl scipy scs + sparsediffpy ]; nativeCheckInputs = [ @@ -86,6 +80,11 @@ buildPythonPackage (finalAttrs: { enabledTestPaths = [ "cvxpy" ]; disabledTests = [ + # Numerical assertions failing + "test_oprelcone_1_m1_k3_real" + "test_oprelcone_1_m3_k1_real" + "test_oprelcone_1_m4_k4_real" + # Disable the slowest benchmarking tests, cuts test time in half "test_tv_inpainting" "test_diffcp_sdp_example" diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index 748b50129472..9db10662aa28 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -46,6 +46,10 @@ buildPythonPackage rec { disabledTests = [ #ValueError: Invalid modulus "test_modulus_verification" + # bcrypt 5.0 rejects test fixture password longer than 72 bytes + "test_compute_v" + "test_generate_v" + "test_srp" ]; pythonImportsCheck = [ "proton" ]; diff --git a/pkgs/development/python-modules/sparsediffpy/default.nix b/pkgs/development/python-modules/sparsediffpy/default.nix new file mode 100644 index 000000000000..5b84d329f292 --- /dev/null +++ b/pkgs/development/python-modules/sparsediffpy/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cmake, + ninja, + numpy, + scikit-build-core, + + # buildInputs + blas, +}: + +buildPythonPackage (finalAttrs: { + pname = "sparsediffpy"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SparseDifferentiation"; + repo = "SparseDiffPy"; + tag = "v${finalAttrs.version}"; + # SparseDiffEngine is built from source and their cmake does not support finding it on the + # system. We fallback to using the git submodule approach for now. + fetchSubmodules = true; + hash = "sha256-4FiObnGIJSSH7BMkKS7y7rc4HYzDgMV7ym+wPZ/KHJ8="; + }; + + build-system = [ + cmake + ninja + numpy + scikit-build-core + ]; + dontUseCmakeConfigure = true; + + buildInputs = [ + blas + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ "sparsediffpy" ]; + + # No tests + doCheck = false; + + meta = { + description = "Python bindings for SparseDiffEngine, a C library for computing sparse Jacobians and Hessians"; + homepage = "https://github.com/SparseDifferentiation/SparseDiffPy"; + changelog = "https://github.com/SparseDifferentiation/SparseDiffPy/blob/${finalAttrs.src.tag}/RELEASES.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/typesense/default.nix b/pkgs/development/python-modules/typesense/default.nix index f3fb86c02caf..78441621aa8d 100644 --- a/pkgs/development/python-modules/typesense/default.nix +++ b/pkgs/development/python-modules/typesense/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "typesense"; - version = "1.3.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "typesense"; repo = "typesense-python"; tag = "v${version}"; - hash = "sha256-b3t4l02tOiSMrkqZACV6l5f+Kb5Wfcnq9ZZCld1SKBU="; + hash = "sha256-vo9DW4kinb00zWW4yX8ibyelQxW3eVabn+oMddPEd18="; }; patches = [ diff --git a/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix b/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix new file mode 100644 index 000000000000..c761d5a1cab3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_duckdb.nix @@ -0,0 +1,126 @@ +{ + lib, + fetchFromGitHub, + writeText, + + postgresqlBuildExtension, + postgresqlTestExtension, + postgresql, + + openssl, + curl, + + cmake, + ninja, + pkg-config, + python3, + git, + which, +}: + +postgresqlBuildExtension (finalAttrs: { + pname = "pg_duckdb"; + version = "1.1.1"; + + # duckdbVersionFull is used to set OVERRIDE_GIT_DESCRIBE, which effectively suppresses + # build script attempts to use git to figure it out. + # To get the version first run `git submodule update --init --recursive` inside pg_duckdb/, + # then run `git describe --tags --long --match "v*.*.*"` inside pg_duckdb/third_party/duckdb + duckdbVersion = "1.4.3"; + duckdbVersionFull = "${finalAttrs.duckdbVersion}-0-gd1dc88f950"; + + src = fetchFromGitHub { + owner = "duckdb"; + repo = "pg_duckdb"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-B/9U1j29zqNMNgK2t2MFJemCrLgQo1qRrCacSjPzYdg="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + git + which + ]; + + # Avoid build errors by suppressing these hooks. + # Extension build scripts drive cmake and ninja themselves. + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + # curl is required by httpfs (duckdb-httpfs/vcpkg.json), but not included in postgresql.buildInputs + buildInputs = postgresql.buildInputs ++ [ + openssl + curl + ]; + + # 1. Disable calling `git submodule update --init --recursive` from Makefile: + # submodules are already in place thanks to fetchFromGitHub's fetchSubmodules option. + # 2. duckdb-httpfs prefers to use vcpkg to build its dependencies (see + # duckdb-httpfs/README.md), but this derivation won't run vcpkg, so the + # libraries are linked dynamically. But because the -lssl and -lcrypto flags + # are missing, libssl/libcrypto symbols can't be resolved during the link time. + postPatch = '' + substituteInPlace Makefile \ + --replace-fail \ + 'git submodule update --init --recursive' \ + 'true' + + substituteInPlace Makefile \ + --replace-fail \ + 'PG_DUCKDB_LINK_FLAGS += -Wl,-rpath,$(PG_LIB)/ -L$(DUCKDB_BUILD_DIR)/src -L$(PG_LIB) -lstdc++ -llz4' \ + 'PG_DUCKDB_LINK_FLAGS += -Wl,-rpath,$(PG_LIB)/ -L$(DUCKDB_BUILD_DIR)/src -L$(PG_LIB) -lstdc++ -llz4 -lssl -lcrypto' + ''; + + # Download httpfs extension source code and override pg_duckdb's attempt to + # get it using git in pg_duckdb_extensions.cmake by using EXTENSION_CONFIGS + httpfsSrc = fetchFromGitHub { + owner = "duckdb"; + repo = "duckdb-httpfs"; + rev = "9c7d34977b10346d0b4cbbde5df807d1dab0b2bf"; + fetchSubmodules = true; + hash = "sha256-/gR99nrks2nRmfk1ypZCSAKpok1DGizXgNz0u5Bw3Jk="; + }; + + makeFlags = + let + httpfsCmake = writeText "pg_duckdb_httpfs.cmake" '' + duckdb_extension_load(httpfs + SOURCE_DIR ${finalAttrs.httpfsSrc} + EXTENSION_VERSION v${finalAttrs.duckdbVersion} + ) + ''; + in + [ + "GEN=ninja" + "DUCKDB_BUILD=ReleaseStatic" + "PG_CONFIG=${postgresql.pg_config}/bin/pg_config" + "DUCKDB_VERSION=v${finalAttrs.duckdbVersionFull}" + "EXTENSION_CONFIGS=${httpfsCmake};../pg_duckdb_extensions.cmake" + ]; + + passthru.tests.extension = postgresqlTestExtension { + inherit (finalAttrs) finalPackage; + postgresqlExtraSettings = '' + shared_preload_libraries = 'pg_duckdb' + ''; + sql = '' + CREATE EXTENSION pg_duckdb; + SELECT duckdb.raw_query('SELECT 42'); + ''; + }; + + meta = { + description = "DuckDB-powered Postgres extension for high-performance analytics"; + homepage = "https://github.com/duckdb/pg_duckdb"; + changelog = "https://github.com/duckdb/pg_duckdb/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ skonotopov ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index fe293b9ce6cb..0a8337229dd0 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.27.0"; + version = "2.27.0-p0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-ytEVnNmLARsDQKqvfuInRf1AZ9vNRdTo0yJBebQqDrg="; + hash = "sha256-R91Xd6bb7iryoqQQUm6LENEOztXNY0dDzizx/72yrxs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ca5f23589c8..81ee52a72dca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1446,6 +1446,7 @@ mapAliases { moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30 moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30 morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26 + move-mount-beneath = throw "move-mount-beneath has been removed, it is now superseded by util-linux's mount"; # Added 2026-05-19 moz-phab = throw "'moz-phab' has been renamed to/replaced by 'mozphab'"; # Converted to throw 2025-10-27 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 mpage = throw "'mpage' has been removed due to being unmaintained and broken"; # Added 2026-05-05 @@ -1702,6 +1703,8 @@ mapAliases { pingvin-share = throw "'pingvin-share' has been removed as it was broken and archived upstream"; # Added 2025-11-08 pipecontrol = throw "'pipecontrol' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03 + plandex = throw "plandex has been removed, as it is not maintained anymore"; # Added 2026-05-18 + plandex-server = throw "plandex has been removed, as it is not maintained anymore"; # Added 2026-05-18 plant-it = throw "plant-it backend was discontinued in september 2025"; # Added 2026-01-30 plant-it-frontend = throw "plant-it-frontend has been presented as being Android-only since the server-side was discontinued in september 2025"; # Added 2026-01-30 plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00b9a8da2bd2..2a22f3575aad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18325,6 +18325,8 @@ self: super: with self; { sparse = callPackage ../development/python-modules/sparse { }; + sparsediffpy = callPackage ../development/python-modules/sparsediffpy { }; + spatial-image = callPackage ../development/python-modules/spatial-image { }; spatialmath-python = callPackage ../development/python-modules/spatialmath-python { };