cross: push fractal/pwvucontrol/loupe patches upstream & update tracking statuses
This commit is contained in:
@@ -138,7 +138,7 @@ in with final; {
|
|||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
# 2025/07/27: upstreaming is unblocked
|
# 2025/08/26: upstreaming is unblocked
|
||||||
delfin = prev.delfin.override {
|
delfin = prev.delfin.override {
|
||||||
cargo = crossCargo;
|
cargo = crossCargo;
|
||||||
};
|
};
|
||||||
@@ -199,10 +199,10 @@ in with final; {
|
|||||||
# };
|
# };
|
||||||
# });
|
# });
|
||||||
|
|
||||||
# 2025/08/25: upstreaming is unblocked
|
# 2025/08/26: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/437038>
|
||||||
fractal = prev.fractal.override {
|
# fractal = prev.fractal.override {
|
||||||
cargo = crossCargo;
|
# cargo = crossCargo;
|
||||||
};
|
# };
|
||||||
|
|
||||||
# 2025/07/27: upstreaming is blocked on gnome-shell
|
# 2025/07/27: upstreaming is blocked on gnome-shell
|
||||||
# fixes: "gdbus-codegen not found or executable"
|
# 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
|
# 2025/07/27: upstreaming is unblocked
|
||||||
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
|
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
|
||||||
# gnustep-base = prev.gnustep-base.overrideAttrs (upstream: {
|
# gnustep-base = prev.gnustep-base.overrideAttrs (upstream: {
|
||||||
@@ -316,10 +311,10 @@ in with final; {
|
|||||||
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
|
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
|
||||||
# });
|
# });
|
||||||
|
|
||||||
# 2025/07/27: upstreaming blocked on glycin-loaders
|
# 2025/08/26: upstreaming unblocked; out for PR: <https://github.com/NixOS/nixpkgs/pull/437059>
|
||||||
loupe = prev.loupe.override {
|
# loupe = prev.loupe.override {
|
||||||
cargo = crossCargo;
|
# cargo = crossCargo;
|
||||||
};
|
# };
|
||||||
|
|
||||||
# 2024/11/19: upstreaming is unblocked
|
# 2024/11/19: upstreaming is unblocked
|
||||||
mepo = (prev.mepo.override {
|
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
|
# 2025/07/27: upstreaming is unblocked by deps; but turns out to not be this simple
|
||||||
# ncftp = addNativeInputs [ bintools ] prev.ncftp;
|
# ncftp = addNativeInputs [ bintools ] prev.ncftp;
|
||||||
|
|
||||||
# 2025/07/27: upstreaming is unblocked
|
# 2025/08/26: upstreaming is unblocked
|
||||||
newsflash = (prev.newsflash.override {
|
newsflash = (prev.newsflash.override {
|
||||||
cargo = crossCargo;
|
cargo = crossCargo;
|
||||||
}).overrideAttrs (upstream: {
|
}).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 {
|
papers = prev.papers.override {
|
||||||
cargo = crossCargo;
|
cargo = crossCargo;
|
||||||
};
|
};
|
||||||
@@ -523,10 +518,10 @@ in with final; {
|
|||||||
# ];
|
# ];
|
||||||
# } prev.phosh-mobile-settings;
|
# } prev.phosh-mobile-settings;
|
||||||
|
|
||||||
# 2025/07/27: upstreaming is unblocked
|
# 2025/08/26: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/437056>
|
||||||
pwvucontrol = prev.pwvucontrol.override {
|
# pwvucontrol = prev.pwvucontrol.override {
|
||||||
cargo = crossCargo;
|
# cargo = crossCargo;
|
||||||
};
|
# };
|
||||||
|
|
||||||
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
# (pyself: pysuper: {
|
# (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 {
|
snapshot = prev.snapshot.override {
|
||||||
# fixes "error: linker `cc` not found"
|
# fixes "error: linker `cc` not found"
|
||||||
cargo = crossCargo;
|
cargo = crossCargo;
|
||||||
};
|
};
|
||||||
|
|
||||||
# 2025/08/17: upstreaming is unblocked
|
# 2025/08/26: upstreaming is unblocked
|
||||||
spot = prev.spot.override {
|
spot = prev.spot.override {
|
||||||
cargo = crossCargo;
|
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;
|
swaynotificationcenter = mvToNativeInputs [ buildPackages.wayland-scanner ] prev.swaynotificationcenter;
|
||||||
|
|
||||||
# 2025/07/27: upstreaming is unblocked
|
# 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 {
|
video-trimmer = prev.video-trimmer.override {
|
||||||
cargo = crossCargo;
|
cargo = crossCargo;
|
||||||
};
|
};
|
||||||
|
@@ -14,8 +14,8 @@
|
|||||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||||
}:
|
}:
|
||||||
mkNixpkgs {
|
mkNixpkgs {
|
||||||
rev = "4c66df3a815eff7cef4f96057af20bc6d59a4950";
|
rev = "77ae3f85d5e814698380c00ad3a867ebc3204cb1";
|
||||||
sha256 = "sha256-oZXL9UHIBi6omPmre8WSFcHKbAblhEmpxYvaeZGERng=";
|
sha256 = "sha256-s9mVQll30JhqPklsDhpyPYhavoJA30tLausoJMfuyPY=";
|
||||||
version = "unstable-2025-08-26";
|
version = "unstable-2025-08-26";
|
||||||
branch = "master";
|
branch = "master";
|
||||||
}
|
}
|
||||||
|
@@ -98,6 +98,31 @@ in
|
|||||||
hash = "sha256-4VEKjZsI7XW+/gbq3fn3bjjciPKtd2IU8SH4CsqqJ6Y=";
|
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' {
|
# (fetchpatch' {
|
||||||
# # opencv used by alpaca, newelle
|
# # opencv used by alpaca, newelle
|
||||||
# name = "opencv: fix cross compliation by patching protobuf";
|
# name = "opencv: fix cross compliation by patching protobuf";
|
||||||
|
Reference in New Issue
Block a user