colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs-bootstrap.master: 0-unstable-2025-03-06 -> 0-unstable-2025-03-08

Browse Source
This commit is contained in:
Colin
2025-03-09 01:10:06 +00:00
parent 7c78ba5776
commit 3080c34398
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/services/ollama.nix
View File

@@ -87,7 +87,7 @@ in
# these acceleration settings are relevant to `desko`. # these acceleration settings are relevant to `desko`.
services.ollama.acceleration = lib.mkIf config.hardware.amdgpu.opencl.enable "rocm"; # AMD GPU acceleration (achieves the same as `nixpkgs.config.rocmSupport = true` but just for ollama) services.ollama.acceleration = lib.mkIf config.hardware.amdgpu.opencl.enable "rocm"; # AMD GPU acceleration (achieves the same as `nixpkgs.config.rocmSupport = true` but just for ollama)
services.ollama.rocmOverrideGfx = "10.1.0"; #< `nix-shell -p "rocmPackages.rocminfo" --run "rocminfo" | grep "gfx"` services.ollama.rocmOverrideGfx = "10.1.0"; #< `nix-shell -p "rocmPackages.rocminfo" --run "rocminfo" | grep "gfx"` (e.g. gfx1010)
# services.ollama.environmentVariables.HCC_AMDGPU_TARGET = "gfx1010"; # seems to be unnecessary # services.ollama.environmentVariables.HCC_AMDGPU_TARGET = "gfx1010"; # seems to be unnecessary
users.groups.ollama = {}; users.groups.ollama = {};

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "25050c9c2a7f603396857cdec1118edd2827db0c"; rev = "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9";
sha256 = "sha256-72uajWbJTG2IVEw1myy/QXUM05YK+hbRJpCSMJ/dyrw="; sha256 = "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=";
version = "0-unstable-2025-03-06"; version = "0-unstable-2025-03-08";
branch = "master"; branch = "master";
} }

34
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -32,34 +32,34 @@ in
./2024-10-01-python-cross-resource-usage.patch ./2024-10-01-python-cross-resource-usage.patch
(fetchpatch' { (fetchpatch' {
# 2025-03-07: i'm testing this patch before merge.
# TODO: check if CapabilityBoundingSet takes effect or is union'd with upstream's
# TODO: test basic functionality
name = "nixos/bluetooth: add systemd hardening";
prUrl = "https://github.com/NixOS/nixpkgs/pull/377927";
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
})
(fetchpatch' {
# 2025-03-07: merged into staging
name = "librsvg: generate loaders.cache even when cross compiling"; name = "librsvg: generate loaders.cache even when cross compiling";
prUrl = "https://github.com/NixOS/nixpkgs/pull/384957"; prUrl = "https://github.com/NixOS/nixpkgs/pull/384957";
hash = "sha256-coDU6CGXtZOO74Eyr+ZxEPKh9oBLWWPHjNBjKMmPYw0="; hash = "sha256-coDU6CGXtZOO74Eyr+ZxEPKh9oBLWWPHjNBjKMmPYw0=";
# saneCommit = "25d740a21c53b9ac2da33571e3fad7e33a765ddf";
# hash = "sha256-PvewYks5P6QX59SG9sEcV89ddJdcNcEO9bB9x05Xgf0=";
}) })
(fetchpatch' { (fetchpatch' {
name = "aerc: make notmuch optional"; # 2024-12-26: required to build ollama (with AMD acceleration)
prUrl = "https://github.com/NixOS/nixpkgs/pull/386733"; name = "rocm-6: bump packages to 6.3.1 and add missing packages";
hash = "sha256-gLxRQ+mF7RTciV7dfVA8ADOyl6u1sv4MW6GzCZDjAdw="; prUrl = "https://github.com/NixOS/nixpkgs/pull/367695";
hash = "sha256-k/jxUUInhCvesF9l4Z1FMTqMaELZR1KSZkR6sQPAu6E=";
}) })
(fetchpatch' { (fetchpatch' {
name = "kiwix-tools: 3.7.0 -> 3.7.0-unstable-2024-12-21 to fix build against kiwix-14.0"; name = "mesa: fix cross compilation";
saneGhCommit = "4ccec684a6f5096e56918758a85a794ad0564157"; prUrl = "https://github.com/NixOS/nixpkgs/pull/388328";
prUrl = "https://github.com/NixOS/nixpkgs/pull/387044"; hash = "sha256-Jy9vMaeFrLjCNCI80YvTrqpSDaWQd/Num+mIRcgXCw4=";
hash = "sha256-s6llAcopDvx7I8ZwzJ4mL+mSo6BWIKDM7gjpzZiMxok=";
}) })
# (fetchpatch' {
# # 2024-12-26: required to build ollama (with AMD acceleration)
# name = "rocm-6: bump packages to 6.3.1 and add missing packages";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/367695";
# # hash = "sha256-6XXgSCXhC5DneSICguPtdnjX00SVJeiHxmJ55MoB+Xs=";
# hash = "sha256-Hzz+aAzdgdnTu4jvLqpHzdIE3xYMP02/EuA+KvFbUeI=";
# })
# (fetchpatch' { # (fetchpatch' {
# # XXX(2025-01-06): patch does not produce valid binaries for cross # # XXX(2025-01-06): patch does not produce valid binaries for cross
# name = "lua-language-server: fix cross compiling"; # name = "lua-language-server: fix cross compiling";

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "fa22578dc252539c2f2533a2e442b61adb65cbca"; rev = "27a49dc3c9a88733aa1d0371ecfec2e13d311347";
sha256 = "sha256-9Qf6E6c4ur0CBlz7mElmQ3VJY+VtnrKHFPpVRisA0vI="; sha256 = "sha256-57oyfjqiAp+wCGFuvPHVzRoft7AFgXLe4xz8Sub60SA=";
version = "0-unstable-2025-03-07"; version = "0-unstable-2025-03-08";
branch = "staging"; branch = "staging";
} }