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

nixpkgs: 0-unstable-2025-04-13 -> 0-unstable-2025-04-18

Browse Source
This commit is contained in:
Colin
2025-04-19 04:32:14 +00:00
parent 920b277a93
commit 1d4191c838
5 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
overlays/cross.nix
View File

@@ -53,6 +53,7 @@ let
buildInputs = lib.subtractLists buildInputs (upstream.buildInputs or []);
nativeBuildInputs = lib.subtractLists nativeBuildInputs (upstream.nativeBuildInputs or []);
});
rmBuildInputs = buildInputs: rmInputs { inherit buildInputs; };
rmNativeInputs = nativeBuildInputs: rmInputs { inherit nativeBuildInputs; };
# move items from buildInputs into nativeBuildInputs, or vice-versa.
# arguments represent the final location of specific inputs.
@@ -271,6 +272,16 @@ in with final; {
# extra-cmake-modules = buildPackages.extra-cmake-modules;
fcitx5 = prev.fcitx5.overrideAttrs (upstream: {
# TODO: CMake probably has some emulator, or cross compiler infra to use here?
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/modules/spell/CMakeLists.txt \
--replace-fail 'COMMAND Fcitx5::comp-spell-dict' 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} comp-spell-dict'
'';
buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs;
});
# 2025/01/25: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: {
# # firejail executes its build outputs to produce the default filter list.
@@ -784,16 +795,6 @@ in with final; {
# });
# });
# 2025/03/24: xcb-imdkit is only needed on x11.
# it breaks because of a dependency on extra-cmake-modules, which pulls in conflicting `qtsvg`.
# path to upstreaming is to remove extra-cmake-modules' dependency on qtsvg.
# it's only there because of `wrapQtAppsHook`, which is a noop when building extra-cmake-modules,
# but the qt5 nixpkgs stuff is a dumpster fire so have fun with that...
rofi-unwrapped = prev.rofi-unwrapped.override {
xcb-imdkit = null;
};
# 2025/04/04: upstreaming is blocked on glycin-loaders
snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found"
@@ -948,14 +949,11 @@ in with final; {
# 2025/04/04: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
# 2025/04/04: upstreaming is unblocked, but proper fix is more involved:
# can't disable the `installedTests` output by reading `finalAttrs.doCheck` because infinite recursion;
# working fix is either to fix test building (not running) to work under cross, or give the package an ugly
# `installCheck` call arg & gate things there.
xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.glib # for gdbus-codegen
# 2025/04/17: upstreaming is unblocked
xcb-imdkit = prev.xcb-imdkit.overrideAttrs (upstream: {
buildInputs = lib.filter (p: p.name != extra-cmake-modules.name) upstream.buildInputs;
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
buildPackages.extra-cmake-modules
];
outputs = [ "out" ]; #< no installedTests
});
}

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

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "ae29fc75d2d3ee07f88ce1a252d76964eb1efb24";
sha256 = "sha256-N9uWy2Ti5H5gYDoAPEcJ0i4dAbdQD9auJ2YjskbMqOc=";
version = "0-unstable-2025-04-13";
rev = "7850571d67c4ccfb0a34598480cc002276b3c72e";
sha256 = "sha256-fpz2X8YJ3hSQqGk4DAi+Z5fRDkUK22Ptg3lGKOdGcQc=";
version = "0-unstable-2025-04-18";
branch = "master";
}

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

@@ -30,11 +30,17 @@ let
in
[
(fetchpatch' {
# 2024-12-26: required to build ollama (with AMD acceleration)
# 2025-03-14: merged into staging
name = "rocm-6: bump packages to 6.3.1 and add missing packages";
prUrl = "https://github.com/NixOS/nixpkgs/pull/367695";
hash = "sha256-RG4+b9Oaxfg9jFxc796dxBZLmXQIyYuTc0TjkhxMqTA=";
# TODO: push upstream
name = "git: fix cross compilation";
saneCommit = "a39adc945ec4f157bc695ef8ecd1e95579f01afa";
hash = "sha256-OxUx3KgR0NstFfuobb3LxWFYwY0DUrYqiVFifS+sYr8=";
})
(fetchpatch' {
# TODO: approve after testing
name = "sm64coopdx: 1.2.1 -> 1.3.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399415";
hash = "sha256-ExoGrUlZKBNeHyor22D/mi5cQrgbCxapcSdDE5o6Ow8=";
})
(fetchpatch' {

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "bd8d4dc802b923eca317ec1b4196e5cad36dd5f8";
sha256 = "sha256-2FbwtvXTsH/cS4D5L4Xl0idy1/kWcGQbAvhDocTgoBI=";
version = "0-unstable-2025-04-13";
rev = "c55942667a80c24491dc78c1078d26f2fa498ded";
sha256 = "sha256-BwktUZcx74v//oWShpu4d9ZTyK96hb0b9gKpXl2XzI8=";
version = "0-unstable-2025-04-16";
branch = "staging-next";
}

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "927d7ebbb09f7d7b3f5ebe1870c765c9e8d6a232";
sha256 = "sha256-i54vG+U7aDS4VcQ5micEIisYxfsdwJGbADjNbmxd9ak=";
version = "0-unstable-2025-04-13";
rev = "1d6d2b9e41e496e27392a8ab7e6bb570270b1bba";
sha256 = "sha256-u9+MN6Cg6yaAjD8k4P9BbiVt+AkUVQXfcjZ28eU7KS8=";
version = "0-unstable-2025-04-18";
branch = "staging";
}