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

cross: push fractal/pwvucontrol/loupe patches upstream & update tracking statuses

Browse Source
This commit is contained in:
Colin
2025-08-26 09:30:24 +00:00
parent 23f3647cc5
commit 79fc30da0e
3 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
overlays/cross.nix
View File

@@ -138,7 +138,7 @@ in with final; {
'';
});
# 2025/07/27: upstreaming is unblocked
# 2025/08/26: upstreaming is unblocked
delfin = prev.delfin.override {
cargo = crossCargo;
};
@@ -199,10 +199,10 @@ in with final; {
# };
# });
# 2025/08/25: upstreaming is unblocked
fractal = prev.fractal.override {
cargo = crossCargo;
};
# 2025/08/26: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/437038>
# fractal = prev.fractal.override {
# cargo = crossCargo;
# };
# 2025/07/27: upstreaming is blocked on gnome-shell
# fixes: "gdbus-codegen not found or executable"
@@ -233,11 +233,6 @@ in with final; {
# ];
# });
# 2025/08/17: upstreaming is unblocked
gnome-user-share = prev.gnome-user-share.override {
cargo = crossCargo;
};
# 2025/07/27: upstreaming is unblocked
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
# gnustep-base = prev.gnustep-base.overrideAttrs (upstream: {
@@ -316,10 +311,10 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# });
# 2025/07/27: upstreaming blocked on glycin-loaders
loupe = prev.loupe.override {
cargo = crossCargo;
};
# 2025/08/26: upstreaming unblocked; out for PR: <https://github.com/NixOS/nixpkgs/pull/437059>
# loupe = prev.loupe.override {
# cargo = crossCargo;
# };
# 2024/11/19: upstreaming is unblocked
mepo = (prev.mepo.override {
@@ -359,7 +354,7 @@ in with final; {
# 2025/07/27: upstreaming is unblocked by deps; but turns out to not be this simple
# ncftp = addNativeInputs [ bintools ] prev.ncftp;
# 2025/07/27: upstreaming is unblocked
# 2025/08/26: upstreaming is unblocked
newsflash = (prev.newsflash.override {
cargo = crossCargo;
}).overrideAttrs (upstream: {
@@ -492,7 +487,7 @@ in with final; {
];
});
# 2025/07/27: upstreaming is blocked on gnome-user-share, nautilus
# 2025/08/26: upstreaming is unblocked
papers = prev.papers.override {
cargo = crossCargo;
};
@@ -523,10 +518,10 @@ in with final; {
# ];
# } prev.phosh-mobile-settings;
# 2025/07/27: upstreaming is unblocked
pwvucontrol = prev.pwvucontrol.override {
cargo = crossCargo;
};
# 2025/08/26: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/437056>
# pwvucontrol = prev.pwvucontrol.override {
# cargo = crossCargo;
# };
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
# (pyself: pysuper: {
@@ -690,13 +685,13 @@ in with final; {
# # '';
# });
# 2025/07/27: upstreaming is blocked on glycin-loaders
# 2025/08/26: upstreaming is unblocked
snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found"
cargo = crossCargo;
};
# 2025/08/17: upstreaming is unblocked
# 2025/08/26: upstreaming is unblocked
spot = prev.spot.override {
cargo = crossCargo;
};
@@ -745,7 +740,7 @@ in with final; {
# ];
# });
# 2025/08/17: upstreaming blocked on gvfs -> udisks -> libblockdev -> {thin-provisioning-tools,libndctl -> ... -> ruby}
# 2025/08/26: upstreaming blocked on gvfs -> udisks -> libblockdev -> {thin-provisioning-tools,libndctl -> ... -> ruby}
swaynotificationcenter = mvToNativeInputs [ buildPackages.wayland-scanner ] prev.swaynotificationcenter;
# 2025/07/27: upstreaming is unblocked
@@ -796,7 +791,7 @@ in with final; {
# });
# };
# 2025/08/17: upstreaming is unblocked
# 2025/08/26: upstreaming is unblocked
video-trimmer = prev.video-trimmer.override {
cargo = crossCargo;
};

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "4c66df3a815eff7cef4f96057af20bc6d59a4950";
sha256 = "sha256-oZXL9UHIBi6omPmre8WSFcHKbAblhEmpxYvaeZGERng=";
rev = "77ae3f85d5e814698380c00ad3a867ebc3204cb1";
sha256 = "sha256-s9mVQll30JhqPklsDhpyPYhavoJA30tLausoJMfuyPY=";
version = "unstable-2025-08-26";
branch = "master";
}

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

@@ -98,6 +98,31 @@ in
hash = "sha256-4VEKjZsI7XW+/gbq3fn3bjjciPKtd2IU8SH4CsqqJ6Y=";
})
(fetchpatch' {
name = "fractal: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437038";
hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A=";
})
(fetchpatch' {
name = "pwvucontrol: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437056";
hash = "sha256-JOAyYmpTH3p7W+AXnlVyiyi5CggNZHX2fCGGBEp8iAA=";
})
(fetchpatch' {
name = "loupe: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437059";
hash = "sha256-c4XJ5R0HQ1FtyWWzajy+qT8+Gbe53n1PvBKujLEsTdY=";
})
(fetchpatch' {
# 2025-08-25: TODO: send for review after servo bitcoin is seen working
name = "coincurve: fix build";
saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987";
hash = "sha256-3vIuIU7jYYcPqkm4hVPP5G4C09CSY23L8CcWNBnJ9tY=";
})
# (fetchpatch' {
# # opencv used by alpaca, newelle
# name = "opencv: fix cross compliation by patching protobuf";