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

cross: update upstreaming statuses

Browse Source
This commit is contained in:
Colin
2025-07-28 04:08:31 +00:00
parent 755dc417ba
commit 1730ecc98f
2 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
overlays/cross.nix
View File

@@ -153,7 +153,7 @@ in with final; {
# }; # };
# 2025/05/01: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet # 2025/07/27: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet
confy = prev.confy.overrideAttrs (upstream: { confy = prev.confy.overrideAttrs (upstream: {
# meson's `python.find_installation` method somehow just doesn't support cross compilation. # meson's `python.find_installation` method somehow just doesn't support cross compilation.
# - <https://mesonbuild.com/Python-module.html#find_installation> # - <https://mesonbuild.com/Python-module.html#find_installation>
@@ -171,20 +171,21 @@ in with final; {
''; '';
}); });
# 2025/05/01: upstreaming is blocked on sdl3 (fix is in staging) # 2025/07/27: upstreaming is unblocked
delfin = prev.delfin.override { delfin = prev.delfin.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
# dtrx = prev.dtrx.override { # dtrx = prev.dtrx.override {
# # `binutils` is the nix wrapper, which reads nix-related env vars # # `binutils` is the nix wrapper, which reads nix-related env vars
# # before passing on to e.g. `ld`. # # before passing on to e.g. `ld`.
# # dtrx probably only needs `ar` at runtime, not even `ld`. # # dtrx probably only needs `ar` at runtime, not even `ld`.
# # this isn't required to fix the _build_, nor even runtime behavior (probably); it's a cleanliness fix (fewer build packages in runtime closure)
# binutils = binutils-unwrapped; # binutils = binutils-unwrapped;
# }; # };
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
# emacs = prev.emacs.override { # emacs = prev.emacs.override {
# nativeComp = false; # will be renamed to `withNativeCompilation` in future # nativeComp = false; # will be renamed to `withNativeCompilation` in future
# # future: we can specify 'action-if-cross-compiling' to actually invoke the test programs: # # future: we can specify 'action-if-cross-compiling' to actually invoke the test programs:
@@ -195,9 +196,7 @@ in with final; {
cargo = crossCargo; #< fixes openssl not being able to find its library cargo = crossCargo; #< fixes openssl not being able to find its library
}; };
# extra-cmake-modules = buildPackages.extra-cmake-modules; # 2025/07/27: upstreaming is unblocked
# 2025/05/01: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: { # firejail = prev.firejail.overrideAttrs (upstream: {
# # firejail executes its build outputs to produce the default filter list. # # firejail executes its build outputs to produce the default filter list.
# # i think we *could* copy the default filters from pkgsBuildBuild, but that doesn't seem future proof # # i think we *could* copy the default filters from pkgsBuildBuild, but that doesn't seem future proof
@@ -211,7 +210,7 @@ in with final; {
# ''); # '');
# }); # });
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
# flare-signal = prev.flare-signal.overrideAttrs (upstream: { # flare-signal = prev.flare-signal.overrideAttrs (upstream: {
# env = let # env = let
# inherit buildPackages stdenv rust; # inherit buildPackages stdenv rust;
@@ -233,25 +232,21 @@ in with final; {
# }; # };
# }); # });
# 2025/05/01: upstreaming is blocked by glycin-loaders # 2025/07/27: upstreaming is blocked by glycin-loaders
fractal = prev.fractal.override { fractal = prev.fractal.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
glycin-loaders = prev.glycin-loaders.override { glycin-loaders = prev.glycin-loaders.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/05/16: out for PR: <https://github.com/NixOS/nixpkgs/pull/407664> # 2025/07/27: upstreaming is blocked on gnome-shell
# fixes: `pkcs11/gkm/meson.build:47:20: ERROR: Program 'glib-genmarshal' not found or not executable`
# gnome-keyring = addNativeInputs [ buildPackages.glib ] prev.gnome-keyring;
# 2025/01/13: upstreaming is blocked on gnome-shell
# fixes: "gdbus-codegen not found or executable" # fixes: "gdbus-codegen not found or executable"
# gnome-session = mvToNativeInputs [ glib ] super.gnome-session; # gnome-session = mvToNativeInputs [ glib ] super.gnome-session;
# 2025/04/19: upstreaming is unblocked # 2025/07/27: upstreaming is blocked on ibus, evolution-data-server -> gnome-online-accounts -> gvfs -> ...
# gnome-shell = super.gnome-shell.overrideAttrs (orig: { # gnome-shell = super.gnome-shell.overrideAttrs (orig: {
# # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable" # # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
# # does not fix "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory" (python import failure) # # does not fix "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory" (python import failure)
@@ -276,18 +271,12 @@ in with final; {
# ]; # ];
# }); # });
# 2025/07/27: upstreaming is unblocked
gnome-user-share = prev.gnome-user-share.override { gnome-user-share = prev.gnome-user-share.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/05/16: this part is out for PR: <https://github.com/NixOS/nixpkgs/pull/407667>
# .overrideAttrs {
# # see src/meson.build.
# # nix default is `plain` but that has g-u-s build in debug mode,
# # which disagrees with the build directories used by `crossCargo` (target/debug v.s. target/release)
# mesonBuildType = "release";
# };
# 2025/05/01: 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: {
# # fixes: "checking FFI library usage... ./configure: line 11028: pkg-config: command not found" # # fixes: "checking FFI library usage... ./configure: line 11028: pkg-config: command not found"
@@ -305,20 +294,15 @@ in with final; {
# only `nwg-panel` uses hyprland; `null`ing it seems to Just Work. # only `nwg-panel` uses hyprland; `null`ing it seems to Just Work.
hyprland = null; hyprland = null;
# 2025/05/02: blocked on psqlodbc (available after next staging merge) # 2025/07/27: blocked on hyprutils, hyprlang, hyprland-qt.
# used by hyprland (which is an indirect dep of waybar, nwg-panel, etc), # used by hyprland (which is an indirect dep of waybar, nwg-panel, etc),
# which it shells out to at runtime (and hence, not ever used by me). # which it shells out to at runtime (and hence, not ever used by me).
hyprland-qtutils = null; hyprland-qtutils = null;
# 2025/05/01: upstreaming is blocked on java-service-wrapper # 2025/07/27: upstreaming is blocked on java-service-wrapper
# "setup: line 1595: ant: command not found" # "setup: line 1595: ant: command not found"
# 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`
# out for PR: <https://github.com/NixOS/nixpkgs/pull/418644>
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
# iotas = prev.iotas.overrideAttrs (_: { # iotas = prev.iotas.overrideAttrs (_: {
# # error: "<iotas> is not allowed to refer to the following paths: <build python>" # # error: "<iotas> is not allowed to refer to the following paths: <build python>"
@@ -347,7 +331,7 @@ in with final; {
# nativeBuildInputs = lib.remove [ qt6.wrapQtAppsHook ] upstream.nativeBuildInputs; # nativeBuildInputs = lib.remove [ qt6.wrapQtAppsHook ] upstream.nativeBuildInputs;
# }); # });
# 2024/08/12: upstreaming is unblocked -- but is this necessary? # 2025/07/27: upstreaming is unblocked -- but is this necessary?
# koreader = prev.koreader.overrideAttrs (upstream: { # koreader = prev.koreader.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [ # nativeBuildInputs = upstream.nativeBuildInputs ++ [
# autoPatchelfHook # autoPatchelfHook
@@ -356,11 +340,8 @@ in with final; {
lemoa = prev.lemoa.override { cargo = crossCargo; }; lemoa = prev.lemoa.override { cargo = crossCargo; };
# 2025/05/16: upstreaming is unblocked; out for PR: <https://github.com/NixOS/nixpkgs/pull/407662>
# fixes `Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)`
# libmanette = addDepsBuildBuild [ pkgsBuildBuild.pkg-config ] prev.libmanette;
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# # 2025/07/27: upstreaming is blocked on qtsvg
# phonon = super.phonon.overrideAttrs (orig: { # phonon = super.phonon.overrideAttrs (orig: {
# # fixes "ECM (required version >= 5.60), Extra CMake Modules" # # fixes "ECM (required version >= 5.60), Extra CMake Modules"
# buildInputs = orig.buildInputs ++ [ extra-cmake-modules ]; # buildInputs = orig.buildInputs ++ [ extra-cmake-modules ];
@@ -373,7 +354,7 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; }; # callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# }); # });
# 2025/04/04: upstreaming blocked on glycin-loaders # 2025/07/27: upstreaming blocked on glycin-loaders
loupe = prev.loupe.override { loupe = prev.loupe.override {
cargo = crossCargo; cargo = crossCargo;
}; };
@@ -413,10 +394,10 @@ in with final; {
# fixes: "ar: command not found" # fixes: "ar: command not found"
# `ar` is provided by bintools # `ar` is provided by bintools
# 2025/04/04: 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/04/04: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
newsflash = (prev.newsflash.override { newsflash = (prev.newsflash.override {
cargo = crossCargo; cargo = crossCargo;
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
@@ -458,7 +439,7 @@ in with final; {
# fixes "properties/gresource.xml: Permission denied" # fixes "properties/gresource.xml: Permission denied"
# - by providing glib-compile-resources # - by providing glib-compile-resources
# 2025/01/13: upstreaming is blocked on psqlodbc, qtsvg, qtimageformats # 2025/07/27: upstreaming is blocked on gst-plugins-good, qtkeychain, qtmultimedia, qtquick3d, qt-jdenticon
# nheko = (prev.nheko.override { # nheko = (prev.nheko.override {
# gst_all_1 = gst_all_1 // { # gst_all_1 = gst_all_1 // {
# # don't build gst-plugins-good with "qt5 support" # # don't build gst-plugins-good with "qt5 support"
@@ -470,7 +451,7 @@ in with final; {
# # fixes "fatal error: lmdb++.h: No such file or directory # # fixes "fatal error: lmdb++.h: No such file or directory
# buildInputs = orig.buildInputs ++ [ lmdbxx ]; # buildInputs = orig.buildInputs ++ [ lmdbxx ];
# }); # });
# 2025/01/13: upstreaming blocked on emacs (and maybe ruby, libgccjit?) # 2025/07/27: upstreaming blocked on emacs, ruby (via vim-gems)
# - previous upstreaming attempt: <https://github.com/NixOS/nixpkgs/pull/225111/files> # - previous upstreaming attempt: <https://github.com/NixOS/nixpkgs/pull/225111/files>
# notmuch = prev.notmuch.overrideAttrs (upstream: { # notmuch = prev.notmuch.overrideAttrs (upstream: {
# # fixes "Error: The dependencies of notmuch could not be satisfied" (xapian, gmime, glib, talloc) # # fixes "Error: The dependencies of notmuch could not be satisfied" (xapian, gmime, glib, talloc)
@@ -525,7 +506,7 @@ in with final; {
# # buildInputs = lib.remove gnupg upstream.buildInputs; # # buildInputs = lib.remove gnupg upstream.buildInputs;
# }); # });
# 2025-03-29: upstreaming is unblocked, but most of this belongs in _oils_ repo # 2025/07/27: upstreaming is unblocked, but most of this belongs in _oils_ repo
oils-for-unix = prev.oils-for-unix.overrideAttrs (upstream: { oils-for-unix = prev.oils-for-unix.overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''
substituteInPlace _build/oils.sh \ substituteInPlace _build/oils.sh \
@@ -549,12 +530,12 @@ in with final; {
]; ];
}); });
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is blocked on gnome-user-share, nautilus
papers = prev.papers.override { papers = prev.papers.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/01/28: upstreaming is blocked on gnome-session (itself blocked on gnome-shell) # 2025/07/27: upstreaming is blocked on gnome-session (itself blocked on gnome-shell)
# phosh = prev.phosh.overrideAttrs (upstream: { # phosh = prev.phosh.overrideAttrs (upstream: {
# buildInputs = upstream.buildInputs ++ [ # buildInputs = upstream.buildInputs ++ [
# libadwaita # "plugins/meson.build:41:2: ERROR: Dependency "libadwaita-1" not found, tried pkgconfig" # libadwaita # "plugins/meson.build:41:2: ERROR: Dependency "libadwaita-1" not found, tried pkgconfig"
@@ -580,7 +561,7 @@ in with final; {
# ]; # ];
# } prev.phosh-mobile-settings; # } prev.phosh-mobile-settings;
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
pwvucontrol = prev.pwvucontrol.override { pwvucontrol = prev.pwvucontrol.override {
cargo = crossCargo; cargo = crossCargo;
}; };
@@ -747,18 +728,18 @@ in with final; {
# # ''; # # '';
# }); # });
# 2025/05/01: upstreaming is blocked on glycin-loaders # 2025/07/27: upstreaming is blocked on glycin-loaders
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/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
spot = prev.spot.override { spot = prev.spot.override {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/05/01: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
# squeekboard = prev.squeekboard.overrideAttrs (upstream: { # squeekboard = prev.squeekboard.overrideAttrs (upstream: {
# # fixes: "meson.build:1:0: ERROR: 'rust' compiler binary not defined in cross or native file" # # fixes: "meson.build:1:0: ERROR: 'rust' compiler binary not defined in cross or native file"
# # new error: "meson.build:1:0: ERROR: Rust compiler rustc --target aarch64-unknown-linux-gnu -C linker=aarch64-unknown-linux-gnu-gcc can not compile programs." # # new error: "meson.build:1:0: ERROR: Rust compiler rustc --target aarch64-unknown-linux-gnu -C linker=aarch64-unknown-linux-gnu-gcc can not compile programs."
@@ -802,10 +783,10 @@ in with final; {
# ]; # ];
# }); # });
# 2025/05/05: upstreaming blocked on libcdio (via gvfs -> libcdio-paranoia) # 2025/07/27: 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;
# 2024/11/19: upstreaming is unblocked # 2025/07/27: upstreaming is unblocked
tangram = prev.tangram.overrideAttrs (upstream: { tangram = prev.tangram.overrideAttrs (upstream: {
# gsjpack has a shebang for the host gjs. patchShebangs --build doesn't fix that: just manually specify the build gjs. # gsjpack has a shebang for the host gjs. patchShebangs --build doesn't fix that: just manually specify the build gjs.
# the proper way to patch this for nixpkgs is: # the proper way to patch this for nixpkgs is:
@@ -864,7 +845,7 @@ in with final; {
# # setting this to null means visidata will work as normal but not be able to load hdf files. # # setting this to null means visidata will work as normal but not be able to load hdf files.
# h5py = null; # h5py = null;
# }; # };
# 2025/05/01: upstreaming is blocked on qtsvg # 2025/07/27: upstreaming is blocked on qtsvg, qtx11extras
# vlc = prev.vlc.overrideAttrs (orig: { # vlc = prev.vlc.overrideAttrs (orig: {
# # fixes: "configure: error: could not find the LUA byte compiler" # # fixes: "configure: error: could not find the LUA byte compiler"
# # fixes: "configure: error: protoc compiler needed for chromecast was not found" # # fixes: "configure: error: protoc compiler needed for chromecast was not found"
@@ -876,7 +857,7 @@ in with final; {
# }; # };
# }); # });
# 2025/05/01: upstreaming is blocked on ruby # 2025/07/27: upstreaming is blocked on ruby
# fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o) # fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o)
# wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: { # wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {
# # nvim wrapper has a sanity check that the plugins will load correctly. # # nvim wrapper has a sanity check that the plugins will load correctly.
@@ -887,7 +868,4 @@ in with final; {
# [ "false && $out/bin/nvim-wrapper" ] # [ "false && $out/bin/nvim-wrapper" ]
# upstream.postBuild; # upstream.postBuild;
# }); # });
# 2025/05/12: out for PR: <https://github.com/NixOS/nixpkgs/pull/406599>
# xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
} }

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

@@ -37,14 +37,6 @@ in
hash = "sha256-Hs3uKT3b5D4hkipEgD19j+bv5k63Eba8jMdENaE1Plg="; hash = "sha256-Hs3uKT3b5D4hkipEgD19j+bv5k63Eba8jMdENaE1Plg=";
}) })
(fetchpatch' {
# 2025-07-13: merged into staging
# fixes cross compilation
name = "tinysparql: add patch making the dbus optional";
prUrl = "https://github.com/NixOS/nixpkgs/pull/424119";
hash = "sha256-D425Swpd2LLuR9TuedoO/lsPKpHS/kXWybKEyQL1iwY=";
})
(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";