Merge master into staging-next

authored by nixpkgs-ci[bot] and committed by GitHub de218982 21ec0e38

+322 -165
+1 -1
nixos/tests/k3s/default.nix
··· 8 8 n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success 9 9 ) pkgs; 10 10 in 11 - lib.recurseIntoAttrs { 11 + { 12 12 airgap-images = lib.mapAttrs ( 13 13 _: k3s: import ./airgap-images.nix { inherit system pkgs k3s; } 14 14 ) allK3s;
+17
nixos/tests/stalwart-mail.nix
··· 48 48 session.auth.directory = "'in-memory'"; 49 49 storage.directory = "in-memory"; 50 50 51 + storage.data = "rocksdb"; 52 + storage.fts = "rocksdb"; 53 + storage.blob = "rocksdb"; 54 + storage.lookup = "rocksdb"; 55 + 51 56 session.rcpt.directory = "'in-memory'"; 52 57 queue.outbound.next-hop = "'local'"; 58 + 59 + store."rocksdb" = { 60 + type = "rocksdb"; 61 + path = "/var/lib/stalwart-mail/data"; 62 + compression = "lz4"; 63 + }; 53 64 54 65 directory."in-memory" = { 55 66 type = "memory"; ··· 116 127 main.wait_for_open_port(143) 117 128 118 129 main.succeed("test-smtp-submission") 130 + 131 + # restart stalwart to test rocksdb compaction of existing database 132 + main.succeed("systemctl restart stalwart-mail.service") 133 + main.wait_for_open_port(587) 134 + main.wait_for_open_port(143) 135 + 119 136 main.succeed("test-imap-read") 120 137 ''; 121 138
+4 -4
pkgs/applications/editors/vscode/extensions/default.nix
··· 260 260 mktplcRef = { 261 261 name = "ng-template"; 262 262 publisher = "Angular"; 263 - version = "20.0.0"; 264 - hash = "sha256-87SImzcGbwvf9xtdbD3etqaWe6fMVeCKc+f8qTyFnUA="; 263 + version = "20.0.1"; 264 + hash = "sha256-N+2uNX1gXGHAvkx2aff9DfB7vji8bXNLt86yaSYt0o0="; 265 265 }; 266 266 meta = { 267 267 changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; ··· 1587 1587 # semver scheme, contrary to preview versions which are listed on 1588 1588 # the VSCode Marketplace and use a calver scheme. We should avoid 1589 1589 # using preview versions, because they expire after two weeks. 1590 - version = "17.1.0"; 1591 - hash = "sha256-WPSMf1yLXSDqImpMTxn1eXcSrimVSVjjaXDzFMQ/l0E="; 1590 + version = "17.1.1"; 1591 + hash = "sha256-hlhq4bR3v0AqI3lxilgNEgjjEEBVL0xfvIWbV/Ronh4="; 1592 1592 }; 1593 1593 meta = { 1594 1594 changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
+9
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 1 1 { 2 + "_assert": { 3 + "hash": "sha256-ngHxzV7lRg6pOtyNTdCv3ToRK/vO016Vp2mlh7QT8Rc=", 4 + "homepage": "https://registry.terraform.io/providers/hashicorp/assert", 5 + "owner": "hashicorp", 6 + "repo": "terraform-provider-assert", 7 + "rev": "v0.16.0", 8 + "spdx": "MPL-2.0", 9 + "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0=" 10 + }, 2 11 "aci": { 3 12 "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=", 4 13 "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
+5 -1
pkgs/applications/networking/instant-messengers/discord/linux.nix
··· 66 66 moonlight, 67 67 withTTS ? true, 68 68 enableAutoscroll ? false, 69 + # Disabling this would normally break Discord. 70 + # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means, 71 + # for example if a settings.json is linked declaratively (e.g., with home-manager). 72 + disableUpdates ? true, 69 73 }: 70 74 assert lib.assertMsg ( 71 75 !(withMoonlight && withVencord) ··· 180 184 ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ 181 185 --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ 182 186 --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ 183 - --run "${lib.getExe disableBreakingUpdates}" 187 + ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} 184 188 185 189 ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ 186 190 # Without || true the install would fail on case-insensitive filesystems
+3 -3
pkgs/by-name/de/deno/package.nix
··· 21 21 in 22 22 rustPlatform.buildRustPackage (finalAttrs: { 23 23 pname = "deno"; 24 - version = "2.3.3"; 24 + version = "2.3.5"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "denoland"; 28 28 repo = "deno"; 29 29 tag = "v${finalAttrs.version}"; 30 - hash = "sha256-KfgxKmxkF5/BrAsXkpmyWXV2H+vwX31dnzQORtt3A90="; 30 + hash = "sha256-ASP+1EuGLU9BBY7iBer92AbnVEeQc4nwtOEyULlvc2w="; 31 31 }; 32 32 33 33 useFetchCargoVendor = true; 34 - cargoHash = "sha256-DWODuTslGvx9PHUMsxY+MS15IcECcq7Ne7IUEovWoa0="; 34 + cargoHash = "sha256-XJy7+cARYEX8tAPXLHJnEwXyZIwPaqhM7ZUzoem1Wo0="; 35 35 36 36 postPatch = '' 37 37 # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
+5 -5
pkgs/by-name/ha/hamrs-pro/package.nix
··· 8 8 9 9 let 10 10 pname = "hamrs-pro"; 11 - version = "2.37.1"; 11 + version = "2.38.0"; 12 12 13 13 throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; 14 14 15 15 srcs = { 16 16 x86_64-linux = fetchurl { 17 17 url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage"; 18 - hash = "sha256-kLYgqRH+RpyitUSZVoZFfqVsrJjTXeZp80ILHGQmGTk="; 18 + hash = "sha256-G9zap1AaPZepIajZHbUDMODJ7l+7JSD8oJq7EecmE+M="; 19 19 }; 20 20 21 21 aarch64-linux = fetchurl { 22 22 url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage"; 23 - hash = "sha256-BKS7xPzVoIUToqEbtI+8t4Gf7HvZSWhzfXmToghFPEk="; 23 + hash = "sha256-eVt2ciWFTKJdV0YoQyU98DD90aMUoOWTqzbZ/s0G+0E="; 24 24 }; 25 25 26 26 x86_64-darwin = fetchurl { 27 27 url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg"; 28 - hash = "sha256-gejyYoW7VcR0ILD/PSwFGC2tzLiiR2vjEsErBxbvJ3o="; 28 + hash = "sha256-ggWnB5QcJM9bsOyyVe9dSvOU63hr8heWQTE6ncPgriU="; 29 29 }; 30 30 31 31 aarch64-darwin = fetchurl { 32 32 url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg"; 33 - hash = "sha256-Hi/t5ShfhUFw0aEzb2XIhOIppXg04qnq8tl3LKNH3qQ="; 33 + hash = "sha256-s8Ly1UYBy0EzUCKUCJxx1PcxVQe2gkeuXDudqnSuYjE="; 34 34 }; 35 35 }; 36 36
+3 -3
pkgs/by-name/io/iosevka/package.nix
··· 56 56 57 57 buildNpmPackage rec { 58 58 pname = "Iosevka${toString set}"; 59 - version = "33.2.3"; 59 + version = "33.2.4"; 60 60 61 61 src = fetchFromGitHub { 62 62 owner = "be5invis"; 63 63 repo = "iosevka"; 64 64 rev = "v${version}"; 65 - hash = "sha256-dCHJYGZYTvjDtM2V+NdwXNxHg4kkcVAQD0G3DPtu5ps="; 65 + hash = "sha256-1QxM9PWZirAKIdd/kzHLDStXbkxTGr0q8GQSER2NEXc="; 66 66 }; 67 67 68 - npmDepsHash = "sha256-eqWf5d9uCMkvDNPlICUt7QVT+2WsU0u+TE14ZraWXXE="; 68 + npmDepsHash = "sha256-1XRbwd1x7ofQGnEth7U8QAHX92QDHMm4OmQAQgZZLTw="; 69 69 70 70 nativeBuildInputs = 71 71 [
+4 -3
pkgs/by-name/k9/k9s/package.nix
··· 12 12 13 13 buildGoModule rec { 14 14 pname = "k9s"; 15 - version = "0.50.5"; 15 + version = "0.50.6"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "derailed"; 19 19 repo = "k9s"; 20 20 rev = "v${version}"; 21 - hash = "sha256-hh00R0PCqhAUlwFps40CQ+hc6p2634WEGqNjX1mi/J8="; 21 + hash = "sha256-cL7OD9OtkVx325KcANU8FudcOk6HMct6ve2p0qSkEoc="; 22 22 }; 23 23 24 24 ldflags = [ ··· 33 33 34 34 proxyVendor = true; 35 35 36 - vendorHash = "sha256-g2tS1EpmG+Wba3kF9cH83JAG6EhKK4LrASGUSFtYYY8="; 36 + vendorHash = "sha256-dATWFH5XKicdP8sftGGm2zopTef189MJWd9AM/Gxsjw="; 37 37 38 38 # TODO investigate why some config tests are failing 39 39 doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); ··· 75 75 markus1189 76 76 bryanasdev000 77 77 qjoly 78 + devusb 78 79 ]; 79 80 }; 80 81 }
+40 -15
pkgs/by-name/mi/midisheetmusic/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 mono, 6 - dotnetPackages, 6 + mkNugetDeps, 7 7 makeWrapper, 8 + makeFontsConf, 8 9 gtk2, 9 10 cups, 10 11 timidity, 11 12 }: 12 13 13 14 let 15 + deps = mkNugetDeps { 16 + name = "midisheetmusic-deps"; 17 + nugetDeps = 18 + { fetchNuGet }: 19 + [ 20 + (fetchNuGet { 21 + pname = "NUnit.Console"; 22 + version = "3.0.1"; 23 + hash = "sha256-FkzpEk12msmUp5I05ZzlGiG+UInoYhBmar/vB5Gt4H8="; 24 + }) 25 + (fetchNuGet { 26 + pname = "NUnit"; 27 + version = "2.6.4"; 28 + hash = "sha256-Kkft3QO9T5WwsvyPRNGT2nut7RS7OWArDjIYxvwA8qU="; 29 + }) 30 + ]; 31 + }; 32 + 14 33 version = "2.6"; 15 34 in 16 35 stdenv.mkDerivation { ··· 22 41 sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; 23 42 }; 24 43 25 - nativeCheckInputs = (with dotnetPackages; [ NUnitConsole ]); 26 44 nativeBuildInputs = [ 27 45 mono 28 46 makeWrapper ··· 31 49 buildPhase = '' 32 50 for i in Classes/MidiPlayer.cs Classes/MidiSheetMusic.cs 33 51 do 34 - substituteInPlace $i --replace "/usr/bin/timidity" "${timidity}/bin/timidity" 52 + substituteInPlace $i --replace-fail "/usr/bin/timidity" "${timidity}/bin/timidity" 35 53 done 36 54 37 55 ./build.sh 38 56 ''; 39 57 40 - # include missing file with unit tests for building 41 - # switch from mono nunit dll to standalone dll otherwise mono compiler barks 42 - # run via nunit3 console, because mono nunit console wants access $HOME 58 + doCheck = true; 59 + 43 60 checkPhase = '' 61 + # Resolves the warning "Fontconfig error: No writable cache directories" 62 + export XDG_CACHE_HOME="$(mktemp -d)" 63 + 64 + # Adds one file with tests that's missing from compiliation 65 + # Makes sure NUnit framework from NuGet can be found 44 66 substituteInPlace UnitTestDLL.csproj \ 45 - --replace "</Compile>" '</Compile><Compile Include="Classes\UnitTest.cs"/>' \ 46 - --replace nunit.framework.dll "${dotnetPackages.NUnit}/lib/dotnet/NUnit/nunit.framework.dll" 67 + --replace-fail '</Compile>' '</Compile><Compile Include="Classes\UnitTest.cs"/>' \ 68 + --replace-fail 'nunit.framework.dll' '${deps}/share/nuget/packages/nunit/2.6.4/lib/nunit.framework.dll' 47 69 ./build_unit_test.sh 48 - nunit3-console bin/Debug/UnitTest.dll 70 + 71 + # 2 tests are still failing, we exclude them for now 72 + mono ${deps}/share/nuget/packages/nunit.console/3.0.1/tools/nunit3-console.exe bin/Debug/UnitTest.dll \ 73 + --where "test != 'MidiFileTest.TestChangeSoundTrack' && test != 'MidiFileTest.TestChangeSoundPerChannelTracks'" 49 74 ''; 50 75 51 - # 2 tests of 47 are still failing 52 - doCheck = false; 76 + # This fixes tests that fail because of missing fonts 77 + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; 53 78 54 79 installPhase = '' 55 80 mkdir -p $out/share/applications $out/share/pixmaps $out/bin ··· 69 94 --add-flags $out/bin/.MidiSheetMusic.exe 70 95 ''; 71 96 72 - meta = with lib; { 97 + meta = { 73 98 description = "Convert MIDI Files to Piano Sheet Music for two hands"; 74 99 mainProgram = "midisheetmusic.mono.exe"; 75 100 homepage = "http://midisheetmusic.com"; 76 - license = licenses.gpl2; 77 - maintainers = [ ]; 78 - platforms = platforms.linux; 101 + license = lib.licenses.gpl2; 102 + maintainers = [ lib.maintainers.mdarocha ]; 103 + platforms = lib.platforms.linux; 79 104 }; 80 105 }
+2 -2
pkgs/by-name/ne/netbird/package.nix
··· 31 31 in 32 32 buildGoModule (finalAttrs: { 33 33 pname = "netbird"; 34 - version = "0.45.1"; 34 + version = "0.45.2"; 35 35 36 36 src = fetchFromGitHub { 37 37 owner = "netbirdio"; 38 38 repo = "netbird"; 39 39 tag = "v${finalAttrs.version}"; 40 - hash = "sha256-55Vyhzt0WtJRq9CcH7mXw7cklAce/lvC1S+MBMDnMbo="; 40 + hash = "sha256-lvulqneKFxmZ/EQDmQbx1SzsfZxLb8tGyLFJo8z9U0w="; 41 41 }; 42 42 43 43 vendorHash = "sha256-EVhtxYDinmid5C/3N8UGmCzWw1qIE3m0rXes4uFpcOM=";
+3 -3
pkgs/by-name/ne/netron/package.nix
··· 16 16 in 17 17 buildNpmPackage (finalAttrs: { 18 18 pname = "netron"; 19 - version = "8.3.4"; 19 + version = "8.3.5"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "lutzroeder"; 23 23 repo = "netron"; 24 24 tag = "v${finalAttrs.version}"; 25 - hash = "sha256-P7lv0pnhrdU9zFwCzQYwYilq6qJ1UUaYgVDMiRZP5M8="; 25 + hash = "sha256-YxvUUn8VWv5M6FvIHJCaXQl7PRGcZ8qSgrZ7K0+8iME="; 26 26 }; 27 27 28 - npmDepsHash = "sha256-gPRxgf4XTxIZIKTZbr07zzEJW1n0Waas+zms6Ap6RAY="; 28 + npmDepsHash = "sha256-fsF40qUKUNXeqvdM1m/IEgnxRZrnGW/aOYS3oZKQNpk="; 29 29 30 30 nativeBuildInputs = [ jq ]; 31 31
+3
pkgs/by-name/ny/nyan/package.nix
··· 20 20 hash = "sha256-BtvMZaQutcPqTSCN5gxYUU3CQTyCns1ldkcnjwJOFa8="; 21 21 }; 22 22 23 + strictDeps = true; 24 + 23 25 nativeBuildInputs = [ 24 26 clang 25 27 cmake 28 + flex 26 29 ]; 27 30 28 31 buildInputs = [
+15 -9
pkgs/by-name/op/opshin/package.nix
··· 4 4 python3, 5 5 }: 6 6 7 - python3.pkgs.buildPythonApplication rec { 7 + let 8 + python3' = python3.override { 9 + self = python3; 10 + packageOverrides = ( 11 + final: prev: { 12 + cbor2 = prev.cbor2WithoutCExtensions; 13 + } 14 + ); 15 + }; 16 + in 17 + 18 + python3'.pkgs.buildPythonApplication rec { 8 19 pname = "opshin"; 9 - version = "0.24.1"; 20 + version = "0.24.2"; 10 21 11 22 format = "pyproject"; 12 23 ··· 14 25 owner = "OpShin"; 15 26 repo = "opshin"; 16 27 tag = version; 17 - hash = "sha256-+uuTEszA5p/qhvthM3Uje6yX3urbIUAKKfDZ4JXEYYQ="; 28 + hash = "sha256-L0vWEXlghXssT9oUw5AYG3/4ALoB/NH90JV8Kdl2n30="; 18 29 }; 19 30 20 - propagatedBuildInputs = with python3.pkgs; [ 31 + propagatedBuildInputs = with python3'.pkgs; [ 21 32 setuptools 22 33 poetry-core 23 34 uplc ··· 26 37 frozenlist2 27 38 astunparse 28 39 ordered-set 29 - ]; 30 - 31 - pythonRelaxDeps = [ 32 - "pluthon" 33 - "uplc" 34 40 ]; 35 41 36 42 meta = with lib; {
+5 -4
pkgs/by-name/re/readest/package.nix
··· 20 20 21 21 rustPlatform.buildRustPackage (finalAttrs: { 22 22 pname = "readest"; 23 - version = "0.9.43"; 23 + version = "0.9.51"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "readest"; 27 27 repo = "readest"; 28 28 tag = "v${finalAttrs.version}"; 29 - hash = "sha256-9ACeMGbOpa3Nh6NQIGckcI2oYNjtQ1pE4Zn++qcE0tM="; 29 + hash = "sha256-UJ4H+pBR+EWr2O34WUmbF2rd3pTVssE/8b9iO9bbx7Y="; 30 30 fetchSubmodules = true; 31 31 }; 32 32 ··· 39 39 40 40 pnpmDeps = pnpm_9.fetchDeps { 41 41 inherit (finalAttrs) pname version src; 42 - hash = "sha256-ozRDNXWqg0CZ1IgU33C6yJu4e05010jsHeTdIVhB72M="; 42 + hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64="; 43 43 }; 44 44 45 45 pnpmRoot = "../.."; ··· 60 60 --replace-fail '"Readest"' '"readest"' 61 61 jq 'del(.plugins."deep-link")' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json 62 62 substituteInPlace src/services/constants.ts \ 63 - --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" 63 + --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" \ 64 + --replace-fail "telemetryEnabled: true" "telemetryEnabled: false" 64 65 ''; 65 66 66 67 nativeBuildInputs = [
+3 -3
pkgs/by-name/ru/ruff/package.nix
··· 16 16 17 17 rustPlatform.buildRustPackage (finalAttrs: { 18 18 pname = "ruff"; 19 - version = "0.11.11"; 19 + version = "0.11.12"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "astral-sh"; 23 23 repo = "ruff"; 24 24 tag = finalAttrs.version; 25 - hash = "sha256-PPryfsdge0kOb7RyEkGl7c3pFucRzt0+9tACet3nDGM="; 25 + hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU"; 26 26 }; 27 27 28 28 cargoBuildFlags = [ "--package=ruff" ]; 29 29 30 30 useFetchCargoVendor = true; 31 - cargoHash = "sha256-LAEuoGTvSXXtx74t1OX+TaGxgvI8UAB3bM+fwiSfFws="; 31 + cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs"; 32 32 33 33 nativeBuildInputs = [ installShellFiles ]; 34 34
+2 -2
pkgs/by-name/sn/snakemake/package.nix
··· 10 10 11 11 python3Packages.buildPythonApplication rec { 12 12 pname = "snakemake"; 13 - version = "9.5.0"; 13 + version = "9.5.1"; 14 14 pyproject = true; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "snakemake"; 18 18 repo = "snakemake"; 19 19 tag = "v${version}"; 20 - hash = "sha256-rZTx/ZDAaZ579u7ef18qlTUtg1ieWd9sF9UXvEOyLMk="; 20 + hash = "sha256-cSFqPSLeM7hw1bxQZ2FhlHUP+O3iyrwBz4+Jz90Zck8="; 21 21 }; 22 22 23 23 postPatch = ''
+20 -3
pkgs/by-name/st/stalwart-mail/package.nix
··· 9 9 sqlite, 10 10 foundationdb, 11 11 zstd, 12 + rust-jemalloc-sys-unprefixed, 12 13 stdenv, 13 14 nix-update-script, 14 15 nixosTests, ··· 18 19 stalwartEnterprise ? false, 19 20 }: 20 21 22 + let 23 + rocksdbJemalloc = rocksdb.override { enableJemalloc = true; }; 24 + in 21 25 rustPlatform.buildRustPackage (finalAttrs: { 22 26 pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); 23 27 version = "0.11.8"; ··· 29 33 hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4="; 30 34 }; 31 35 36 + # rocksdb does not properly distinguish between pointers it has allocated itself 37 + # and pointers which were passed in and might be registered with a different 38 + # allocator, so we enable the unprefixed_malloc_on_supported_platforms to use 39 + # jemalloc implicitly in the entire process. 40 + postPatch = '' 41 + for file in crates/main/Cargo.toml tests/Cargo.toml; do 42 + substituteInPlace $file --replace-fail \ 43 + 'jemallocator = "0.5.0"' 'jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }' 44 + done 45 + ''; 46 + 32 47 useFetchCargoVendor = true; 33 48 cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ="; 34 49 ··· 43 58 openssl 44 59 sqlite 45 60 zstd 61 + rust-jemalloc-sys-unprefixed 62 + rocksdbJemalloc 46 63 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; 47 64 48 65 # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 ··· 63 80 env = { 64 81 OPENSSL_NO_VENDOR = true; 65 82 ZSTD_SYS_USE_PKG_CONFIG = true; 66 - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; 67 - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; 83 + ROCKSDB_INCLUDE_DIR = "${rocksdbJemalloc}/include"; 84 + ROCKSDB_LIB_DIR = "${rocksdbJemalloc}/lib"; 68 85 }; 69 86 70 87 postInstall = '' ··· 151 168 __darwinAllowLocalNetworking = true; 152 169 153 170 passthru = { 154 - inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts) 171 + rocksdb = rocksdbJemalloc; # make used rocksdb version available (e.g., for backup scripts) 155 172 webadmin = callPackage ./webadmin.nix { }; 156 173 updateScript = nix-update-script { }; 157 174 tests.stalwart-mail = nixosTests.stalwart-mail;
+13 -13
pkgs/by-name/sw/sweet/package.nix
··· 30 30 stdenvNoCC.mkDerivation 31 31 (finalAttrs: { 32 32 inherit pname; 33 - version = "5.0"; 33 + version = "6.0"; 34 34 35 35 srcs = [ 36 36 (fetchurl { 37 37 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.tar.xz"; 38 - hash = "sha256-fCCkkEYr4XPnP5aPrs3HAwIwM/Qb0NFY8Rf1ABu0ygY="; 38 + hash = "sha256-LufK9MexE6YMuVniyfcNNaPfVLBMHnNmWBBNnGA2nUo="; 39 39 }) 40 40 (fetchurl { 41 41 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.tar.xz"; 42 - hash = "sha256-xMAqUsol1FPeFoq8KLTmKCeZMF34FDAjhiagsRmjGT8="; 42 + hash = "sha256-J0YOADP4FXKYMl/Nn70clD3h7Y5LtlTfWV9VLsWL9yo="; 43 43 }) 44 44 (fetchurl { 45 45 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.tar.xz"; 46 - hash = "sha256-JlpomJ8Ao4bJFJbCDliRtxNckEG3LzINBqhWzfTARJs="; 46 + hash = "sha256-HH9oZQ+F1nFhIJyP9d9W2CL+mA0bolq5GiNQtKQgrZk="; 47 47 }) 48 48 (fetchurl { 49 49 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.tar.xz"; 50 - hash = "sha256-HKJ/Ca5cy91kJZVEETyMcOcrgLliHF/S2rdBmWfKi08="; 50 + hash = "sha256-2dcryd5Zj+Iu3R4jR++uJtyToGNoa1LtTpN1G6+kBRw="; 51 51 }) 52 52 (fetchurl { 53 53 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.tar.xz"; 54 - hash = "sha256-0LjARDbSPyQWN5nT97k2c//eebxhgStGYsebpNQn9+w="; 54 + hash = "sha256-mpShu1fmBajl/wzlnu9zBWkskMlza5nEVS3u8Sh3b7s="; 55 55 }) 56 56 (fetchurl { 57 57 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.tar.xz"; 58 - hash = "sha256-UjH4popJCqQ18HZUngsO6cE4axSAM7/EXwM8nHAdVS4="; 58 + hash = "sha256-wcbJW6MUctGSM8GW1ouLvUCmdcDHQkjTw9h0foRBgTg="; 59 59 }) 60 60 (fetchurl { 61 61 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.tar.xz"; 62 - hash = "sha256-4/e81slrkcO3WdrQ2atGHdZsErlzme4mRImfLvmGJnQ="; 62 + hash = "sha256-aYPjnOEZMN9mPvnhK3eoCm1ybUxKPqPSoOL+kwsZsG4="; 63 63 }) 64 64 (fetchurl { 65 65 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.tar.xz"; 66 - hash = "sha256-Tv+xtUee1TIdRLlnP84aVfk+V6xgeeeICRZCdeSSjE8="; 66 + hash = "sha256-Ej9p7/txrMhGUCyDTAEQHIS/pi92pfLrCV1L4HxWdZk="; 67 67 }) 68 68 (fetchurl { 69 69 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.tar.xz"; 70 - hash = "sha256-FmJoPeQ8iLA6X6lFawBqG8lviQXWBHG5lgQsZvU68BM="; 70 + hash = "sha256-AKTNa6FHlPr1ZqlK5QYZzXRiPb5Nmzw2lTSNcWAtMAg="; 71 71 }) 72 72 (fetchurl { 73 73 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.tar.xz"; 74 - hash = "sha256-bqL9jR8yPF9ZnEZ1O+P3/e6E59m+MY7mQNT3BhYVhu4="; 74 + hash = "sha256-bCL/DqiQGiHR24aaPtPyJKAkk8X+DyMxYeYuFJBuK6Y="; 75 75 }) 76 76 (fetchurl { 77 77 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.tar.xz"; 78 - hash = "sha256-Oesx/McKmTlqwJX8u6RrV3AtOIB73BQveD8slbD14js="; 78 + hash = "sha256-1kHWoK9r3mRYIkizekVVYyFpWXU78BExKuNUsRB4uv4="; 79 79 }) 80 80 (fetchurl { 81 81 url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.tar.xz"; 82 - hash = "sha256-m0tQHV/3UkDoOAmBZF6Nvugj6fEkmLbeLPdQ/IFkHOo="; 82 + hash = "sha256-WzsquuUreT7b6TA6qGSYqGVrVWlIdQjlIdqWGMNJFpo="; 83 83 }) 84 84 ]; 85 85
+3
pkgs/by-name/ta/tailscale/package.nix
··· 149 149 150 150 # context deadline exceeded 151 151 "TestPacketFilterFromNetmap" 152 + 153 + # flaky: https://github.com/tailscale/tailscale/issues/15348 154 + "TestSafeFuncHappyPath" 152 155 ] 153 156 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 154 157 # syscall default route interface en0 differs from netstat
+6 -5
pkgs/by-name/ud/udevCheckHook/package.nix
··· 2 2 lib, 3 3 makeSetupHook, 4 4 systemdMinimal, 5 - udev, 6 5 stdenv, 7 6 }: 8 7 let 9 8 # udev rules can only be checked if systemd (specifically, 'udevadm') can be executed on build platform 10 - # if udev is not available on hostPlatform, there is no point in checking rules 11 - applyHook = 12 - lib.meta.availableOn stdenv.hostPlatform udev 13 - && lib.meta.availableOn stdenv.buildPlatform systemdMinimal; 9 + # If cross-compiling linux -> non-linux, udev rules are still checked, even if they end up being unused. 10 + # This is not a problem: 11 + # - If there are no udev rules, the hook is a noop 12 + # - If the udev rules are broken, they should be flagged as such 13 + # - if rules are not needed on a target platform where they are broken, they should be deleted from package output 14 + applyHook = lib.meta.availableOn stdenv.buildPlatform systemdMinimal; 14 15 in 15 16 makeSetupHook { 16 17 name = "udev-check-hook";
+2 -2
pkgs/by-name/vs/vsce/package.nix
··· 12 12 13 13 buildNpmPackage (finalAttrs: { 14 14 pname = "vsce"; 15 - version = "3.4.1"; 15 + version = "3.4.2"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "microsoft"; 19 19 repo = "vscode-vsce"; 20 20 rev = "v${finalAttrs.version}"; 21 - hash = "sha256-ufSEKkLqP+D/D5l5teL82RsoVgIFhbyOVjnZfnecsKI="; 21 + hash = "sha256-T3uboozO4YRA8qqu833pIFt4yzIYRBZQdm8nawEZo2s="; 22 22 }; 23 23 24 24 npmDepsHash = "sha256-J7ES/a6RHeTY1grdzgYu9ex7BOzadqng2/h2LlTZLns=";
+9 -9
pkgs/by-name/wi/windsurf/info.json
··· 1 1 { 2 2 "aarch64-darwin": { 3 - "version": "1.9.0", 3 + "version": "1.9.2", 4 4 "vscodeVersion": "1.99.1", 5 - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-arm64-1.9.0.zip", 6 - "sha256": "44706f90321bdc4c2a2320a03c79fdd01c911236daa4cc675c597851974a268c" 5 + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-darwin-arm64-1.9.2.zip", 6 + "sha256": "b3edf57d19fab5ceac0cd3daee3c54052e503b052efebad0b6bfeac3b9f5a979" 7 7 }, 8 8 "x86_64-darwin": { 9 - "version": "1.9.0", 9 + "version": "1.9.2", 10 10 "vscodeVersion": "1.99.1", 11 - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-x64-1.9.0.zip", 12 - "sha256": "ae398d597cd143144c2bdc8bf0a853a1c57b6de2c86c95087a4be5db78252e75" 11 + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-darwin-x64-1.9.2.zip", 12 + "sha256": "227ed7b01b9f7637d126ef880b6e0c07daa263b0740e6394e32ad4ebedd05d78" 13 13 }, 14 14 "x86_64-linux": { 15 - "version": "1.9.0", 15 + "version": "1.9.2", 16 16 "vscodeVersion": "1.99.1", 17 - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-linux-x64-1.9.0.tar.gz", 18 - "sha256": "941640e3514a5ee524943135b439219243adb288fec484712ebc2935173aa938" 17 + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-linux-x64-1.9.2.tar.gz", 18 + "sha256": "ee5a4ac38f9a2518a54429cb235bae76d74b3fff0f5947dbfc29738d78f28542" 19 19 } 20 20 }
+23
pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix
··· 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + mkYaziPlugin, 5 + }: 6 + mkYaziPlugin { 7 + pname = "yatline-githead.yazi"; 8 + version = "0-unstable-2025-05-31"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "imsi32"; 12 + repo = "yatline-githead.yazi"; 13 + rev = "f8f969e84c39ad4215334ea5012183a2a5a6160b"; 14 + hash = "sha256-Cs8zSYtUfdCmKwIkJwQGyQNeSOmmpPvObCMnGm+32zg="; 15 + }; 16 + 17 + meta = { 18 + description = "githead.yazi with yatline.yazi support"; 19 + homepage = "https://github.com/imsi32/yatline-githead.yazi"; 20 + license = lib.licenses.mit; 21 + maintainers = with lib.maintainers; [ khaneliman ]; 22 + }; 23 + }
+3 -3
pkgs/by-name/ya/yazi/plugins/yatline/default.nix
··· 5 5 }: 6 6 mkYaziPlugin { 7 7 pname = "yatline.yazi"; 8 - version = "0-unstable-2025-04-22"; 8 + version = "0-unstable-2025-05-31"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "imsi32"; 12 12 repo = "yatline.yazi"; 13 - rev = "2ecf715d33866e5f8a63af25f6a242821746ddb7"; 14 - hash = "sha256-l4IrdALlgKd1USxE2+bD0Lkw3DgBoQDBxgxevrFhytU="; 13 + rev = "4872af0da53023358154c8233ab698581de5b2b2"; 14 + hash = "sha256-7uk8QXAlck0/4bynPdh/m7Os2ayW1UXbELmusPqRmf4="; 15 15 }; 16 16 17 17 meta = {
+9
pkgs/by-name/ye/yetris/package.nix
··· 17 17 hash = "sha256-k9CXXIaDk1eAtRBEj0VCfE+D1FtmIDX3niubAdrfjqw="; 18 18 }; 19 19 20 + postPatch = '' 21 + substituteInPlace src/Game/Entities/RotationSystemSRS.cpp \ 22 + --replace-fail 'char' 'signed char' 23 + substituteInPlace src/Game/Entities/PieceDefinitions.cpp \ 24 + --replace-fail 'char' 'signed char' 25 + substituteInPlace src/Game/Entities/PieceDefinitions.hpp \ 26 + --replace-fail 'char' 'signed char' 27 + ''; 28 + 20 29 buildInputs = [ 21 30 ncurses 22 31 ];
+2 -2
pkgs/development/beam-modules/ex_doc/default.nix
··· 14 14 15 15 let 16 16 pname = "ex_doc"; 17 - version = "0.38.1"; 17 + version = "0.38.2"; 18 18 src = fetchFromGitHub { 19 19 owner = "elixir-lang"; 20 20 repo = "${pname}"; 21 21 rev = "v${version}"; 22 - hash = "sha256-lsz+r/7Pre15qWOqla9j712I6HExyHfvBfupmKuePmI="; 22 + hash = "sha256-Qv1vDfDGquWoem42IqA8lDiFWEtznT7ONIXSOCvn39g="; 23 23 }; 24 24 in 25 25 mixRelease {
+2 -2
pkgs/development/python-modules/aider-chat/default.nix
··· 126 126 d.stopwords 127 127 ]); 128 128 129 - version = "0.83.2"; 129 + version = "0.84.0"; 130 130 aider-chat = buildPythonPackage { 131 131 pname = "aider-chat"; 132 132 inherit version; ··· 139 139 owner = "Aider-AI"; 140 140 repo = "aider"; 141 141 tag = "v${version}"; 142 - hash = "sha256-fVysmaB2jGS2XJlxyFIdJmQShzxz2q4TQf8zNuCT2GE="; 142 + hash = "sha256-TOlqwJM9wIAURSimuh9mysYDwgH9AfFev8jY9elLNk8="; 143 143 }; 144 144 145 145 pythonRelaxDeps = true;
+10
pkgs/development/python-modules/cbor2/default.nix
··· 4 4 fetchPypi, 5 5 pythonOlder, 6 6 7 + withCExtensions ? true, 8 + 7 9 # build-system 8 10 setuptools, 9 11 setuptools-scm, ··· 38 40 pytest-cov-stub 39 41 pytestCheckHook 40 42 ]; 43 + 44 + env = lib.optionalAttrs (!withCExtensions) { 45 + CBOR2_BUILD_C_EXTENSION = "0"; 46 + }; 47 + 48 + passthru = { 49 + inherit withCExtensions; 50 + }; 41 51 42 52 meta = with lib; { 43 53 changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
+2 -14
pkgs/development/python-modules/msmart-ng/default.nix
··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchFromGitHub, 5 - fetchpatch2, 6 5 7 6 # build-system 8 7 setuptools, ··· 18 17 19 18 buildPythonPackage rec { 20 19 pname = "msmart-ng"; 21 - version = "2025.3.3"; 20 + version = "2025.5.1"; 22 21 pyproject = true; 23 22 24 23 src = fetchFromGitHub { 25 24 owner = "mill1000"; 26 25 repo = "midea-msmart"; 27 26 tag = version; 28 - hash = "sha256-M8Gl6QXj0tRN7VFDhop47vINk8MeWSyCJ9bboo3j8Go="; 27 + hash = "sha256-dZD93ZZiQLmWuMAR/nnYB7oGBBYr4YPEi+LdpSzweVc="; 29 28 }; 30 - 31 - patches = [ 32 - (fetchpatch2 { 33 - # Revert <https://github.com/mill1000/midea-msmart/pull/209> until setuptools 34 - # implements support for <https://peps.python.org/pep-0639/>. 35 - name = "revert-pyproject-license-declaration-pep639-syntax.patch"; 36 - url = "https://github.com/mill1000/midea-msmart/commit/e5d6a982135e497c251095e421d3de4686f36056.patch?full_index=1"; 37 - hash = "sha256-+mxmFGZd04MZY2C5eo4k1lFoXsM8XyeJNazShnjAseE="; 38 - revert = true; 39 - }) 40 - ]; 41 29 42 30 build-system = [ 43 31 setuptools
+2 -2
pkgs/development/python-modules/pluthon/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "pluthon"; 15 - version = "1.0.0"; 15 + version = "1.1.0"; 16 16 17 17 format = "pyproject"; 18 18 ··· 20 20 owner = "OpShin"; 21 21 repo = "pluthon"; 22 22 rev = version; 23 - hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4="; 23 + hash = "sha256-t8KWm2eBq6CzFPAWN9pgbpF62hvNNZWCpphJsY5T2OQ="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+7 -3
pkgs/development/python-modules/pycardano/default.nix
··· 25 25 }: 26 26 27 27 let 28 - cose_0_9_dev8 = cose.overridePythonAttrs (old: rec { 28 + cose_0_9_dev8 = (cose.override { inherit cbor2; }).overridePythonAttrs (old: rec { 29 29 version = "0.9.dev8"; 30 30 src = ( 31 31 old.src.override { ··· 38 38 in 39 39 buildPythonPackage rec { 40 40 pname = "pycardano"; 41 - version = "0.12.3"; 41 + version = "0.14.0"; 42 42 pyproject = true; 43 43 44 44 src = fetchFromGitHub { 45 45 owner = "Python-Cardano"; 46 46 repo = "pycardano"; 47 47 tag = "v${version}"; 48 - hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI="; 48 + hash = "sha256-W5N254tND7mI0oR82YhMFWn4zVVs3ygYOqXOBMO3sXY="; 49 49 }; 50 50 51 51 build-system = [ ··· 88 88 homepage = "https://github.com/Python-Cardano/pycardano"; 89 89 license = lib.licenses.mit; 90 90 maintainers = with lib.maintainers; [ t4ccer ]; 91 + # https://github.com/Python-Cardano/pycardano/blob/v0.13.2/Makefile#L26-L39 92 + # cbor2 with C extensions fail tests due to differences in used sized vs unsized arrays 93 + # more info: https://github.com/NixOS/nixpkgs/pull/402433#issuecomment-2916520286 94 + broken = cbor2.withCExtensions; # consider overriding cbor2 with cbor2WithoutCExtensions 91 95 }; 92 96 }
+7 -4
pkgs/development/python-modules/pymupdf/default.nix
··· 6 6 fetchFromGitHub, 7 7 fetchpatch, 8 8 python, 9 + toPythonModule, 9 10 10 11 # build-system 11 12 libclang, ··· 40 41 enableBarcode = true; 41 42 python3 = python; 42 43 }; 44 + mupdf-cxx-lib = toPythonModule (lib.getLib mupdf-cxx); 45 + mupdf-cxx-dev = lib.getDev mupdf-cxx; 43 46 in 44 47 buildPythonPackage rec { 45 48 pname = "pymupdf"; ··· 77 80 gumbo 78 81 ]; 79 82 80 - propagatedBuildInputs = [ mupdf-cxx ]; 83 + propagatedBuildInputs = [ mupdf-cxx-lib ]; 81 84 82 85 env = { 83 86 # force using system MuPDF (must be defined in environment and empty) ··· 85 88 # Setup the name of the package away from the default 'libclang' 86 89 PYMUPDF_SETUP_LIBCLANG = "clang"; 87 90 # provide MuPDF paths 88 - PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib"; 89 - PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include"; 91 + PYMUPDF_MUPDF_LIB = "${mupdf-cxx-lib}/lib"; 92 + PYMUPDF_MUPDF_INCLUDE = "${mupdf-cxx-dev}/include"; 90 93 }; 91 94 92 95 # TODO: manually add mupdf rpath until upstream fixes it 93 96 postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' 94 97 for lib in */*.so $out/${python.sitePackages}/*/*.so; do 95 - install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" 98 + install_name_tool -add_rpath ${mupdf-cxx-lib}/lib "$lib" 96 99 done 97 100 ''; 98 101
+13 -2
pkgs/development/python-modules/uplc/default.nix
··· 8 8 setuptools, 9 9 poetry-core, 10 10 frozendict, 11 + cbor2WithoutCExtensions, 11 12 cbor2, 12 13 rply, 13 14 pycardano, 15 + uplc, 14 16 }: 15 17 16 18 buildPythonPackage rec { 17 19 pname = "uplc"; 18 - version = "1.0.7"; 20 + version = "1.0.10"; 19 21 20 22 format = "pyproject"; 21 23 ··· 23 25 owner = "OpShin"; 24 26 repo = "uplc"; 25 27 tag = version; 26 - hash = "sha256-xK2k0XLybWqyP5Qa2Oby8YBgiiswR++yVK7NPgpdSa0="; 28 + hash = "sha256-Owo4W4jChrdYnz11BbWQdm2SiwFwOJlqjYutuRyjpxs="; 27 29 }; 28 30 29 31 propagatedBuildInputs = [ ··· 37 39 python-secp256k1-cardano 38 40 ]; 39 41 42 + # Support cbor2 without C extensions 43 + postPatch = lib.optionalString (!cbor2.withCExtensions) '' 44 + substituteInPlace uplc/ast.py --replace-fail 'from _cbor2' 'from cbor2' 45 + ''; 46 + 40 47 pythonImportsCheck = [ "uplc" ]; 48 + 49 + passthru.tests.withoutCExtensions = uplc.override { 50 + cbor2 = cbor2WithoutCExtensions; 51 + }; 41 52 42 53 meta = with lib; { 43 54 description = "Python implementation of untyped plutus language core";
+29 -20
pkgs/development/python-modules/uv/default.nix
··· 1 1 { 2 2 buildPythonPackage, 3 - installShellFiles, 4 - rustPlatform, 5 - pkgs, 6 - versionCheckHook, 3 + hatchling, 4 + lib, 5 + uv, 7 6 }: 8 7 9 8 buildPythonPackage { 10 - inherit (pkgs.uv) 9 + inherit (uv) 11 10 pname 12 11 version 13 12 src 14 - cargoDeps 15 13 meta 16 - cargoBuildFlags 17 - postInstall 18 - versionCheckProgramArg 19 14 ; 15 + pyproject = true; 20 16 21 - postPatch = '' 22 - substituteInPlace python/uv/_find_uv.py \ 23 - --replace-fail '"""Return the uv binary path."""' "return '$out/bin/uv'" 24 - ''; 17 + build-system = [ hatchling ]; 18 + 19 + postPatch = 20 + # Do not rely on path lookup at runtime to find the uv binary. 21 + # Use the propagated binary instead. 22 + '' 23 + substituteInPlace python/uv/_find_uv.py \ 24 + --replace-fail '"""Return the uv binary path."""' "return '${lib.getExe uv}'" 25 + '' 26 + # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs, 27 + # to avoid rebuilding the uv binary for every active python package set. 28 + + '' 29 + substituteInPlace pyproject.toml \ 30 + --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \ 31 + --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"' 25 32 26 - nativeBuildInputs = [ 27 - installShellFiles 28 - rustPlatform.cargoSetupHook 29 - rustPlatform.maturinBuildHook 30 - ]; 33 + cat >> pyproject.toml <<EOF 34 + [tool.hatch.build] 35 + packages = ['python/uv'] 31 36 32 - nativeCheckInputs = [ versionCheckHook ]; 37 + EOF 38 + ''; 33 39 34 - pyproject = true; 40 + postInstall = '' 41 + mkdir -p $out/bin && ln -s ${lib.getExe uv} $out/bin/uv 42 + ''; 43 + 35 44 pythonImportsCheck = [ "uv" ]; 36 45 }
+29 -20
pkgs/development/python-modules/weasyprint/default.nix
··· 1 1 { 2 - stdenv, 3 2 lib, 3 + stdenv, 4 4 pkgs, 5 5 buildPythonPackage, 6 - cffi, 7 - cssselect2, 8 - fetchPypi, 9 - flit-core, 6 + fetchFromGitHub, 10 7 fontconfig, 11 - fonttools, 12 8 glib, 13 9 harfbuzz, 14 10 pango, 11 + 12 + # build-system 13 + flit-core, 14 + 15 + # dependencies 16 + cffi, 17 + cssselect2, 18 + fonttools, 15 19 pillow, 16 20 pydyf, 17 21 pyphen, 22 + tinycss2, 23 + tinyhtml5, 24 + 25 + # tests 18 26 pytest-cov-stub, 19 27 pytestCheckHook, 20 - pythonOlder, 21 28 replaceVars, 22 - tinycss2, 23 - tinyhtml5, 29 + versionCheckHook, 30 + writableTmpDirAsHomeHook, 24 31 }: 25 32 26 33 buildPythonPackage rec { ··· 28 35 version = "65.1"; 29 36 pyproject = true; 30 37 31 - disabled = pythonOlder "3.9"; 32 - 33 - src = fetchPypi { 34 - inherit version; 35 - pname = "weasyprint"; 36 - hash = "sha256-EgKBvb1C/6p9flztvjGCos7zbqWtl/6fNX5DvmoeWOo="; 38 + src = fetchFromGitHub { 39 + owner = "Kozea"; 40 + repo = "WeasyPrint"; 41 + tag = "v${version}"; 42 + hash = "sha256-iSeuRX1dnnrGZbcb1yTxOJPD5kgIWY6oz/0v02QJqSs="; 37 43 }; 38 44 39 45 patches = [ ··· 64 70 pkgs.ghostscript 65 71 pytest-cov-stub 66 72 pytestCheckHook 73 + versionCheckHook 74 + writableTmpDirAsHomeHook 67 75 ]; 76 + versionCheckProgramArg = "--version"; 68 77 69 78 disabledTests = [ 70 79 # needs the Ahem font (fails on macOS) ··· 93 102 # Set env variable explicitly for Darwin, but allow overriding when invoking directly 94 103 makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ]; 95 104 96 - preCheck = '' 97 - # Fontconfig wants to create a cache. 98 - export HOME=$TMPDIR 99 - ''; 100 - 101 105 pythonImportsCheck = [ "weasyprint" ]; 102 106 103 107 meta = { ··· 107 111 homepage = "https://weasyprint.org/"; 108 112 license = lib.licenses.bsd3; 109 113 teams = [ lib.teams.apm ]; 114 + badPlatforms = [ 115 + # Fatal Python error: Segmentation fault 116 + # "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset 117 + lib.systems.inspect.patterns.isDarwin 118 + ]; 110 119 }; 111 120 }
+2 -2
pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
··· 8 8 buildHomeAssistantComponent rec { 9 9 owner = "mill1000"; 10 10 domain = "midea_ac"; 11 - version = "2025.4.0"; 11 + version = "2025.5.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "mill1000"; 15 15 repo = "midea-ac-py"; 16 16 tag = version; 17 - hash = "sha256-ZkLC0GhfN+jp1DWv30LNVCP+NEZywt9Pxycs2RWBzrM="; 17 + hash = "sha256-6CNxhgygAyzpy3idj3RkVvI8WMHCfar9v0GG21Y7YKE="; 18 18 }; 19 19 20 20 dependencies = [ msmart-ng ];
+5 -1
pkgs/top-level/python-packages.nix
··· 2300 2300 2301 2301 cbor2 = callPackage ../development/python-modules/cbor2 { }; 2302 2302 2303 + cbor2WithoutCExtensions = callPackage ../development/python-modules/cbor2 { 2304 + withCExtensions = false; 2305 + }; 2306 + 2303 2307 cccolutils = callPackage ../development/python-modules/cccolutils { krb5-c = pkgs.krb5; }; 2304 2308 2305 2309 cdcs = callPackage ../development/python-modules/cdcs { }; ··· 18668 18672 18669 18673 uuid6 = callPackage ../development/python-modules/uuid6 { }; 18670 18674 18671 - uv = callPackage ../development/python-modules/uv { }; 18675 + uv = callPackage ../development/python-modules/uv { inherit (pkgs) uv; }; 18672 18676 18673 18677 uv-build = callPackage ../development/python-modules/uv-build { }; 18674 18678