From 73d79e10e7f4aa382cd875f9028c81952875e37e Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 20 Mar 2025 14:51:43 +0000 Subject: [PATCH] nixpkgs: intra-day update (to get my upstreamed fontconfig fixes) --- hosts/common/programs/fontconfig.nix | 1 - pkgs/by-name/nixpkgs-bootstrap/master.nix | 4 +-- pkgs/by-name/nixpkgs-bootstrap/patches.nix | 32 ---------------------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/hosts/common/programs/fontconfig.nix b/hosts/common/programs/fontconfig.nix index 9aaa8edcc..d71f4025a 100644 --- a/hosts/common/programs/fontconfig.nix +++ b/hosts/common/programs/fontconfig.nix @@ -35,7 +35,6 @@ in fonts = lib.mkIf config.sane.programs.fontconfig.enabled { fontconfig.enable = true; - fontconfig.cache32Bit = true; #< TODO: remove (here for testing) fontconfig.defaultFonts = { emoji = [ "Noto Color Emoji" diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 0b39bb683..373211290 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 = "a5104e8439375b3b49cfac468894f40a81bf5673"; - sha256 = "sha256-NIuAPnsyRbVl7S73/azhfEX9MOtBWtDFuknr8iplbMY="; + rev = "7344a3b78128f7b1765dba89060b015fb75431a7"; + sha256 = "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c="; version = "0-unstable-2025-03-20"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 00f8014bd..84a69c74b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -40,31 +40,6 @@ in hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc="; }) - # TODO: remove `fontconfig.cache32Bit = true` from fontconfig.nix after merge (and maybe after seeing if it's beneficial for signal/electron apps?) - (fetchpatch' { - name = "nixos/fonts: ship fontconfig caches even for cross-compiled hosts"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/391305"; - hash = "sha256-HsvNoMFQXrCKsDBtWv6NCkIDBea4FGNQWTVJwwu1RgI="; - }) - # (fetchpatch' { - # name = "makeFontsCache: fix cross compilation"; - # saneCommit = "e021ee13f909e6eb7c019b5cd1acf9eac0cd0f67"; - # hash = "sha256-3fJtcYfIDIIcn2p9LunPmRX1DWlcQ33OAw3Ok3sUs8g="; - # }) - # (fetchpatch' { - # name = "nixos/fonts: ship fontconfig caches even for cross-compiled hosts"; - # saneCommit = "9435a2b422f090b25f4aa5aee53be1341626672d"; - # hash = "sha256-4bhzdWxQ650+4bq4+2K4vJb/iQSPtppp3tBrs+qGdNQ="; - # }) - - (fetchpatch' { - # 2025-03-18: merged into master - name = "nvimpager: enable strictDeps & cleanup inputs"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/390878"; - # saneCommit = "e55b9041bc27a89549995a8d5f4f458f770ae8fd"; - hash = "sha256-Fi+seOOkErufBatEzSVcLM8Fj8ZUcvHNIbkpf+RIFLo="; - }) - (fetchpatch' { # 2025-03-14: merged into staging-next name = "[staging-next] pipewire: fix cross compilation"; @@ -82,13 +57,6 @@ in hash = "sha256-Uo3MUP6lJk0i61pJFj2wNKRphpzNZHU96USq1F6Sdlo="; }) - (fetchpatch' { - # 2025-03-17: merged into staging-next - name = "glycin-loaders: enable strictDeps"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/390882"; - hash = "sha256-NKhbKA9JTO1Pzoz1U89OWJO2kVtGwJRr3Lm+CQZVdnE="; - }) - (fetchpatch' { # 2025-03-17: merged into staging-next name = "gtk4-layer-shell: fix cross compilation";