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

nixpkgs: 0-unstable-2024-12-30 -> 0-unstable-2025-01-01

Browse Source
This commit is contained in:
Colin
2025-01-02 00:14:39 +00:00
parent 05a7bad26c
commit 0de134e208
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/by-name/desko/default.nix
View File

@@ -52,7 +52,8 @@
# needed to use libimobiledevice/ifuse, for iphone sync # needed to use libimobiledevice/ifuse, for iphone sync
services.usbmuxd.enable = true; services.usbmuxd.enable = true;
hardware.amdgpu.opencl.enable = true; # desktop (AMD's opencl implementation AKA "ROCM"); probably required for ollama # TODO(2025-01-01): re-enable once rocm build is fixed: <https://github.com/NixOS/nixpkgs/pull/367695>
# hardware.amdgpu.opencl.enable = true; # desktop (AMD's opencl implementation AKA "ROCM"); probably required for ollama
# TODO: enable snapper (need to make `/nix` or `/nix/persist` a subvolume, somehow). # TODO: enable snapper (need to make `/nix` or `/nix/persist` a subvolume, somehow).
# default config: https://man.archlinux.org/man/snapper-configs.5 # default config: https://man.archlinux.org/man/snapper-configs.5

1
hosts/common/polyunfill.nix
View File

@@ -106,6 +106,7 @@ in
conveniencePackages = [ conveniencePackages = [
config.boot.kernelPackages.cpupower # <repo:nixos/nixpkgs:nixos/modules/tasks/cpu-freq.nix> places it on PATH for convenience if powerManagement.cpuFreqGovernor is set config.boot.kernelPackages.cpupower # <repo:nixos/nixpkgs:nixos/modules/tasks/cpu-freq.nix> places it on PATH for convenience if powerManagement.cpuFreqGovernor is set
pkgs.kbd # <repo:nixos/nixpkgs:nixos/modules/config/console.nix> places it on PATH as part of console/virtual TTYs, but probably not needed unless you want to set console fonts pkgs.kbd # <repo:nixos/nixpkgs:nixos/modules/config/console.nix> places it on PATH as part of console/virtual TTYs, but probably not needed unless you want to set console fonts
pkgs.nixos-firewall-tool # <repo:nixos/nixpkgs:nixos/modules/services/networking/firewall.nix> for end-user management of the firewall? cool but doesn't cross-compile
]; ];
in lib.filter (p: ! builtins.elem p (requiredPackages ++ conveniencePackages)); in lib.filter (p: ! builtins.elem p (requiredPackages ++ conveniencePackages));
}; };

2
modules/services/ollama.nix
View File

@@ -69,7 +69,7 @@ in
services.ollama.models = models; services.ollama.models = models;
# these acceleration settings are relevant to `desko`. # these acceleration settings are relevant to `desko`.
services.ollama.acceleration = "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"`
# services.ollama.environmentVariables.HCC_AMDGPU_TARGET = "gfx1010"; # seems to be unnecessary # services.ollama.environmentVariables.HCC_AMDGPU_TARGET = "gfx1010"; # seems to be unnecessary

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 = "7dcdf9d94b96cc7f2e1726c79aa672ce4bcf824b"; rev = "f0c2751b5e11520e29549adc1563ba1fc1e759fe";
sha256 = "sha256-d4WLRw1ZPh2K9OAeNgDUvyzTfXScrSkAiJhjtX9VYYg="; sha256 = "sha256-CCzIhf4yt9INU/sPRVMLzg5gOzkekQ1KWzNcKbj1BxQ=";
version = "0-unstable-2024-12-30"; version = "0-unstable-2025-01-01";
branch = "master"; branch = "master";
} }

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

@@ -54,10 +54,25 @@ in
}) })
(fetchpatch' { (fetchpatch' {
# 2024-12-26: required to build ollama (with AMD acceleration) # 2025-01-01: required to fix servo build
name = "rocm-6: bump packages to 6.3.1 and add missing packages"; name = "jackett: 0.22.1109 -> 0.22.1177";
prUrl = "https://github.com/NixOS/nixpkgs/pull/367695"; prUrl = "https://github.com/NixOS/nixpkgs/pull/370024";
hash = "sha256-6XXgSCXhC5DneSICguPtdnjX00SVJeiHxmJ55MoB+Xs="; hash = "sha256-V7J78ss+zKtnqj4aLAhNjG6GEkgPPyTNcu2uDKRCxRA=";
})
# (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' {
# 2025-01-01: testing before merge
name = "bonsai: 1.2.0 -> 1.2.1";
prUrl = "https://github.com/NixOS/nixpkgs/pull/369918";
hash = "sha256-FriPCssLFBEuHnagHJFP2OXT/EB1ywAYvosYPcjU/68=";
}) })
(fetchpatch' { (fetchpatch' {