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

nixpkgs-bootstrap: bump, to grab upstreamed dialect fixes

Browse Source
This commit is contained in:
Colin
2025-05-02 14:50:14 +00:00
parent 5e68fe2df6
commit 92c3cde5cd
3 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
overlays/cross.nix
View File

@@ -209,18 +209,6 @@ in with final; {
];
});
# 2025/05/01: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/403545>
# dialect = prev.dialect.overrideAttrs (upstream: {
# # error: "<dialect> is not allowed to refer to the following paths: <build python>"
# # dialect's meson build script sets host binaries to use build PYTHON
# # disallowedReferences = [];
# postFixup = (upstream.postFixup or "") + ''
# patchShebangs --update --host $out/share/dialect/search_provider
# '';
# # upstream sets strictDeps=false which makes gAppsWrapperHook wrap with the build dependencies
# strictDeps = true;
# });
# 2025/05/01: upstreaming is unblocked
# dtrx = prev.dtrx.override {
# # `binutils` is the nix wrapper, which reads nix-related env vars
@@ -242,17 +230,6 @@ in with final; {
# extra-cmake-modules = buildPackages.extra-cmake-modules;
# out for PR: <https://github.com/NixOS/nixpkgs/pull/399981>
# 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/05/01: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: {
# # firejail executes its build outputs to produce the default filter list.
@@ -842,13 +819,4 @@ 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/17: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/399981>
# 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
# ];
# });
}

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

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3";
sha256 = "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=";
rev = "d66115b18ccf2fbb03da4f2ea8a41499eb8d3136";
sha256 = "sha256-XONo9xGd3zGt/iHmIDZ+Uj/FZxRRFmrDrIFqYtzoPnM=";
version = "0-unstable-2025-05-02";
branch = "master";
}

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

@@ -37,12 +37,7 @@ in
})
(fetchpatch' {
name = "dialect: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/403545";
hash = "sha256-KLKzKRGkCmfO8JLxmg0WKGM49QqgvJrgGJAX8I+C3KM=";
})
(fetchpatch' {
# 2025-05-02: merged into staging
name = "fcitx5: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399981";
hash = "sha256-BSnp80+8cpb+1yFaB0g7ZnPgQQqC7qo+ReMJUtlKgr4=";