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

nixpkgs: 2025-06-20 -> 2025-06-21; push buildfix patches upstream

Browse Source
This commit is contained in:
Colin
2025-06-21 07:43:40 +00:00
parent 03c17dedd2
commit ec8092a99d
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overlays/cross.nix
View File

@@ -305,6 +305,8 @@ in with final; {
# i2p = mvToNativeInputs [ ant gettext ] prev.i2p; # i2p = mvToNativeInputs [ ant gettext ] prev.i2p;
# 2025/06/20: upstreaming is blocked on perl; see nixpkgs branch `2025-06-20-ibus` # 2025/06/20: upstreaming is blocked on perl; see nixpkgs branch `2025-06-20-ibus`
# out for PR: <https://github.com/NixOS/nixpkgs/pull/418644>
ibusMinimal = addBuildInputs [ vala ] prev.ibusMinimal; ibusMinimal = addBuildInputs [ vala ] prev.ibusMinimal;
# 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc # 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "2dd47dccb7002e10edfe7606f6286d133da15c4f"; rev = "5fecf8770b92cd07251ba0a93a74f2a757f251db";
sha256 = "sha256-easOEqE6LzbsHSXaXBeeXtS4/KZNjX9BFV3ZvyEZzO8="; sha256 = "sha256-bTyS0EXk8qTV3ks4mcXuOO0LuMUYdRBDr+zsNXtb2sU=";
version = "unstable-2025-06-20"; version = "unstable-2025-06-21";
branch = "master"; branch = "master";
} }

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

@@ -37,14 +37,14 @@ in
}) })
(fetchpatch' { (fetchpatch' {
# TODO(2025-06-20): send for PR (branch: pr-perl540-cross)
name = "perl540: fix cross compilation"; name = "perl540: fix cross compilation";
saneCommit = "fb694775923041a4e5b6f40b2d2ee88b1749c82b"; # saneCommit = "fb694775923041a4e5b6f40b2d2ee88b1749c82b";
prUrl = "https://github.com/NixOS/nixpkgs/pull/418640";
hash = "sha256-dEVUF4MPY85yBh2cvnnXoH/sAcajPREVSgo8lQ/Z2og="; hash = "sha256-dEVUF4MPY85yBh2cvnnXoH/sAcajPREVSgo8lQ/Z2og=";
}) })
# (fetchpatch' { # (fetchpatch' {
# # TODO(2025-06-20): send for PR (branch: 2025-06-20-ibus; requires perl fix) # # out for PR: <https://github.com/NixOS/nixpkgs/pull/418644>
# # N.B.: forces rebuild of qtwebengine, electron, probably firefox. better to apply specifically to cross, in overlays/cross.nix # # N.B.: forces rebuild of qtwebengine, electron, probably firefox. better to apply specifically to cross, in overlays/cross.nix
# name = "ibusMinimal: fix cross compilation"; # name = "ibusMinimal: fix cross compilation";
# saneCommit = "67b8e690bf3d38b73d7a215788898e122c75475f"; # saneCommit = "67b8e690bf3d38b73d7a215788898e122c75475f";
@@ -52,19 +52,12 @@ in
# }) # })
(fetchpatch' { (fetchpatch' {
# TODO(2025-06-20): send for PR (branch: 2025-06-20-sdl-cross; requires ibusMinimal fix)
name = "sdl3: fix cross compilation"; name = "sdl3: fix cross compilation";
saneCommit = "7047d2272f3877f5f2aeeb42d4b7421e4e3e52a6"; # saneCommit = "7047d2272f3877f5f2aeeb42d4b7421e4e3e52a6";
prUrl = "https://github.com/NixOS/nixpkgs/pull/418646";
hash = "sha256-U5aq456mtuMULmw8FDjlXYR0DhQxrdy6UDgVjlpsqGo="; hash = "sha256-U5aq456mtuMULmw8FDjlXYR0DhQxrdy6UDgVjlpsqGo=";
}) })
(fetchpatch' {
# XXX(2025-06-20): merged into master
name = "handbrake: fix build";
prUrl = "https://github.com/NixOS/nixpkgs/pull/418610";
hash = "sha256-dKa9r0HuWyUp/Jz6IOKczEnQ8Ag6gesN0xjWKBdPPm4=";
})
(fetchpatch' { (fetchpatch' {
name = "zelda64recomp: init at 1.2.0"; name = "zelda64recomp: init at 1.2.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/313013"; prUrl = "https://github.com/NixOS/nixpkgs/pull/313013";

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "27737dd56ef41944c55e6ecf44677c9ef9c1b0d6"; rev = "7c4c81ad46641bf773a00beb784b9fe5b70595b5";
sha256 = "sha256-b6CrXmLs0BJV/sPP8HJqqqiy6tEu2yELrLOGdPS3Cdc="; sha256 = "sha256-yYhj7NIaSdLcMU2Vy6O86TzD90uo5QcMw2AJGYF7L7Q=";
version = "unstable-2025-06-20"; version = "unstable-2025-06-21";
branch = "staging-next"; branch = "staging-next";
} }

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 = "824e6df72824bf9a877493e87a1bac169641a60d"; rev = "df4aa629b4bc7f6386c5ba5475a5966ad6b9ae9f";
sha256 = "sha256-txWl5AKHatHlbCjcsnvsunjJCZR11C3C/7h6QdrGrbY="; sha256 = "sha256-yNTldn8Uuayk822M7+JlDvpXLCknDsBRJgEJNBLNuJQ=";
version = "unstable-2025-06-20"; version = "unstable-2025-06-21";
branch = "staging"; branch = "staging";
} }