From 3080c343984d703a64c157f0facffee2d57abb2f Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 9 Mar 2025 01:10:06 +0000 Subject: [PATCH] nixpkgs-bootstrap.master: 0-unstable-2025-03-06 -> 0-unstable-2025-03-08 --- modules/services/ollama.nix | 2 +- pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 ++-- pkgs/by-name/nixpkgs-bootstrap/patches.nix | 34 +++++++++++----------- pkgs/by-name/nixpkgs-bootstrap/staging.nix | 6 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 934b3b550..6fe3027f1 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -87,7 +87,7 @@ in # 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.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 users.groups.ollama = {}; diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index c008de303..1744e3f04 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "25050c9c2a7f603396857cdec1118edd2827db0c"; - sha256 = "sha256-72uajWbJTG2IVEw1myy/QXUM05YK+hbRJpCSMJ/dyrw="; - version = "0-unstable-2025-03-06"; + rev = "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9"; + sha256 = "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc="; + version = "0-unstable-2025-03-08"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index f209837a0..d73995c2e 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -32,34 +32,34 @@ in ./2024-10-01-python-cross-resource-usage.patch (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"; prUrl = "https://github.com/NixOS/nixpkgs/pull/384957"; hash = "sha256-coDU6CGXtZOO74Eyr+ZxEPKh9oBLWWPHjNBjKMmPYw0="; - # saneCommit = "25d740a21c53b9ac2da33571e3fad7e33a765ddf"; - # hash = "sha256-PvewYks5P6QX59SG9sEcV89ddJdcNcEO9bB9x05Xgf0="; }) (fetchpatch' { - name = "aerc: make notmuch optional"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/386733"; - hash = "sha256-gLxRQ+mF7RTciV7dfVA8ADOyl6u1sv4MW6GzCZDjAdw="; + # 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-k/jxUUInhCvesF9l4Z1FMTqMaELZR1KSZkR6sQPAu6E="; }) (fetchpatch' { - name = "kiwix-tools: 3.7.0 -> 3.7.0-unstable-2024-12-21 to fix build against kiwix-14.0"; - saneGhCommit = "4ccec684a6f5096e56918758a85a794ad0564157"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/387044"; - hash = "sha256-s6llAcopDvx7I8ZwzJ4mL+mSo6BWIKDM7gjpzZiMxok="; + name = "mesa: fix cross compilation"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/388328"; + hash = "sha256-Jy9vMaeFrLjCNCI80YvTrqpSDaWQd/Num+mIRcgXCw4="; }) - # (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' { # # XXX(2025-01-06): patch does not produce valid binaries for cross # name = "lua-language-server: fix cross compiling"; diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index a5acc3d86..3a5eacbaf 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "fa22578dc252539c2f2533a2e442b61adb65cbca"; - sha256 = "sha256-9Qf6E6c4ur0CBlz7mElmQ3VJY+VtnrKHFPpVRisA0vI="; - version = "0-unstable-2025-03-07"; + rev = "27a49dc3c9a88733aa1d0371ecfec2e13d311347"; + sha256 = "sha256-57oyfjqiAp+wCGFuvPHVzRoft7AFgXLe4xz8Sub60SA="; + version = "0-unstable-2025-03-08"; branch = "staging"; }