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

nixpkgs: 2025-03-11 -> 2025-03-16

Browse Source
This commit is contained in:
Colin
2025-03-16 21:54:15 +00:00
parent 2d7a06e8cd
commit 04328e7f2a
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/by-name/servo/services/email/dovecot.nix
View File

@@ -124,7 +124,9 @@
# ]; # ];
}; };
}; };
services.dovecot2.modules = [ environment.systemPackages = [
# XXX(2025-03-16): dovecot loads modules from /run/current-system/sw/lib/dovecot/modules
# see: <https://github.com/NixOS/nixpkgs/pull/387642>
pkgs.dovecot_pigeonhole # enables sieve execution (?) pkgs.dovecot_pigeonhole # enables sieve execution (?)
]; ];
services.dovecot2.sieve = { services.dovecot2.sieve = {

11
overlays/cross.nix
View File

@@ -970,4 +970,15 @@ in with final; {
# 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional # 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
# 2025/03/15: upstreaming (to staging) is unblocked, but proper fix is more involved:
# can't disable the `installedTests` output by reading `finalAttrs.doCheck` because infinite recursion;
# working fix is either to fix test building (not running) to work under cross, or give the package an ugly
# `installCheck` call arg & gate things there.
xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.glib # for gdbus-codegen
];
outputs = [ "out" ]; #< no installedTests
});
} }

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 = "4028c38d07192e816424732781c371c8b9c649b7"; rev = "44588aa5476450605bb2cee95b9fd93f20d38697";
sha256 = "sha256-CF77jrTyG3dqcJtO3pmOamIvJsS66+pPhDPsZUAiHmM="; sha256 = "sha256-ZXEJAKsuFg9NO/X7z3jxUtQ+gdUHihjEo24W0V1RYF0=";
version = "0-unstable-2025-03-11"; version = "0-unstable-2025-03-16";
branch = "master"; branch = "master";
} }

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

@@ -40,6 +40,20 @@ in
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc="; hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
}) })
(fetchpatch' {
# 2025-03-16: i'm testing this patch before merge
name = "buffybox: 3.2.0-unstable-2025-02-27 -> 3.2.0-unstable-2025-03-12";
prUrl = "https://github.com/NixOS/nixpkgs/pull/390324";
hash = "sha256-SStQSD4T7JI9GEjnH92P3TXR/OMZNuCs3bT3vFLbQqw=";
})
(fetchpatch' {
# 2025-03-14: merged into staging-next
name = "[staging-next] pipewire: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/390022";
hash = "sha256-xtA4lzPGZCeZ+rrS8oBSB+rsKCm+JJnWikzAnOI0920=";
})
(fetchpatch' { (fetchpatch' {
# 2025-03-09: merged into staging # 2025-03-09: merged into staging
name = "libqmi: unbreak cross compilation"; name = "libqmi: unbreak cross compilation";